Index: output/bt_program23.icode =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.icode (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.icode (working copy) @@ -205,7 +205,7 @@ 00000204 0x00000117 call 0x00005f7d 00000205 0x00000118 nbranch 0x000000c7 , 0x00000001 00000206 0x00000119 call 0x000000f1 - 00000207 0x0000011a call 0x0000010b + 00000207 0x0000011a call 0x0000010a 00000208 0x0000011b call 0x0000013b 00000209 0x0000011d fetch 0x00000002 , 0x00004c61 00000210 0x0000011e copy 0x0000003f , 0x00000012 @@ -253,37 +253,37 @@ 00000252 0x00000152 call 0x000000fe 00000253 0x00000153 branch 0x00000139 00000254 0x00000156 jam 0x00000000 , 0x00004cae - 00000255 0x00000157 nop 0x00000096 - 00000256 0x00000158 call 0x0000011e - 00000257 0x00000159 fetch 0x00000002 , 0x00004cac - 00000258 0x0000015b copy 0x0000003f , 0x00000005 - 00000259 0x0000015c fetch 0x00000001 , 0x00004caf - 00000260 0x0000015d iadd 0x00000005 , 0x00000005 - 00000261 0x0000015e fetch 0x00000001 , 0x00004cae - 00000262 0x0000015f istore 0x00000001 , 0x00000005 - 00000263 0x00000160 fetch 0x00000001 , 0x00004caf - 00000264 0x00000161 increase 0x00000001 , 0x0000003f - 00000265 0x00000162 store 0x00000001 , 0x00004caf - 00000266 0x00000163 rtn - 00000267 0x00000166 fetch 0x00000002 , 0x00004c5f - 00000268 0x00000167 copy 0x0000003f , 0x00000012 - 00000269 0x00000168 jam 0x00000000 , 0x00004caf - 00000270 0x0000016a jam 0x00000000 , 0x00004cae - 00000271 0x0000016b ifetcht 0x00000001 , 0x00000012 - 00000272 0x0000016c isolate1 0x00000007 , 0x00000002 - 00000273 0x0000016d branch 0x00000118 , 0x00000001 - 00000274 0x0000016e call 0x00005f8d - 00000275 0x0000016f call 0x0000011e - 00000276 0x00000170 ifetcht 0x00000001 , 0x00000012 - 00000277 0x00000171 call 0x00005f89 - 00000278 0x00000172 ifetcht 0x00000001 , 0x00000012 - 00000279 0x00000173 call 0x00005fa3 - 00000280 0x00000175 increase 0x00000001 , 0x00000012 - 00000281 0x00000176 fetch 0x00000002 , 0x00004caa - 00000282 0x00000177 call 0x00000102 - 00000283 0x00000178 sub 0x0000003f , 0x00000013 , 0x0000003e - 00000284 0x00000179 branch 0x0000010e , 0x00000002 - 00000285 0x0000017a rtn + 00000255 0x00000157 call 0x0000011d + 00000256 0x00000158 fetch 0x00000002 , 0x00004cac + 00000257 0x0000015a copy 0x0000003f , 0x00000005 + 00000258 0x0000015b fetch 0x00000001 , 0x00004caf + 00000259 0x0000015c iadd 0x00000005 , 0x00000005 + 00000260 0x0000015d fetch 0x00000001 , 0x00004cae + 00000261 0x0000015e istore 0x00000001 , 0x00000005 + 00000262 0x0000015f fetch 0x00000001 , 0x00004caf + 00000263 0x00000160 increase 0x00000001 , 0x0000003f + 00000264 0x00000161 store 0x00000001 , 0x00004caf + 00000265 0x00000162 rtn + 00000266 0x00000165 fetch 0x00000002 , 0x00004c5f + 00000267 0x00000166 copy 0x0000003f , 0x00000012 + 00000268 0x00000167 jam 0x00000000 , 0x00004caf + 00000269 0x00000169 jam 0x00000000 , 0x00004cae + 00000270 0x0000016a ifetcht 0x00000001 , 0x00000012 + 00000271 0x0000016b isolate1 0x00000007 , 0x00000002 + 00000272 0x0000016c branch 0x00000117 , 0x00000001 + 00000273 0x0000016d call 0x00005f8d + 00000274 0x0000016e call 0x0000011d + 00000275 0x0000016f ifetcht 0x00000001 , 0x00000012 + 00000276 0x00000170 call 0x00005f89 + 00000277 0x00000171 ifetcht 0x00000001 , 0x00000012 + 00000278 0x00000172 call 0x00005fa3 + 00000279 0x00000174 increase 0x00000001 , 0x00000012 + 00000280 0x00000175 fetch 0x00000002 , 0x00004caa + 00000281 0x00000176 call 0x00000101 + 00000282 0x00000177 sub 0x0000003f , 0x00000013 , 0x0000003e + 00000283 0x00000178 branch 0x0000010d , 0x00000002 + 00000284 0x00000179 rtn + 00000285 0x0000017c nop 0x00000096 00000286 0x0000017d fetch 0x00000002 , 0x00004c5d 00000287 0x0000017e copy 0x0000003f , 0x00000013 00000288 0x0000017f arg 0x00000008 , 0x00000039 Index: output/bt_program23.list =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.list (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.list (working copy) @@ -287,42 +287,42 @@ 0xfd 000339 branch p_keyboard_clk_input : 000341 p_keyboard_keyscan_exmcu_get_col_value: 0xfe 000342 jam 0 ,mem_keyscan_value_temp -0xff 000343 nop 150 -0x100 000344 call p_keyboard_keyscan_get_col_value -0x101 000345 fetch 2 ,mem_keyscan_exmcu_value_ptr -: 000346 p_keyboard_keyscan_value_store: -0x102 000347 copy pdata ,contw -0x103 000348 fetch 1 ,mem_keyscan_col_loop_count -0x104 000349 iadd contw ,contw -0x105 000350 fetch 1 ,mem_keyscan_value_temp -0x106 000351 istore 1 ,contw -0x107 000352 fetch 1 ,mem_keyscan_col_loop_count -0x108 000353 increase 1 ,pdata -0x109 000354 store 1 ,mem_keyscan_col_loop_count -0x10a 000355 rtn -: 000357 p_keyboard_keyscan_get_mcu_value: -0x10b 000358 fetch 2 ,mem_kb_col_ptr -0x10c 000359 copy pdata ,regb -0x10d 000360 jam 0 ,mem_keyscan_col_loop_count -: 000361 p_keyboard_keyscan_mcu_start: -0x10e 000362 jam 0 ,mem_keyscan_value_temp -0x10f 000363 ifetcht 1 ,regb -0x110 000364 isolate1 7 ,temp -0x111 000365 branch p_keyboard_keyscan_mcu_start_loop ,true -0x112 000366 call gpio_out_active -0x113 000367 call p_keyboard_keyscan_get_col_value -0x114 000368 ifetcht 1 ,regb -0x115 000369 call gpio_out_inactive -0x116 000370 ifetcht 1 ,regb -0x117 000371 call gpio_set_high_impedance -: 000372 p_keyboard_keyscan_mcu_start_loop: -0x118 000373 increase 1 ,regb -0x119 000374 fetch 2 ,mem_keyscan_value_ptr -0x11a 000375 call p_keyboard_keyscan_value_store -0x11b 000376 sub pdata ,19 ,null -0x11c 000377 branch p_keyboard_keyscan_mcu_start ,positive -0x11d 000378 rtn -: 000380 p_keyboard_keyscan_get_col_value: +0xff 000343 call p_keyboard_keyscan_get_col_value +0x100 000344 fetch 2 ,mem_keyscan_exmcu_value_ptr +: 000345 p_keyboard_keyscan_value_store: +0x101 000346 copy pdata ,contw +0x102 000347 fetch 1 ,mem_keyscan_col_loop_count +0x103 000348 iadd contw ,contw +0x104 000349 fetch 1 ,mem_keyscan_value_temp +0x105 000350 istore 1 ,contw +0x106 000351 fetch 1 ,mem_keyscan_col_loop_count +0x107 000352 increase 1 ,pdata +0x108 000353 store 1 ,mem_keyscan_col_loop_count +0x109 000354 rtn +: 000356 p_keyboard_keyscan_get_mcu_value: +0x10a 000357 fetch 2 ,mem_kb_col_ptr +0x10b 000358 copy pdata ,regb +0x10c 000359 jam 0 ,mem_keyscan_col_loop_count +: 000360 p_keyboard_keyscan_mcu_start: +0x10d 000361 jam 0 ,mem_keyscan_value_temp +0x10e 000362 ifetcht 1 ,regb +0x10f 000363 isolate1 7 ,temp +0x110 000364 branch p_keyboard_keyscan_mcu_start_loop ,true +0x111 000365 call gpio_out_active +0x112 000366 call p_keyboard_keyscan_get_col_value +0x113 000367 ifetcht 1 ,regb +0x114 000368 call gpio_out_inactive +0x115 000369 ifetcht 1 ,regb +0x116 000370 call gpio_set_high_impedance +: 000371 p_keyboard_keyscan_mcu_start_loop: +0x117 000372 increase 1 ,regb +0x118 000373 fetch 2 ,mem_keyscan_value_ptr +0x119 000374 call p_keyboard_keyscan_value_store +0x11a 000375 sub pdata ,19 ,null +0x11b 000376 branch p_keyboard_keyscan_mcu_start ,positive +0x11c 000377 rtn +: 000379 p_keyboard_keyscan_get_col_value: +0x11d 000380 nop 150 0x11e 000381 fetch 2 ,mem_kb_row_ptr 0x11f 000382 copy pdata ,regc 0x120 000383 arg 8 ,loopcnt Index: output/bt_program23.meta =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.meta (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.meta (working copy) @@ -340,7 +340,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: @@ -378,6 +377,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_only24G_2M/output/bt_program23.rom (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/bt_program23.rom (working copy) @@ -205,7 +205,7 @@ 00100000010000000101111101111101 00100100001000001000000011000111 00100000010000000000000011110001 -00100000010000000000000100001011 +00100000010000000000000100001010 00100000010000000000000100111011 01101111111000010100110001100001 00011111111000100010010000000000 @@ -253,8 +253,7 @@ 00100000010000000000000011111110 00100000001000000000000100111001 01110000010011001010111000000000 -00100000000000000000000010010110 -00100000010000000000000100011110 +00100000010000000000000100011101 01101111111000010100110010101100 00011111111000100000101000000000 01101111111000001100110010101111 @@ -271,19 +270,20 @@ 01110000010011001010111000000000 11101000010000001000000000010010 00101000010011111111111000000111 -00100000001000001000000100011000 +00100000001000001000000100010111 00100000010000000101111110001101 -00100000010000000000000100011110 +00100000010000000000000100011101 11101000010000001000000000010010 00100000010000000101111110001001 11101000010000001000000000010010 00100000010000000101111110100011 00011010010000001010010000000001 01101111111000010100110010101010 -00100000010000000000000100000010 +00100000010000000000000100000001 00011111111001100111110000010011 -00100000001000010000000100001110 +00100000001000010000000100001101 00100000011000000000000000000000 +00100000000000000000000010010110 01101111111000010100110001011101 00011111111000100010011000000000 11011111001000000000000000001000 Index: output/eeprom.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/eeprom.dat (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/eeprom.dat (working copy) @@ -835,7 +835,7 @@ 20 40 01 -0b +0a 20 40 01 @@ -1025,13 +1025,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -1e +1d 6f e1 4c @@ -1099,7 +1095,7 @@ 20 20 81 -18 +17 20 40 5f @@ -1107,7 +1103,7 @@ 20 40 01 -1e +1d e8 40 80 @@ -1135,7 +1131,7 @@ 20 40 01 -02 +01 1f e6 7c @@ -1143,11 +1139,15 @@ 20 21 01 -0e +0d 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -6216,8 +6216,8 @@ 20 7c 68 -0c -8c +90 +5a aa 55 40 Index: output/flash.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/flash.dat (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/flash.dat (working copy) @@ -835,7 +835,7 @@ 20 40 01 -0b +0a 20 40 01 @@ -1025,13 +1025,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -1e +1d 6f e1 4c @@ -1099,7 +1095,7 @@ 20 20 81 -18 +17 20 40 5f @@ -1107,7 +1103,7 @@ 20 40 01 -1e +1d e8 40 80 @@ -1135,7 +1131,7 @@ 20 40 01 -02 +01 1f e6 7c @@ -1143,11 +1139,15 @@ 20 21 01 -0e +0d 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -6216,8 +6216,8 @@ 20 7c 68 -0c -8c +90 +5a aa 55 40 Index: output/otp.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/otp.dat (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/otp.dat (working copy) @@ -835,7 +835,7 @@ 20 40 01 -0b +0a 20 40 01 @@ -1025,13 +1025,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -1e +1d 6f e1 4c @@ -1099,7 +1095,7 @@ 20 20 81 -18 +17 20 40 5f @@ -1107,7 +1103,7 @@ 20 40 01 -1e +1d e8 40 80 @@ -1135,7 +1131,7 @@ 20 40 01 -02 +01 1f e6 7c @@ -1143,11 +1139,15 @@ 20 21 01 -0e +0d 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -6216,8 +6216,8 @@ 20 7c 68 -0c -8c +90 +5a aa 55 40 Index: output/program.lis =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/program.lis (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/program.lis (working copy) @@ -255,7 +255,7 @@ 00cc 20405f7d call gpio_get_bit 00cd 242080c7 nbranch p_keyboard_keyscan_wait_wake_done ,true 00ce 204000f1 call p_keyboard_keyscan_get_exmcu_value -00cf 2040010b call p_keyboard_keyscan_get_mcu_value +00cf 2040010a call p_keyboard_keyscan_get_mcu_value 00d0 2040013b call p_keyboard_stb_state_high p_keyboard_keyscan_copy_value: @@ -319,47 +319,47 @@ p_keyboard_keyscan_exmcu_get_col_value: 00fe 704cae00 jam 0 ,mem_keyscan_value_temp -00ff 20000096 nop 150 -0100 2040011e call p_keyboard_keyscan_get_col_value -0101 6fe14cac fetch 2 ,mem_keyscan_exmcu_value_ptr +00ff 2040011d call p_keyboard_keyscan_get_col_value +0100 6fe14cac fetch 2 ,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: -0102 1fe20a00 copy pdata ,contw -0103 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count -0104 98a08a00 iadd contw ,contw -0105 6fe0ccae fetch 1 ,mem_keyscan_value_temp -0106 e7e08005 istore 1 ,contw -0107 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count -0108 1fe0fe01 increase 1 ,pdata -0109 67e0ccaf store 1 ,mem_keyscan_col_loop_count -010a 20600000 rtn +0101 1fe20a00 copy pdata ,contw +0102 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count +0103 98a08a00 iadd contw ,contw +0104 6fe0ccae fetch 1 ,mem_keyscan_value_temp +0105 e7e08005 istore 1 ,contw +0106 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count +0107 1fe0fe01 increase 1 ,pdata +0108 67e0ccaf store 1 ,mem_keyscan_col_loop_count +0109 20600000 rtn p_keyboard_keyscan_get_mcu_value: -010b 6fe14c5f fetch 2 ,mem_kb_col_ptr -010c 1fe22400 copy pdata ,regb -010d 704caf00 jam 0 ,mem_keyscan_col_loop_count +010a 6fe14c5f fetch 2 ,mem_kb_col_ptr +010b 1fe22400 copy pdata ,regb +010c 704caf00 jam 0 ,mem_keyscan_col_loop_count p_keyboard_keyscan_mcu_start: -010e 704cae00 jam 0 ,mem_keyscan_value_temp -010f e8408012 ifetcht 1 ,regb -0110 284ffe07 isolate1 7 ,temp -0111 20208118 branch p_keyboard_keyscan_mcu_start_loop ,true -0112 20405f8d call gpio_out_active -0113 2040011e call p_keyboard_keyscan_get_col_value -0114 e8408012 ifetcht 1 ,regb -0115 20405f89 call gpio_out_inactive -0116 e8408012 ifetcht 1 ,regb -0117 20405fa3 call gpio_set_high_impedance +010d 704cae00 jam 0 ,mem_keyscan_value_temp +010e e8408012 ifetcht 1 ,regb +010f 284ffe07 isolate1 7 ,temp +0110 20208117 branch p_keyboard_keyscan_mcu_start_loop ,true +0111 20405f8d call gpio_out_active +0112 2040011d call p_keyboard_keyscan_get_col_value +0113 e8408012 ifetcht 1 ,regb +0114 20405f89 call gpio_out_inactive +0115 e8408012 ifetcht 1 ,regb +0116 20405fa3 call gpio_set_high_impedance p_keyboard_keyscan_mcu_start_loop: -0118 1a40a401 increase 1 ,regb -0119 6fe14caa fetch 2 ,mem_keyscan_value_ptr -011a 20400102 call p_keyboard_keyscan_value_store -011b 1fe67c13 sub pdata ,19 ,null -011c 2021010e branch p_keyboard_keyscan_mcu_start ,positive -011d 20600000 rtn +0117 1a40a401 increase 1 ,regb +0118 6fe14caa fetch 2 ,mem_keyscan_value_ptr +0119 20400101 call p_keyboard_keyscan_value_store +011a 1fe67c13 sub pdata ,19 ,null +011b 2021010d branch p_keyboard_keyscan_mcu_start ,positive +011c 20600000 rtn p_keyboard_keyscan_get_col_value: +011d 20000096 nop 150 011e 6fe14c5d fetch 2 ,mem_kb_row_ptr 011f 1fe22600 copy pdata ,regc 0120 df200008 arg 8 ,loopcnt Index: output/ramcode.rom =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/ramcode.rom (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/output/ramcode.rom (working copy) @@ -205,7 +205,7 @@ 20405f7d 242080c7 204000f1 -2040010b +2040010a 2040013b 6fe14c61 1fe22400 @@ -253,8 +253,7 @@ 204000fe 20200139 704cae00 -20000096 -2040011e +2040011d 6fe14cac 1fe20a00 6fe0ccaf @@ -271,19 +270,20 @@ 704cae00 e8408012 284ffe07 -20208118 +20208117 20405f8d -2040011e +2040011d e8408012 20405f89 e8408012 20405fa3 1a40a401 6fe14caa -20400102 +20400101 1fe67c13 -2021010e +2021010d 20600000 +20000096 6fe14c5d 1fe22600 df200008 Index: program/patch.prog =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/program/patch.prog (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ1030_keyboard_sdk_rgb_only24G_2M/program/patch.prog (working copy) @@ -444,7 +444,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: @@ -482,6 +481,7 @@ rtn p_keyboard_keyscan_get_col_value: + nop 150 fetch 2,mem_kb_row_ptr copy pdata,regc arg 8,loopcnt