# HG changeset patch # User Jacob Alexander # Date 1389555565 28800 # Node ID a9b3520c789223d706e2ab21aa5b24c33d4d4beb # Parent d952a11719172800fbaaf52a7996549c6582f281 Adding new kishsaver strobe map for new PCB revision diff -r d952a1171917 -r a9b3520c7892 Scan/avr-capsense/scan_loop.c --- a/Scan/avr-capsense/scan_loop.c Sun Jan 12 11:27:10 2014 -0800 +++ b/Scan/avr-capsense/scan_loop.c Sun Jan 12 11:39:25 2014 -0800 @@ -214,9 +214,10 @@ // Strobes start at 0 and go to 17 (18), not all Model Fs use all of the available strobes // The single row ribbon connector Model Fs only have a max of 16 strobes #define KISHSAVER_STROBE -//#define TERMINAL_6110668_STROBE -//#define UNSAVER_STROBE -#ifdef KISHSAVER_STROBE +//#define KISHSAVER_OLD_STROBE +//#define TERMINAL_6110668_OLD_STROBE +//#define UNSAVER_OLD_STROBE +#ifdef KISHSAVER_OLD_STROBE total_strobes = 9; strobe_map[0] = 2; // Kishsaver doesn't use strobe 0 and 1 @@ -228,7 +229,19 @@ strobe_map[6] = 8; strobe_map[7] = 9; strobe_map[8] = 15; // Test point strobe (3 test points, sense 1, 4, 5) -#elif defined(TERMINAL_6110668_STROBE) +#elif defined(KISHSAVER_STROBE) + total_strobes = 9; + + strobe_map[0] = 15; // Kishsaver doesn't use strobe 0 and 1 + strobe_map[1] = 14; + strobe_map[2] = 13; + strobe_map[3] = 12; + strobe_map[4] = 11; + strobe_map[5] = 10; + strobe_map[6] = 9; + strobe_map[7] = 8; + strobe_map[8] = 2; // Test point strobe (3 test points, sense 1, 4, 5) +#elif defined(TERMINAL_6110668_OLD_STROBE) total_strobes = 16; strobe_map[0] = 0; @@ -247,7 +260,7 @@ strobe_map[13] = 13; strobe_map[14] = 14; strobe_map[15] = 15; -#elif defined(UNSAVER_STROBE) +#elif defined(UNSAVER_OLD_STROBE) total_strobes = 14; strobe_map[0] = 0;