Index: output/bt_program23.icode =================================================================== --- /branch/keyboard/1307_keyboard_base/output/bt_program23.icode (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/bt_program23.icode (working copy) @@ -179,7 +179,7 @@ 00000178 0x00000108 call 0x00005f7d 00000179 0x00000109 nbranch 0x000000ad , 0x00000001 00000180 0x0000010a call 0x000000d7 - 00000181 0x0000010b call 0x000000f1 + 00000181 0x0000010b call 0x000000f0 00000182 0x0000010c call 0x00000121 00000183 0x0000010e fetch 0x00000002 , 0x00004c46 00000184 0x0000010f copy 0x0000003f , 0x00000012 @@ -227,18 +227,18 @@ 00000226 0x00000143 call 0x000000e4 00000227 0x00000144 branch 0x0000011f 00000228 0x00000147 jam 0x00000000 , 0x00004c93 - 00000229 0x00000148 nop 0x00000096 - 00000230 0x00000149 call 0x00000104 - 00000231 0x0000014a fetch 0x00000002 , 0x00004c91 - 00000232 0x0000014c copy 0x0000003f , 0x00000005 - 00000233 0x0000014d fetch 0x00000001 , 0x00004c94 - 00000234 0x0000014e iadd 0x00000005 , 0x00000005 - 00000235 0x0000014f fetch 0x00000001 , 0x00004c93 - 00000236 0x00000150 istore 0x00000001 , 0x00000005 - 00000237 0x00000151 fetch 0x00000001 , 0x00004c94 - 00000238 0x00000152 increase 0x00000001 , 0x0000003f - 00000239 0x00000153 store 0x00000001 , 0x00004c94 - 00000240 0x00000154 rtn + 00000229 0x00000148 call 0x00000104 + 00000230 0x00000149 fetch 0x00000002 , 0x00004c91 + 00000231 0x0000014b copy 0x0000003f , 0x00000005 + 00000232 0x0000014c fetch 0x00000001 , 0x00004c94 + 00000233 0x0000014d iadd 0x00000005 , 0x00000005 + 00000234 0x0000014e fetch 0x00000001 , 0x00004c93 + 00000235 0x0000014f istore 0x00000001 , 0x00000005 + 00000236 0x00000150 fetch 0x00000001 , 0x00004c94 + 00000237 0x00000151 increase 0x00000001 , 0x0000003f + 00000238 0x00000152 store 0x00000001 , 0x00004c94 + 00000239 0x00000153 rtn + 00000240 0x00000156 nop 0x00000096 00000241 0x00000157 fetch 0x00000002 , 0x00004c44 00000242 0x00000158 copy 0x0000003f , 0x00000012 00000243 0x00000159 jam 0x00000000 , 0x00004c94 @@ -254,7 +254,7 @@ 00000253 0x00000164 call 0x00005fa3 00000254 0x00000166 increase 0x00000001 , 0x00000012 00000255 0x00000167 fetch 0x00000002 , 0x00004c8f - 00000256 0x00000168 call 0x000000e8 + 00000256 0x00000168 call 0x000000e7 00000257 0x00000169 sub 0x0000003f , 0x00000013 , 0x0000003e 00000258 0x0000016a branch 0x000000f4 , 0x00000002 00000259 0x0000016b rtn Index: output/bt_program23.list =================================================================== --- /branch/keyboard/1307_keyboard_base/output/bt_program23.list (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/bt_program23.list (working copy) @@ -256,20 +256,20 @@ 0xe3 000324 branch p_keyboard_clk_input : 000326 p_keyboard_keyscan_exmcu_get_col_value: 0xe4 000327 jam 0 ,mem_keyscan_value_temp -0xe5 000328 nop 150 -0xe6 000329 call p_keyboard_keyscan_get_col_value -0xe7 000330 fetch 2 ,mem_keyscan_exmcu_value_ptr -: 000331 p_keyboard_keyscan_value_store: -0xe8 000332 copy pdata ,contw -0xe9 000333 fetch 1 ,mem_keyscan_col_loop_count -0xea 000334 iadd contw ,contw -0xeb 000335 fetch 1 ,mem_keyscan_value_temp -0xec 000336 istore 1 ,contw -0xed 000337 fetch 1 ,mem_keyscan_col_loop_count -0xee 000338 increase 1 ,pdata -0xef 000339 store 1 ,mem_keyscan_col_loop_count -0xf0 000340 rtn -: 000342 p_keyboard_keyscan_get_mcu_value: +0xe5 000328 call p_keyboard_keyscan_get_col_value +0xe6 000329 fetch 2 ,mem_keyscan_exmcu_value_ptr +: 000330 p_keyboard_keyscan_value_store: +0xe7 000331 copy pdata ,contw +0xe8 000332 fetch 1 ,mem_keyscan_col_loop_count +0xe9 000333 iadd contw ,contw +0xea 000334 fetch 1 ,mem_keyscan_value_temp +0xeb 000335 istore 1 ,contw +0xec 000336 fetch 1 ,mem_keyscan_col_loop_count +0xed 000337 increase 1 ,pdata +0xee 000338 store 1 ,mem_keyscan_col_loop_count +0xef 000339 rtn +: 000341 p_keyboard_keyscan_get_mcu_value: +0xf0 000342 nop 150 0xf1 000343 fetch 2 ,mem_kb_col_ptr 0xf2 000344 copy pdata ,regb 0xf3 000345 jam 0 ,mem_keyscan_col_loop_count Index: output/bt_program23.meta =================================================================== --- /branch/keyboard/1307_keyboard_base/output/bt_program23.meta (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/bt_program23.meta (working copy) @@ -325,7 +325,6 @@ p_keyboard_keyscan_exmcu_get_col_value: jam 0,mem_keyscan_value_temp - nop 150 call p_keyboard_keyscan_get_col_value fetch 2,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: @@ -340,6 +339,7 @@ rtn p_keyboard_keyscan_get_mcu_value: // 8*20 = 130us + nop 150 fetch 2,mem_kb_col_ptr copy pdata,regb jam 0,mem_keyscan_col_loop_count Index: output/bt_program23.rom =================================================================== --- /branch/keyboard/1307_keyboard_base/output/bt_program23.rom (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/bt_program23.rom (working copy) @@ -179,7 +179,7 @@ 00100000010000000101111101111101 00100100001000001000000010101101 00100000010000000000000011010111 -00100000010000000000000011110001 +00100000010000000000000011110000 00100000010000000000000100100001 01101111111000010100110001000110 00011111111000100010010000000000 @@ -227,7 +227,6 @@ 00100000010000000000000011100100 00100000001000000000000100011111 01110000010011001001001100000000 -00100000000000000000000010010110 00100000010000000000000100000100 01101111111000010100110010010001 00011111111000100000101000000000 @@ -239,6 +238,7 @@ 00011111111000001111111000000001 01100111111000001100110010010100 00100000011000000000000000000000 +00100000000000000000000010010110 01101111111000010100110001000100 00011111111000100010010000000000 01110000010011001001010000000000 @@ -254,7 +254,7 @@ 00100000010000000101111110100011 00011010010000001010010000000001 01101111111000010100110010001111 -00100000010000000000000011101000 +00100000010000000000000011100111 00011111111001100111110000010011 00100000001000010000000011110100 00100000011000000000000000000000 Index: output/eeprom.dat =================================================================== --- /branch/keyboard/1307_keyboard_base/output/eeprom.dat (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/eeprom.dat (working copy) @@ -731,7 +731,7 @@ 20 40 00 -f1 +f0 20 40 01 @@ -921,10 +921,6 @@ 93 00 20 -00 -00 -96 -20 40 01 04 @@ -968,6 +964,10 @@ 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -1031,7 +1031,7 @@ 20 40 00 -e8 +e7 1f e6 7c @@ -5888,8 +5888,8 @@ 60 00 00 -80 -5c +0d +4a aa 55 40 Index: output/flash.dat =================================================================== --- /branch/keyboard/1307_keyboard_base/output/flash.dat (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/flash.dat (working copy) @@ -731,7 +731,7 @@ 20 40 00 -f1 +f0 20 40 01 @@ -921,10 +921,6 @@ 93 00 20 -00 -00 -96 -20 40 01 04 @@ -968,6 +964,10 @@ 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -1031,7 +1031,7 @@ 20 40 00 -e8 +e7 1f e6 7c @@ -5888,8 +5888,8 @@ 60 00 00 -80 -5c +0d +4a aa 55 40 Index: output/otp.dat =================================================================== --- /branch/keyboard/1307_keyboard_base/output/otp.dat (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/otp.dat (working copy) @@ -731,7 +731,7 @@ 20 40 00 -f1 +f0 20 40 01 @@ -921,10 +921,6 @@ 93 00 20 -00 -00 -96 -20 40 01 04 @@ -968,6 +964,10 @@ 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -1031,7 +1031,7 @@ 20 40 00 -e8 +e7 1f e6 7c @@ -5888,8 +5888,8 @@ 60 00 00 -80 -5c +0d +4a aa 55 40 Index: output/program.lis =================================================================== --- /branch/keyboard/1307_keyboard_base/output/program.lis (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/program.lis (working copy) @@ -219,7 +219,7 @@ 00b2 20405f7d call gpio_get_bit 00b3 242080ad nbranch p_keyboard_keyscan_wait_wake_done ,true 00b4 204000d7 call p_keyboard_keyscan_get_exmcu_value -00b5 204000f1 call p_keyboard_keyscan_get_mcu_value +00b5 204000f0 call p_keyboard_keyscan_get_mcu_value 00b6 20400121 call p_keyboard_stb_state_high p_keyboard_keyscan_copy_value: @@ -283,22 +283,22 @@ p_keyboard_keyscan_exmcu_get_col_value: 00e4 704c9300 jam 0 ,mem_keyscan_value_temp -00e5 20000096 nop 150 -00e6 20400104 call p_keyboard_keyscan_get_col_value -00e7 6fe14c91 fetch 2 ,mem_keyscan_exmcu_value_ptr +00e5 20400104 call p_keyboard_keyscan_get_col_value +00e6 6fe14c91 fetch 2 ,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: -00e8 1fe20a00 copy pdata ,contw -00e9 6fe0cc94 fetch 1 ,mem_keyscan_col_loop_count -00ea 98a08a00 iadd contw ,contw -00eb 6fe0cc93 fetch 1 ,mem_keyscan_value_temp -00ec e7e08005 istore 1 ,contw -00ed 6fe0cc94 fetch 1 ,mem_keyscan_col_loop_count -00ee 1fe0fe01 increase 1 ,pdata -00ef 67e0cc94 store 1 ,mem_keyscan_col_loop_count -00f0 20600000 rtn +00e7 1fe20a00 copy pdata ,contw +00e8 6fe0cc94 fetch 1 ,mem_keyscan_col_loop_count +00e9 98a08a00 iadd contw ,contw +00ea 6fe0cc93 fetch 1 ,mem_keyscan_value_temp +00eb e7e08005 istore 1 ,contw +00ec 6fe0cc94 fetch 1 ,mem_keyscan_col_loop_count +00ed 1fe0fe01 increase 1 ,pdata +00ee 67e0cc94 store 1 ,mem_keyscan_col_loop_count +00ef 20600000 rtn p_keyboard_keyscan_get_mcu_value: +00f0 20000096 nop 150 00f1 6fe14c44 fetch 2 ,mem_kb_col_ptr 00f2 1fe22400 copy pdata ,regb 00f3 704c9400 jam 0 ,mem_keyscan_col_loop_count @@ -318,7 +318,7 @@ p_keyboard_keyscan_mcu_start_loop: 00fe 1a40a401 increase 1 ,regb 00ff 6fe14c8f fetch 2 ,mem_keyscan_value_ptr -0100 204000e8 call p_keyboard_keyscan_value_store +0100 204000e7 call p_keyboard_keyscan_value_store 0101 1fe67c13 sub pdata ,19 ,null 0102 202100f4 branch p_keyboard_keyscan_mcu_start ,positive 0103 20600000 rtn Index: output/ramcode.rom =================================================================== --- /branch/keyboard/1307_keyboard_base/output/ramcode.rom (revision 1355) +++ /branch/keyboard/1307_keyboard_base/output/ramcode.rom (working copy) @@ -179,7 +179,7 @@ 20405f7d 242080ad 204000d7 -204000f1 +204000f0 20400121 6fe14c46 1fe22400 @@ -227,7 +227,6 @@ 204000e4 2020011f 704c9300 -20000096 20400104 6fe14c91 1fe20a00 @@ -239,6 +238,7 @@ 1fe0fe01 67e0cc94 20600000 +20000096 6fe14c44 1fe22400 704c9400 @@ -254,7 +254,7 @@ 20405fa3 1a40a401 6fe14c8f -204000e8 +204000e7 1fe67c13 202100f4 20600000 Index: program/patch.prog =================================================================== --- /branch/keyboard/1307_keyboard_base/program/patch.prog (revision 1355) +++ /branch/keyboard/1307_keyboard_base/program/patch.prog (working copy) @@ -419,7 +419,6 @@ p_keyboard_keyscan_exmcu_get_col_value: jam 0,mem_keyscan_value_temp - nop 150 call p_keyboard_keyscan_get_col_value fetch 2,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: @@ -434,6 +433,7 @@ rtn p_keyboard_keyscan_get_mcu_value: // 8*20 = 130us + nop 150 fetch 2,mem_kb_col_ptr copy pdata,regb jam 0,mem_keyscan_col_loop_count