update the config ard values for current board version (last used in …

…MFG2 run).
fpga-logi · Mar 12, 2015 · d0bc16a · d0bc16a
1 parent 8e99157
commit d0bc16a
Showing 1 changed file with 23 additions and 24 deletions.
diff --git a/logi-test/sw/common/config.h b/logi-test/sw/common/config.h
@@ -50,20 +50,6 @@ Second test :
 #define TEST_OPEN	//removing test jigs test (open)
 
 
-#define GPIO_TEST1_DIR 0xA5A5	
-#define GPIO_TEST1_1 0x2121
-#define GPIO_TEST1_1_EXPECTED 0x1212
-#define GPIO_TEST1_2 0x8484
-#define GPIO_TEST1_2_EXPECTED 0x4848
-
-#define GPIO_TEST2_DIR 0x5A5A
-#define GPIO_TEST2_1 0x1212
-#define GPIO_TEST2_1_EXPECTED 0x2121
-#define GPIO_TEST2_2 0x4848
-#define GPIO_TEST2_2_EXPECTED 0x8484
-
-
-
 #define LED_MASK 0x0003
 #define PB_MASK 0x0003
 #define SW_MASK 0x000C
@@ -73,42 +59,55 @@ Second test :
 #define SATA_WRITE_SHIFT 2
 #define SATA_READ_SHIFT 6
 
-#ifdef LOGIPI
 
 
-#define LOAD_CMD "/usr/bin/logi_loader ./logipi_test.bit"
-#define GPIO0 0x0002 //PMOD 1 for LSB and PMOD 2 for MSB
+#ifdef LOGIPI
+
+#define LOAD_CMD "/usr/bin/logi_loader logipi_test.bit"
+#define GPIO0 0x0002
 #define GPIO0DIR 0x0003
-#define GPIO1 0x0004 //PMOD 1 for LSB and PMOD 2 for MSB
+#define GPIO1 0x0004
 #define GPIO1DIR 0x0005
-#define GPIO2 0x0006 //ARD[5:0] for LSB
+#define GPIO2 0x0006
 #define GPIO2DIR 0x0007
 #define REG0  0x0010
 #define REG1  0x0011
 #define REG2  0x0012
 #define REG_DEBUG_RAM 0x0013
 #define MEM0  0x1000
 
+#define GPIO_TEST1_DIR 0xA5A5	
+#define GPIO_TEST1_1 0x2121
+#define GPIO_TEST1_1_EXPECTED 0x1212
+#define GPIO_TEST1_2 0x8484
+#define GPIO_TEST1_2_EXPECTED 0x4848
+
+#define GPIO_TEST2_DIR 0x5A5A
+#define GPIO_TEST2_1 0x1212
+#define GPIO_TEST2_1_EXPECTED 0x2121
+#define GPIO_TEST2_2 0x4848
+#define GPIO_TEST2_2_EXPECTED 0x8484
 
-//1-2-3-1-2-3
 
 #define ARD_MASK 0x003F
 #define ARD_TEST1_DIR 0x0015	
 #define ARD_TEST1_1 0x0011
-#define ARD_TEST1_1_EXPECTED 0x000A
+#define ARD_TEST1_1_EXPECTED 0x0022
 #define ARD_TEST1_2 0x0004
-#define ARD_TEST1_2_EXPECTED 0x0020
+#define ARD_TEST1_2_EXPECTED 0x0008
 
 #define ARD_TEST2_DIR 0x002A	
 #define ARD_TEST2_1 0x0022
-#define ARD_TEST2_1_EXPECTED 0x0014
+#define ARD_TEST2_1_EXPECTED 0x0011
 #define ARD_TEST2_2 0x0008
-#define ARD_TEST2_2_EXPECTED 0x0001
+#define ARD_TEST2_2_EXPECTED 0x0004
 
 #define LOG_PATH "/home/pi/tests_log/%ld_test.log"
 
 #endif
 
+#endif
+
 
 #ifdef LOGIBONE