Diff: main.cpp

Revision:

9:834e9eed0d72

Parent:

8:88c89fd324bd

Child:

10:b8d41133e499

--- a/main.cpp	Wed Aug 20 00:31:00 2014 +0000
+++ b/main.cpp	Thu Aug 21 00:44:22 2014 +0000
@@ -54,10 +54,10 @@
 #ifndef USE_FASTIO
 // 通常IO
 
-#define RCK io04
-#define SCK io03
-#define DBS io01
-#define CTS io02
+#define RCK io04 // pin4 , P0_11
+#define SCK io03 // pin17, P1_8
+#define DBS io01 // pin13, P1_4
+#define CTS io02 // pin26, P0_3
 
 #define IO_A0 io05
 #define IO_WR io06
@@ -69,7 +69,7 @@
 DigitalOut io04(dp4, 0); // P0_11
 
 DigitalOut io05(dp18, 0); // P1_9
-DigitalOut io06(dp11, 0); // P1_1
+DigitalOut io06(dp11, 0); // P1_2
 
 void ioInit()
 {
@@ -119,14 +119,19 @@
 #define IO_A0 io05
 #define IO_WR io06
 
+DigitalOut io01(dp13, 0); // P1_4
+DigitalOut io02(dp26, 0); // P0_3
+DigitalOut io03(dp17, 0); // P1_8
+DigitalOut io04(dp4, 0); // P0_11
+
 DigitalOut io05(dp18, 0); // P1_9
-DigitalOut io06(dp11, 0); // P1_1
+DigitalOut io06(dp11, 0); // P1_2
 
 
-#define IO_01 (1<<4)  // P1_4
-#define IO_02 (1<<3)  // P0_3
-#define IO_03 (1<<8)  // P1_8
-#define IO_04 (1<<11) // P0_11
+#define IO_01 (1<<4)  // DBS P1_4
+#define IO_02 (1<<3)  // CTS P0_3
+#define IO_03 (1<<8)  // SCK P1_8
+#define IO_04 (1<<11) // RCK P0_11
 
 
 void ioInit()
@@ -152,12 +157,12 @@
         if (data & 0x8000)
             LPC_GPIO1->DATA |= DBS;
         else
-            LPC_GPIO1->DATA &= DBS;
+            LPC_GPIO1->DATA &= ~DBS;
         
         data <<= 1;
 
         LPC_GPIO1->DATA |= SCK;
-        LPC_GPIO1->DATA &= SCK;
+        LPC_GPIO1->DATA &= ~SCK;
     }
 
     LPC_GPIO0->DATA |= RCK;
@@ -871,7 +876,7 @@
 //
 void putTitle()
 {
-        lcd_printStr2("NBCTRL", "Ver 1.11");
+        lcd_printStr2("NBCTRL", "Ver 1.12");
         wait(1.5);
 }