Index: output/bt_program23.icode =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.icode (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.icode (working copy) @@ -193,7 +193,7 @@ 00000192 0x00000109 call 0x00005f7d 00000193 0x0000010a nbranch 0x000000bb , 0x00000001 00000194 0x0000010b call 0x000000e5 - 00000195 0x0000010c call 0x000000ff + 00000195 0x0000010c call 0x000000fe 00000196 0x0000010d call 0x0000012f 00000197 0x0000010f fetch 0x00000002 , 0x00004c61 00000198 0x00000110 copy 0x0000003f , 0x00000012 @@ -241,37 +241,37 @@ 00000240 0x00000144 call 0x000000f2 00000241 0x00000145 branch 0x0000012d 00000242 0x00000148 jam 0x00000000 , 0x00004cae - 00000243 0x00000149 nop 0x00000096 - 00000244 0x0000014a call 0x00000112 - 00000245 0x0000014b fetch 0x00000002 , 0x00004cac - 00000246 0x0000014d copy 0x0000003f , 0x00000005 - 00000247 0x0000014e fetch 0x00000001 , 0x00004caf - 00000248 0x0000014f iadd 0x00000005 , 0x00000005 - 00000249 0x00000150 fetch 0x00000001 , 0x00004cae - 00000250 0x00000151 istore 0x00000001 , 0x00000005 - 00000251 0x00000152 fetch 0x00000001 , 0x00004caf - 00000252 0x00000153 increase 0x00000001 , 0x0000003f - 00000253 0x00000154 store 0x00000001 , 0x00004caf - 00000254 0x00000155 rtn - 00000255 0x00000158 fetch 0x00000002 , 0x00004c5f - 00000256 0x00000159 copy 0x0000003f , 0x00000012 - 00000257 0x0000015a jam 0x00000000 , 0x00004caf - 00000258 0x0000015c jam 0x00000000 , 0x00004cae - 00000259 0x0000015d ifetcht 0x00000001 , 0x00000012 - 00000260 0x0000015e isolate1 0x00000007 , 0x00000002 - 00000261 0x0000015f branch 0x0000010c , 0x00000001 - 00000262 0x00000160 call 0x00005f8d - 00000263 0x00000161 call 0x00000112 - 00000264 0x00000162 ifetcht 0x00000001 , 0x00000012 - 00000265 0x00000163 call 0x00005f89 - 00000266 0x00000164 ifetcht 0x00000001 , 0x00000012 - 00000267 0x00000165 call 0x00005fa3 - 00000268 0x00000167 increase 0x00000001 , 0x00000012 - 00000269 0x00000168 fetch 0x00000002 , 0x00004caa - 00000270 0x00000169 call 0x000000f6 - 00000271 0x0000016a sub 0x0000003f , 0x00000013 , 0x0000003e - 00000272 0x0000016b branch 0x00000102 , 0x00000002 - 00000273 0x0000016c rtn + 00000243 0x00000149 call 0x00000111 + 00000244 0x0000014a fetch 0x00000002 , 0x00004cac + 00000245 0x0000014c copy 0x0000003f , 0x00000005 + 00000246 0x0000014d fetch 0x00000001 , 0x00004caf + 00000247 0x0000014e iadd 0x00000005 , 0x00000005 + 00000248 0x0000014f fetch 0x00000001 , 0x00004cae + 00000249 0x00000150 istore 0x00000001 , 0x00000005 + 00000250 0x00000151 fetch 0x00000001 , 0x00004caf + 00000251 0x00000152 increase 0x00000001 , 0x0000003f + 00000252 0x00000153 store 0x00000001 , 0x00004caf + 00000253 0x00000154 rtn + 00000254 0x00000157 fetch 0x00000002 , 0x00004c5f + 00000255 0x00000158 copy 0x0000003f , 0x00000012 + 00000256 0x00000159 jam 0x00000000 , 0x00004caf + 00000257 0x0000015b jam 0x00000000 , 0x00004cae + 00000258 0x0000015c ifetcht 0x00000001 , 0x00000012 + 00000259 0x0000015d isolate1 0x00000007 , 0x00000002 + 00000260 0x0000015e branch 0x0000010b , 0x00000001 + 00000261 0x0000015f call 0x00005f8d + 00000262 0x00000160 call 0x00000111 + 00000263 0x00000161 ifetcht 0x00000001 , 0x00000012 + 00000264 0x00000162 call 0x00005f89 + 00000265 0x00000163 ifetcht 0x00000001 , 0x00000012 + 00000266 0x00000164 call 0x00005fa3 + 00000267 0x00000166 increase 0x00000001 , 0x00000012 + 00000268 0x00000167 fetch 0x00000002 , 0x00004caa + 00000269 0x00000168 call 0x000000f5 + 00000270 0x00000169 sub 0x0000003f , 0x00000013 , 0x0000003e + 00000271 0x0000016a branch 0x00000101 , 0x00000002 + 00000272 0x0000016b rtn + 00000273 0x0000016e nop 0x00000096 00000274 0x0000016f fetch 0x00000002 , 0x00004c5d 00000275 0x00000170 copy 0x0000003f , 0x00000013 00000276 0x00000171 arg 0x00000008 , 0x00000039 Index: output/bt_program23.list =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.list (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.list (working copy) @@ -271,42 +271,42 @@ 0xf1 000325 branch p_keyboard_clk_input : 000327 p_keyboard_keyscan_exmcu_get_col_value: 0xf2 000328 jam 0 ,mem_keyscan_value_temp -0xf3 000329 nop 150 -0xf4 000330 call p_keyboard_keyscan_get_col_value -0xf5 000331 fetch 2 ,mem_keyscan_exmcu_value_ptr -: 000332 p_keyboard_keyscan_value_store: -0xf6 000333 copy pdata ,contw -0xf7 000334 fetch 1 ,mem_keyscan_col_loop_count -0xf8 000335 iadd contw ,contw -0xf9 000336 fetch 1 ,mem_keyscan_value_temp -0xfa 000337 istore 1 ,contw -0xfb 000338 fetch 1 ,mem_keyscan_col_loop_count -0xfc 000339 increase 1 ,pdata -0xfd 000340 store 1 ,mem_keyscan_col_loop_count -0xfe 000341 rtn -: 000343 p_keyboard_keyscan_get_mcu_value: -0xff 000344 fetch 2 ,mem_kb_col_ptr -0x100 000345 copy pdata ,regb -0x101 000346 jam 0 ,mem_keyscan_col_loop_count -: 000347 p_keyboard_keyscan_mcu_start: -0x102 000348 jam 0 ,mem_keyscan_value_temp -0x103 000349 ifetcht 1 ,regb -0x104 000350 isolate1 7 ,temp -0x105 000351 branch p_keyboard_keyscan_mcu_start_loop ,true -0x106 000352 call gpio_out_active -0x107 000353 call p_keyboard_keyscan_get_col_value -0x108 000354 ifetcht 1 ,regb -0x109 000355 call gpio_out_inactive -0x10a 000356 ifetcht 1 ,regb -0x10b 000357 call gpio_set_high_impedance -: 000358 p_keyboard_keyscan_mcu_start_loop: -0x10c 000359 increase 1 ,regb -0x10d 000360 fetch 2 ,mem_keyscan_value_ptr -0x10e 000361 call p_keyboard_keyscan_value_store -0x10f 000362 sub pdata ,19 ,null -0x110 000363 branch p_keyboard_keyscan_mcu_start ,positive -0x111 000364 rtn -: 000366 p_keyboard_keyscan_get_col_value: +0xf3 000329 call p_keyboard_keyscan_get_col_value +0xf4 000330 fetch 2 ,mem_keyscan_exmcu_value_ptr +: 000331 p_keyboard_keyscan_value_store: +0xf5 000332 copy pdata ,contw +0xf6 000333 fetch 1 ,mem_keyscan_col_loop_count +0xf7 000334 iadd contw ,contw +0xf8 000335 fetch 1 ,mem_keyscan_value_temp +0xf9 000336 istore 1 ,contw +0xfa 000337 fetch 1 ,mem_keyscan_col_loop_count +0xfb 000338 increase 1 ,pdata +0xfc 000339 store 1 ,mem_keyscan_col_loop_count +0xfd 000340 rtn +: 000342 p_keyboard_keyscan_get_mcu_value: +0xfe 000343 fetch 2 ,mem_kb_col_ptr +0xff 000344 copy pdata ,regb +0x100 000345 jam 0 ,mem_keyscan_col_loop_count +: 000346 p_keyboard_keyscan_mcu_start: +0x101 000347 jam 0 ,mem_keyscan_value_temp +0x102 000348 ifetcht 1 ,regb +0x103 000349 isolate1 7 ,temp +0x104 000350 branch p_keyboard_keyscan_mcu_start_loop ,true +0x105 000351 call gpio_out_active +0x106 000352 call p_keyboard_keyscan_get_col_value +0x107 000353 ifetcht 1 ,regb +0x108 000354 call gpio_out_inactive +0x109 000355 ifetcht 1 ,regb +0x10a 000356 call gpio_set_high_impedance +: 000357 p_keyboard_keyscan_mcu_start_loop: +0x10b 000358 increase 1 ,regb +0x10c 000359 fetch 2 ,mem_keyscan_value_ptr +0x10d 000360 call p_keyboard_keyscan_value_store +0x10e 000361 sub pdata ,19 ,null +0x10f 000362 branch p_keyboard_keyscan_mcu_start ,positive +0x110 000363 rtn +: 000365 p_keyboard_keyscan_get_col_value: +0x111 000366 nop 150 0x112 000367 fetch 2 ,mem_kb_row_ptr 0x113 000368 copy pdata ,regc 0x114 000369 arg 8 ,loopcnt Index: output/bt_program23.meta =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.meta (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.meta (working copy) @@ -326,7 +326,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: @@ -364,6 +363,7 @@ rtn p_keyboard_keyscan_get_col_value: + nop 150 fetch 2,mem_kb_row_ptr copy pdata,regc arg 8,loopcnt Index: output/bt_program23.rom =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.rom (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/bt_program23.rom (working copy) @@ -193,7 +193,7 @@ 00100000010000000101111101111101 00100100001000001000000010111011 00100000010000000000000011100101 -00100000010000000000000011111111 +00100000010000000000000011111110 00100000010000000000000100101111 01101111111000010100110001100001 00011111111000100010010000000000 @@ -241,8 +241,7 @@ 00100000010000000000000011110010 00100000001000000000000100101101 01110000010011001010111000000000 -00100000000000000000000010010110 -00100000010000000000000100010010 +00100000010000000000000100010001 01101111111000010100110010101100 00011111111000100000101000000000 01101111111000001100110010101111 @@ -259,19 +258,20 @@ 01110000010011001010111000000000 11101000010000001000000000010010 00101000010011111111111000000111 -00100000001000001000000100001100 +00100000001000001000000100001011 00100000010000000101111110001101 -00100000010000000000000100010010 +00100000010000000000000100010001 11101000010000001000000000010010 00100000010000000101111110001001 11101000010000001000000000010010 00100000010000000101111110100011 00011010010000001010010000000001 01101111111000010100110010101010 -00100000010000000000000011110110 +00100000010000000000000011110101 00011111111001100111110000010011 -00100000001000010000000100000010 +00100000001000010000000100000001 00100000011000000000000000000000 +00100000000000000000000010010110 01101111111000010100110001011101 00011111111000100010011000000000 11011111001000000000000000001000 Index: output/eeprom.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/eeprom.dat (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/eeprom.dat (working copy) @@ -787,7 +787,7 @@ 20 40 00 -ff +fe 20 40 01 @@ -977,13 +977,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -12 +11 6f e1 4c @@ -1051,7 +1047,7 @@ 20 20 81 -0c +0b 20 40 5f @@ -1059,7 +1055,7 @@ 20 40 01 -12 +11 e8 40 80 @@ -1087,7 +1083,7 @@ 20 40 00 -f6 +f5 1f e6 7c @@ -1095,11 +1091,15 @@ 20 21 01 -02 +01 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -6356,8 +6356,8 @@ 60 00 00 -cb -30 +0d +f9 aa 55 40 Index: output/flash.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/flash.dat (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/flash.dat (working copy) @@ -787,7 +787,7 @@ 20 40 00 -ff +fe 20 40 01 @@ -977,13 +977,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -12 +11 6f e1 4c @@ -1051,7 +1047,7 @@ 20 20 81 -0c +0b 20 40 5f @@ -1059,7 +1055,7 @@ 20 40 01 -12 +11 e8 40 80 @@ -1087,7 +1083,7 @@ 20 40 00 -f6 +f5 1f e6 7c @@ -1095,11 +1091,15 @@ 20 21 01 -02 +01 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -6356,8 +6356,8 @@ 60 00 00 -cb -30 +0d +f9 aa 55 40 Index: output/otp.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/otp.dat (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/otp.dat (working copy) @@ -787,7 +787,7 @@ 20 40 00 -ff +fe 20 40 01 @@ -977,13 +977,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -12 +11 6f e1 4c @@ -1051,7 +1047,7 @@ 20 20 81 -0c +0b 20 40 5f @@ -1059,7 +1055,7 @@ 20 40 01 -12 +11 e8 40 80 @@ -1087,7 +1083,7 @@ 20 40 00 -f6 +f5 1f e6 7c @@ -1095,11 +1091,15 @@ 20 21 01 -02 +01 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -6356,8 +6356,8 @@ 60 00 00 -cb -30 +0d +f9 aa 55 40 Index: output/program.lis =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/program.lis (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/program.lis (working copy) @@ -235,7 +235,7 @@ 00c0 20405f7d call gpio_get_bit 00c1 242080bb nbranch p_keyboard_keyscan_wait_wake_done ,true 00c2 204000e5 call p_keyboard_keyscan_get_exmcu_value -00c3 204000ff call p_keyboard_keyscan_get_mcu_value +00c3 204000fe call p_keyboard_keyscan_get_mcu_value 00c4 2040012f call p_keyboard_stb_state_high p_keyboard_keyscan_copy_value: @@ -299,47 +299,47 @@ p_keyboard_keyscan_exmcu_get_col_value: 00f2 704cae00 jam 0 ,mem_keyscan_value_temp -00f3 20000096 nop 150 -00f4 20400112 call p_keyboard_keyscan_get_col_value -00f5 6fe14cac fetch 2 ,mem_keyscan_exmcu_value_ptr +00f3 20400111 call p_keyboard_keyscan_get_col_value +00f4 6fe14cac fetch 2 ,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: -00f6 1fe20a00 copy pdata ,contw -00f7 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count -00f8 98a08a00 iadd contw ,contw -00f9 6fe0ccae fetch 1 ,mem_keyscan_value_temp -00fa e7e08005 istore 1 ,contw -00fb 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count -00fc 1fe0fe01 increase 1 ,pdata -00fd 67e0ccaf store 1 ,mem_keyscan_col_loop_count -00fe 20600000 rtn +00f5 1fe20a00 copy pdata ,contw +00f6 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count +00f7 98a08a00 iadd contw ,contw +00f8 6fe0ccae fetch 1 ,mem_keyscan_value_temp +00f9 e7e08005 istore 1 ,contw +00fa 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count +00fb 1fe0fe01 increase 1 ,pdata +00fc 67e0ccaf store 1 ,mem_keyscan_col_loop_count +00fd 20600000 rtn p_keyboard_keyscan_get_mcu_value: -00ff 6fe14c5f fetch 2 ,mem_kb_col_ptr -0100 1fe22400 copy pdata ,regb -0101 704caf00 jam 0 ,mem_keyscan_col_loop_count +00fe 6fe14c5f fetch 2 ,mem_kb_col_ptr +00ff 1fe22400 copy pdata ,regb +0100 704caf00 jam 0 ,mem_keyscan_col_loop_count p_keyboard_keyscan_mcu_start: -0102 704cae00 jam 0 ,mem_keyscan_value_temp -0103 e8408012 ifetcht 1 ,regb -0104 284ffe07 isolate1 7 ,temp -0105 2020810c branch p_keyboard_keyscan_mcu_start_loop ,true -0106 20405f8d call gpio_out_active -0107 20400112 call p_keyboard_keyscan_get_col_value -0108 e8408012 ifetcht 1 ,regb -0109 20405f89 call gpio_out_inactive -010a e8408012 ifetcht 1 ,regb -010b 20405fa3 call gpio_set_high_impedance +0101 704cae00 jam 0 ,mem_keyscan_value_temp +0102 e8408012 ifetcht 1 ,regb +0103 284ffe07 isolate1 7 ,temp +0104 2020810b branch p_keyboard_keyscan_mcu_start_loop ,true +0105 20405f8d call gpio_out_active +0106 20400111 call p_keyboard_keyscan_get_col_value +0107 e8408012 ifetcht 1 ,regb +0108 20405f89 call gpio_out_inactive +0109 e8408012 ifetcht 1 ,regb +010a 20405fa3 call gpio_set_high_impedance p_keyboard_keyscan_mcu_start_loop: -010c 1a40a401 increase 1 ,regb -010d 6fe14caa fetch 2 ,mem_keyscan_value_ptr -010e 204000f6 call p_keyboard_keyscan_value_store -010f 1fe67c13 sub pdata ,19 ,null -0110 20210102 branch p_keyboard_keyscan_mcu_start ,positive -0111 20600000 rtn +010b 1a40a401 increase 1 ,regb +010c 6fe14caa fetch 2 ,mem_keyscan_value_ptr +010d 204000f5 call p_keyboard_keyscan_value_store +010e 1fe67c13 sub pdata ,19 ,null +010f 20210101 branch p_keyboard_keyscan_mcu_start ,positive +0110 20600000 rtn p_keyboard_keyscan_get_col_value: +0111 20000096 nop 150 0112 6fe14c5d fetch 2 ,mem_kb_row_ptr 0113 1fe22600 copy pdata ,regc 0114 df200008 arg 8 ,loopcnt Index: output/ramcode.rom =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/ramcode.rom (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/output/ramcode.rom (working copy) @@ -193,7 +193,7 @@ 20405f7d 242080bb 204000e5 -204000ff +204000fe 2040012f 6fe14c61 1fe22400 @@ -241,8 +241,7 @@ 204000f2 2020012d 704cae00 -20000096 -20400112 +20400111 6fe14cac 1fe20a00 6fe0ccaf @@ -259,19 +258,20 @@ 704cae00 e8408012 284ffe07 -2020810c +2020810b 20405f8d -20400112 +20400111 e8408012 20405f89 e8408012 20405fa3 1a40a401 6fe14caa -204000f6 +204000f5 1fe67c13 -20210102 +20210101 20600000 +20000096 6fe14c5d 1fe22600 df200008 Index: program/patch.prog =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/program/patch.prog (revision 1380) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb/program/patch.prog (working copy) @@ -432,7 +432,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: @@ -470,6 +469,7 @@ rtn p_keyboard_keyscan_get_col_value: + nop 150 fetch 2,mem_kb_row_ptr copy pdata,regc arg 8,loopcnt