Index: format/app_shutter_dy.format =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/format/app_shutter_dy.format (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/format/app_shutter_dy.format (working copy) @@ -197,8 +197,8 @@ // 1 mem_shutter_dy_fouse_time // 1 mem_shutter_fouse_select // 1 mem_shutter_dy_fouse_count -5 mem_shutter_mode_step_android -3 mem_shutter_mode_step_ios +8 mem_shutter_mode_step_android +8 mem_shutter_mode_step_ios 1 mem_shutter_mode_step_time 1 mem_shutter_mode_step_click_count Index: output/bt_format.meta =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_format.meta (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_format.meta (working copy) @@ -2435,35 +2435,35 @@ 0x4fb8 mem_shutter_key_evt_timer_count 0x4fb9 mem_shutter_key_evt_btclk 0x4fbd mem_shutter_mode_step_android -0x4fc2 mem_shutter_mode_step_ios -0x4fc5 mem_shutter_mode_step_time -0x4fc6 mem_shutter_mode_step_click_count -0x4fc7 mem_shutter_vdd_calculate_set -0x4fc7 mem_shutter_vdd_full_vol -0x4fc9 mem_shutter_vdd_empty_vol -0x4fcb mem_shutter_vdd_low_vol -0x4fcd mem_shutter_vdd_now_vol -0x4fcf mem_shutter_start_adc_flag -0x4fd0 mem_shutter_adc_read_timer -0x4fd1 mem_shutter_enable_low_voltage_flag -0x4fd2 mem_shutter_adc_last_low_voltage_flag -0x4fd3 mem_shutter_battery_level_percentage -0x4fd4 mem_shutter_adc_read_time_init -0x4fd5 mem_shutter_low_volatge_led_time -0x4fd6 mem_shutter_low_voltage_led_status -0x4fd7 mem_shutter_dy_step_mode_android -0x4fe0 mem_shutter_low_led_flag -0x4fe1 mem_shutter_low_voltage_led_gpio -0x4fe2 mem_chrg_wake_gpio -0x4fe3 mem_chrg_event_time -0x4fe4 mem_chrg_poweron_event_time -0x4fe5 mem_shutter_red_led_on_time -0x4fe6 mem_shutter_red_led_gpio -0x4fe7 mem_shutter_led_state -0x4fe8 mem_shutter_charge_flag -0x4fe9 mem_shutter_use_bit1 -0x4fea mem_shutter_dy_step_mode_ios -0x4ff2 mem_shutter_dy_end +0x4fc5 mem_shutter_mode_step_ios +0x4fcd mem_shutter_mode_step_time +0x4fce mem_shutter_mode_step_click_count +0x4fcf mem_shutter_vdd_calculate_set +0x4fcf mem_shutter_vdd_full_vol +0x4fd1 mem_shutter_vdd_empty_vol +0x4fd3 mem_shutter_vdd_low_vol +0x4fd5 mem_shutter_vdd_now_vol +0x4fd7 mem_shutter_start_adc_flag +0x4fd8 mem_shutter_adc_read_timer +0x4fd9 mem_shutter_enable_low_voltage_flag +0x4fda mem_shutter_adc_last_low_voltage_flag +0x4fdb mem_shutter_battery_level_percentage +0x4fdc mem_shutter_adc_read_time_init +0x4fdd mem_shutter_low_volatge_led_time +0x4fde mem_shutter_low_voltage_led_status +0x4fdf mem_shutter_dy_step_mode_android +0x4fe8 mem_shutter_low_led_flag +0x4fe9 mem_shutter_low_voltage_led_gpio +0x4fea mem_chrg_wake_gpio +0x4feb mem_chrg_event_time +0x4fec mem_chrg_poweron_event_time +0x4fed mem_shutter_red_led_on_time +0x4fee mem_shutter_red_led_gpio +0x4fef mem_shutter_led_state +0x4ff0 mem_shutter_charge_flag +0x4ff1 mem_shutter_use_bit1 +0x4ff2 mem_shutter_dy_step_mode_ios +0x4ffa mem_shutter_dy_end 0x45ed mem_mesh_vendor_timer_timing_index_cyclic 0x45ee mem_mesh_vendor_timer_timing_time_cyclic Index: output/bt_program23.icode =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_program23.icode (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_program23.icode (working copy) @@ -451,7 +451,7 @@ 00000450 0x00000266 call 0x00007396 00000451 0x00000267 rtn 0x0000002b 00000452 0x00000268 call 0x000070d7 - 00000453 0x00000269 jam 0x00000005 , 0x00004fe4 + 00000453 0x00000269 jam 0x00000005 , 0x00004fec 00000454 0x0000026a call 0x000042a3 00000455 0x0000026b call 0x000003ca 00000456 0x0000026c call 0x000001ba @@ -469,9 +469,9 @@ 00000468 0x0000027c store 0x00000002 , 0x000043d3 00000469 0x0000027e setarg 0x00001e1e 00000470 0x0000027f store 0x00000002 , 0x0000451d - 00000471 0x00000281 fetcht 0x00000001 , 0x00004fe2 + 00000471 0x00000281 fetcht 0x00000001 , 0x00004fea 00000472 0x00000282 call 0x00006edd - 00000473 0x00000283 fetcht 0x00000001 , 0x00004fe2 + 00000473 0x00000283 fetcht 0x00000001 , 0x00004fea 00000474 0x00000284 call 0x00006ee6 00000475 0x00000285 ncall 0x0000024b , 0x00000001 00000476 0x00000287 setarg 0x00000204 @@ -500,9 +500,9 @@ 00000499 0x000002a8 jam 0x00000001 , 0x000044e4 00000500 0x000002a9 call 0x00007776 00000501 0x000002aa call 0x00007780 - 00000502 0x000002ac fetcht 0x00000001 , 0x00004fe2 + 00000502 0x000002ac fetcht 0x00000001 , 0x00004fea 00000503 0x000002ad call 0x00006edd - 00000504 0x000002ae fetcht 0x00000001 , 0x00004fe2 + 00000504 0x000002ae fetcht 0x00000001 , 0x00004fea 00000505 0x000002af call 0x00006ee6 00000506 0x000002b0 branch 0x00000202 , 0x00000001 00000507 0x000002b2 fetch 0x00000001 , 0x000046d0 @@ -512,7 +512,7 @@ 00000511 0x000002b7 fetch 0x00000002 , 0x000044e9 00000512 0x000002b8 rtnbit1 0x0000000c 00000513 0x000002b9 branch 0x00004327 - 00000514 0x000002bd jam 0x00000005 , 0x00004fe3 + 00000514 0x000002bd jam 0x00000005 , 0x00004feb 00000515 0x000002be branch 0x00000248 00000516 0x000002c2 call 0x00006f35 00000517 0x000002c3 jam 0x000000ff , 0x000044ec @@ -521,9 +521,9 @@ 00000520 0x000002c6 call 0x0000701b 00000521 0x000002c7 call 0x0000020b 00000522 0x000002c8 branch 0x0000739a - 00000523 0x000002cc fetcht 0x00000001 , 0x00004fe2 + 00000523 0x000002cc fetcht 0x00000001 , 0x00004fea 00000524 0x000002cd call 0x00006edd - 00000525 0x000002ce fetcht 0x00000001 , 0x00004fe2 + 00000525 0x000002ce fetcht 0x00000001 , 0x00004fea 00000526 0x000002cf set0 0x00000007 , 0x00000002 00000527 0x000002d0 branch 0x00006eb6 00000528 0x000002d3 fetch 0x00000001 , 0x000046ce @@ -552,55 +552,55 @@ 00000551 0x000002f0 call 0x0000675a 00000552 0x000002f1 call 0x0000025c 00000553 0x000002f2 branch 0x000064d9 - 00000554 0x000002f5 fetch 0x00000001 , 0x00004fd1 + 00000554 0x000002f5 fetch 0x00000001 , 0x00004fd9 00000555 0x000002f6 nrtn 0x00000034 - 00000556 0x000002f7 arg 0x00004fe4 , 0x00000013 + 00000556 0x000002f7 arg 0x00004fec , 0x00000013 00000557 0x000002f8 arg 0x0000022f , 0x00000012 00000558 0x000002f9 branch 0x000042e0 - 00000559 0x000002fc jam 0x00000005 , 0x00004fe4 - 00000560 0x000002fd fetcht 0x00000001 , 0x00004fe2 + 00000559 0x000002fc jam 0x00000005 , 0x00004fec + 00000560 0x000002fd fetcht 0x00000001 , 0x00004fea 00000561 0x000002fe call 0x00006edd - 00000562 0x000002ff fetcht 0x00000001 , 0x00004fe2 + 00000562 0x000002ff fetcht 0x00000001 , 0x00004fea 00000563 0x00000300 call 0x00006ee6 00000564 0x00000301 branch 0x0000023a , 0x00000001 - 00000565 0x00000302 fetch 0x00000001 , 0x00004fe8 + 00000565 0x00000302 fetch 0x00000001 , 0x00004ff0 00000566 0x00000303 rtn 0x00000034 - 00000567 0x00000304 jam 0x00000000 , 0x00004fe8 - 00000568 0x00000305 jam 0x00000000 , 0x00004fe5 + 00000567 0x00000304 jam 0x00000000 , 0x00004ff0 + 00000568 0x00000305 jam 0x00000000 , 0x00004fed 00000569 0x00000306 branch 0x0000024b - 00000570 0x0000030a fetch 0x00000001 , 0x00004fe8 + 00000570 0x0000030a fetch 0x00000001 , 0x00004ff0 00000571 0x0000030b nrtn 0x00000034 - 00000572 0x0000030c jam 0x00000001 , 0x00004fe8 - 00000573 0x0000030d jam 0x00000006 , 0x00004fe5 + 00000572 0x0000030c jam 0x00000001 , 0x00004ff0 + 00000573 0x0000030d jam 0x00000006 , 0x00004fed 00000574 0x0000030e branch 0x00000248 - 00000575 0x00000311 fetch 0x00000001 , 0x00004fe8 + 00000575 0x00000311 fetch 0x00000001 , 0x00004ff0 00000576 0x00000312 rtn 0x00000034 - 00000577 0x00000313 arg 0x00004fe5 , 0x00000013 + 00000577 0x00000313 arg 0x00004fed , 0x00000013 00000578 0x00000314 arg 0x00000244 , 0x00000012 00000579 0x00000315 branch 0x000042e0 - 00000580 0x00000318 jam 0x00000006 , 0x00004fe5 - 00000581 0x00000319 fetch 0x00000001 , 0x00004fe7 + 00000580 0x00000318 jam 0x00000006 , 0x00004fed + 00000581 0x00000319 fetch 0x00000001 , 0x00004fef 00000582 0x0000031a beq 0x00000001 , 0x0000024b 00000583 0x0000031b branch 0x00000248 - 00000584 0x0000031e jam 0x00000001 , 0x00004fe7 - 00000585 0x0000031f fetcht 0x00000001 , 0x00004fe6 + 00000584 0x0000031e jam 0x00000001 , 0x00004fef + 00000585 0x0000031f fetcht 0x00000001 , 0x00004fee 00000586 0x00000320 branch 0x00006ef3 - 00000587 0x00000323 jam 0x00000000 , 0x00004fe7 - 00000588 0x00000324 fetcht 0x00000001 , 0x00004fe6 + 00000587 0x00000323 jam 0x00000000 , 0x00004fef + 00000588 0x00000324 fetcht 0x00000001 , 0x00004fee 00000589 0x00000325 branch 0x00006ef7 - 00000590 0x00000328 arg 0x00004fe3 , 0x00000013 + 00000590 0x00000328 arg 0x00004feb , 0x00000013 00000591 0x00000329 arg 0x00000251 , 0x00000012 00000592 0x0000032a branch 0x000042e0 - 00000593 0x0000032e jam 0x00000005 , 0x00004fe3 - 00000594 0x0000032f fetcht 0x00000001 , 0x00004fe2 + 00000593 0x0000032e jam 0x00000005 , 0x00004feb + 00000594 0x0000032f fetcht 0x00000001 , 0x00004fea 00000595 0x00000330 call 0x00006ee6 00000596 0x00000331 branch 0x00000257 , 0x00000001 00000597 0x00000332 call 0x0000024b 00000598 0x00000333 branch 0x00004327 - 00000599 0x00000338 fetch 0x00000001 , 0x00004fe8 + 00000599 0x00000338 fetch 0x00000001 , 0x00004ff0 00000600 0x00000339 nrtn 0x00000034 - 00000601 0x0000033a jam 0x00000001 , 0x00004fe8 - 00000602 0x0000033b jam 0x00000006 , 0x00004fe5 + 00000601 0x0000033a jam 0x00000001 , 0x00004ff0 + 00000602 0x0000033b jam 0x00000006 , 0x00004fed 00000603 0x0000033c branch 0x00000248 00000604 0x0000033f arg 0x00004518 , 0x00000013 00000605 0x00000340 arg 0x0000025f , 0x00000012 @@ -609,30 +609,30 @@ 00000608 0x00000344 call 0x00004325 00000609 0x00000346 call 0x0000634e 00000610 0x00000347 branch 0x0000639e - 00000611 0x0000034a arg 0x00004fc5 , 0x00000013 + 00000611 0x0000034a arg 0x00004fcd , 0x00000013 00000612 0x0000034b arg 0x00000266 , 0x00000012 00000613 0x0000034c branch 0x000042e0 - 00000614 0x0000034e fetch 0x00000001 , 0x00004fc6 + 00000614 0x0000034e fetch 0x00000001 , 0x00004fce 00000615 0x0000034f beq 0x00000001 , 0x0000026b 00000616 0x00000350 beq 0x00000002 , 0x00000273 - 00000617 0x00000351 jam 0x00000000 , 0x00004fc6 + 00000617 0x00000351 jam 0x00000000 , 0x00004fce 00000618 0x00000352 rtn - 00000619 0x00000355 jam 0x00000000 , 0x00004fc6 + 00000619 0x00000355 jam 0x00000000 , 0x00004fce 00000620 0x00000356 call 0x0000026e 00000621 0x00000357 branch 0x00006371 00000622 0x0000035a arg 0x00004fbd , 0x00000013 00000623 0x0000035b call 0x00006730 00000624 0x0000035c rtn 0x00000034 - 00000625 0x0000035d arg 0x00004fc2 , 0x00000013 + 00000625 0x0000035d arg 0x00004fc5 , 0x00000013 00000626 0x0000035e rtn - 00000627 0x00000361 jam 0x00000000 , 0x00004fc6 + 00000627 0x00000361 jam 0x00000000 , 0x00004fce 00000628 0x00000362 call 0x00000276 00000629 0x00000363 branch 0x00006371 - 00000630 0x00000366 arg 0x00004fd7 , 0x00000013 + 00000630 0x00000366 arg 0x00004fdf , 0x00000013 00000631 0x00000367 call 0x00006730 00000632 0x00000368 rtn 0x00000034 00000633 0x00000369 jam 0x0000000a , 0x000049e5 - 00000634 0x0000036a arg 0x00004fea , 0x00000013 + 00000634 0x0000036a arg 0x00004ff2 , 0x00000013 00000635 0x0000036b rtn 00000636 0x0000036e copy 0x00000013 , 0x0000003f 00000637 0x0000036f beq 0x00000040 , 0x00000288 @@ -762,11 +762,11 @@ 00000761 0x0000040c branch 0x00006558 00000762 0x0000040f rtn 00000763 0x00000412 rtn - 00000764 0x00000415 jam 0x00000006 , 0x00004fc5 - 00000765 0x00000416 fetch 0x00000001 , 0x00004fc6 + 00000764 0x00000415 jam 0x00000006 , 0x00004fcd + 00000765 0x00000416 fetch 0x00000001 , 0x00004fce 00000766 0x00000417 rtneq 0x00000002 00000767 0x00000418 increase 0x00000001 , 0x0000003f - 00000768 0x00000419 store 0x00000001 , 0x00004fc6 + 00000768 0x00000419 store 0x00000001 , 0x00004fce 00000769 0x0000041a rtn 00000770 0x0000041d rtn 00000771 0x00000422 arg 0x00004a30 , 0x00000013 @@ -968,48 +968,48 @@ 00000967 0x00000521 copy 0x0000003f , 0x00000011 00000968 0x00000522 rtn 00000969 0x00000524 rtn - 00000970 0x00000528 jam 0x00000001 , 0x00004fcf + 00000970 0x00000528 jam 0x00000001 , 0x00004fd7 00000971 0x00000529 rtn - 00000972 0x0000052c fetch 0x00000001 , 0x00004fcf + 00000972 0x0000052c fetch 0x00000001 , 0x00004fd7 00000973 0x0000052d rtn 0x00000034 - 00000974 0x0000052e fetch 0x00000001 , 0x00004fd1 + 00000974 0x0000052e fetch 0x00000001 , 0x00004fd9 00000975 0x0000052f rtn 0x00000034 - 00000976 0x00000530 arg 0x00004fd5 , 0x00000013 + 00000976 0x00000530 arg 0x00004fdd , 0x00000013 00000977 0x00000531 arg 0x000003d3 , 0x00000012 00000978 0x00000532 branch 0x000042e0 - 00000979 0x00000535 jam 0x00000005 , 0x00004fd5 - 00000980 0x00000536 fetch 0x00000001 , 0x00004fe0 + 00000979 0x00000535 jam 0x00000005 , 0x00004fdd + 00000980 0x00000536 fetch 0x00000001 , 0x00004fe8 00000981 0x00000537 setflip 0x00000000 , 0x0000003f - 00000982 0x00000538 store 0x00000001 , 0x00004fe0 + 00000982 0x00000538 store 0x00000001 , 0x00004fe8 00000983 0x00000539 beq 0x00000001 , 0x000003db 00000984 0x0000053a branch 0x000003d9 - 00000985 0x0000053d fetcht 0x00000001 , 0x00004fe6 + 00000985 0x0000053d fetcht 0x00000001 , 0x00004fee 00000986 0x0000053e branch 0x00006ef7 - 00000987 0x00000541 fetcht 0x00000001 , 0x00004fe6 + 00000987 0x00000541 fetcht 0x00000001 , 0x00004fee 00000988 0x00000542 branch 0x00006ef3 - 00000989 0x00000545 fetch 0x00000001 , 0x00004fd0 + 00000989 0x00000545 fetch 0x00000001 , 0x00004fd8 00000990 0x00000546 increase 0x00000001 , 0x0000003f - 00000991 0x00000547 store 0x00000001 , 0x00004fd0 - 00000992 0x00000548 fetcht 0x00000001 , 0x00004fd4 + 00000991 0x00000547 store 0x00000001 , 0x00004fd8 + 00000992 0x00000548 fetcht 0x00000001 , 0x00004fdc 00000993 0x00000549 isub 0x00000002 , 0x0000003e 00000994 0x0000054a rtn - 00000995 0x00000551 fetch 0x00000001 , 0x00004fcf + 00000995 0x00000551 fetch 0x00000001 , 0x00004fd7 00000996 0x00000552 rtn 0x00000034 00000997 0x00000553 call 0x000003dd 00000998 0x00000555 nrtn 0x00000002 - 00000999 0x00000556 jam 0x00000000 , 0x00004fd0 + 00000999 0x00000556 jam 0x00000000 , 0x00004fd8 00001000 0x00000557 jam 0x00000001 , 0x00004407 00001001 0x00000558 call 0x00006ff3 00001002 0x00000559 call 0x00006feb 00001003 0x0000055a call 0x0000045c 00001004 0x0000055b call 0x0000043d - 00001005 0x0000055c store 0x00000002 , 0x00004fcd - 00001006 0x0000055e arg 0x00004fc7 , 0x00000011 + 00001005 0x0000055c store 0x00000002 , 0x00004fd5 + 00001006 0x0000055e arg 0x00004fcf , 0x00000011 00001007 0x0000055f call 0x000003f5 00001008 0x00000560 fetch 0x00000001 , 0x0000440c 00001009 0x00000561 bbit1 0x00000001 , 0x00000415 00001010 0x00000562 bbit0 0x00000000 , 0x00000419 - 00001011 0x00000563 jam 0x00000001 , 0x00004fd2 + 00001011 0x00000563 jam 0x00000001 , 0x00004fda 00001012 0x00000564 branch 0x00000417 00001013 0x00000567 ifetch 0x00000008 , 0x00000011 00001014 0x00000568 store 0x00000008 , 0x00000670 @@ -1037,21 +1037,21 @@ 00001036 0x00000581 copy 0x00000011 , 0x0000003f 00001037 0x00000582 idiv 0x00000002 00001038 0x00000583 call 0x00007d5f - 00001039 0x00000584 store 0x00000001 , 0x00004fd3 + 00001039 0x00000584 store 0x00000001 , 0x00004fdb 00001040 0x00000585 rtn - 00001041 0x00000588 jam 0x00000064 , 0x00004fd3 + 00001041 0x00000588 jam 0x00000064 , 0x00004fdb 00001042 0x00000589 rtn - 00001043 0x0000058b jam 0x00000000 , 0x00004fd3 + 00001043 0x0000058b jam 0x00000000 , 0x00004fdb 00001044 0x0000058c rtn 00001045 0x0000058f call 0x00004325 00001046 0x00000590 branch 0x00004327 - 00001047 0x00000593 jam 0x00000001 , 0x00004fd1 + 00001047 0x00000593 jam 0x00000001 , 0x00004fd9 00001048 0x00000594 rtn - 00001049 0x00000597 jam 0x00000000 , 0x00004fd1 - 00001050 0x00000598 fetch 0x00000001 , 0x00004fd2 + 00001049 0x00000597 jam 0x00000000 , 0x00004fd9 + 00001050 0x00000598 fetch 0x00000001 , 0x00004fda 00001051 0x00000599 rtn 0x00000034 00001052 0x0000059a call 0x000003d9 - 00001053 0x0000059b jam 0x00000000 , 0x00004fd2 + 00001053 0x0000059b jam 0x00000000 , 0x00004fda 00001054 0x0000059c rtn 00001055 0x000005a2 fetch 0x00000008 , 0x000001fd 00001056 0x000005a3 branch 0x00006f79 , 0x00000034 Index: output/bt_program23.meta =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_program23.meta (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_program23.meta (working copy) @@ -338,7 +338,7 @@ p_shutter_dy_not_iphone_read_conf: branch p_shutter_dy_remote_not_iphone - + p_shutter_dy_remote_not_iphone: jam 1,mem_shutter_back_count jam 0,mem_iphone_flag @@ -381,7 +381,7 @@ p_fouse_down_long_release: rtn p_shutter_fouse_release_clear: - + rtn p_main_loop: @@ -643,7 +643,7 @@ fetcht 1,mem_chrg_wake_gpio call gpio_get_bit ncall p_shutter_red_led_off,true - + setarg p_shutter_le_before_hibernate store 2,mem_cb_before_hibernate @@ -669,7 +669,7 @@ fetch 8,mem_ble_shutter_interval_min_new store 8,mem_ble_shutter_interval_min - + // call shutter_dy_iphone_every_move_max_set fetch 1, mem_shutter_hard_soft_switch_case beq HARD_SWITCH, shutter_hart_swtich_power_on @@ -778,7 +778,7 @@ fetch 1,mem_shutter_charge_flag //初始为0 nrtn blank jam 1,mem_shutter_charge_flag //充电则置1 - jam 6,mem_shutter_red_led_on_time + jam 6,mem_shutter_red_led_on_time branch p_shutter_red_led_on p_shutter_red_led_on_timer: @@ -802,7 +802,7 @@ p_shutter_red_led_off: jam OFF,mem_shutter_led_state fetcht 1,mem_shutter_red_led_gpio - branch gpio_out_active + branch gpio_out_active p_chrg_wake_event_timer: arg mem_chrg_event_time,regc @@ -816,7 +816,7 @@ call gpio_get_bit branch p_chrg_wake_led_event,true //在充电 call p_shutter_red_led_off - branch app_enter_hibernate + branch app_enter_hibernate p_chrg_wake_led_event: @@ -824,7 +824,7 @@ fetch 1,mem_shutter_charge_flag //初始为0 nrtn blank jam 1,mem_shutter_charge_flag //充电则置1 - jam 6,mem_shutter_red_led_on_time + jam 6,mem_shutter_red_led_on_time branch p_shutter_red_led_on p_shutter_check_sleep_timer: @@ -1294,7 +1294,7 @@ rtn p_shutter_dy_fouseup_event_ios: rtn -p_shutter_dy_fouseup_init: +p_shutter_dy_fouseup_init: rtn p_shutter_dy_fousedown_event: rtn @@ -1336,8 +1336,8 @@ store 1,mem_shutter_low_led_flag beq 1,p_shutter_low_voltage_led_on branch p_shutter_low_voltage_led_off - -p_shutter_low_voltage_led_off: + +p_shutter_low_voltage_led_off: fetcht 1,mem_shutter_red_led_gpio branch gpio_out_active @@ -1519,7 +1519,7 @@ jam 0x00,core_gpadc_cfg3 rtn -p_enable_adc: +p_enable_adc: // fetch 1,mem_shutter_use_bit1 // rtnbit0 SHUTTER_BIT_ADC_ENABLE Index: output/bt_program23.rom =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_program23.rom (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/bt_program23.rom (working copy) @@ -451,7 +451,7 @@ 00100000010000000111001110010110 00100000011101011000000000000000 00100000010000000111000011010111 -01110000010011111110010000000101 +01110000010011111110110000000101 00100000010000000100001010100011 00100000010000000000001111001010 00100000010000000000000110111010 @@ -469,9 +469,9 @@ 01100111111000010100001111010011 01011000000000000001111000011110 01100111111000010100010100011101 -01101000010010001100111111100010 +01101000010010001100111111101010 00100000010000000110111011011101 -01101000010010001100111111100010 +01101000010010001100111111101010 00100000010000000110111011100110 00100100010000001000001001001011 01011000000000000000001000000100 @@ -500,9 +500,9 @@ 01110000010001001110010000000001 00100000010000000111011101110110 00100000010000000111011110000000 -01101000010010001100111111100010 +01101000010010001100111111101010 00100000010000000110111011011101 -01101000010010001100111111100010 +01101000010010001100111111101010 00100000010000000110111011100110 00100000001000001000001000000010 01101111111000001100011011010000 @@ -512,7 +512,7 @@ 01101111111000010100010011101001 11000011100001100000000000000000 00100000001000000100001100100111 -01110000010011111110001100000101 +01110000010011111110101100000101 00100000001000000000001001001000 00100000010000000110111100110101 01110000010001001110110011111111 @@ -521,9 +521,9 @@ 00100000010000000111000000011011 00100000010000000000001000001011 00100000001000000111001110011010 -01101000010010001100111111100010 +01101000010010001100111111101010 00100000010000000110111011011101 -01101000010010001100111111100010 +01101000010010001100111111101010 01111001001111111000010000000111 00100000001000000110111010110110 01101111111000001100011011001110 @@ -552,55 +552,55 @@ 00100000010000000110011101011010 00100000010000000000001001011100 00100000001000000110010011011001 -01101111111000001100111111010001 +01101111111000001100111111011001 00100100011110100000000000000000 -11011010011000000100111111100100 +11011010011000000100111111101100 11011010010000000000001000101111 00100000001000000100001011100000 -01110000010011111110010000000101 -01101000010010001100111111100010 +01110000010011111110110000000101 +01101000010010001100111111101010 00100000010000000110111011011101 -01101000010010001100111111100010 +01101000010010001100111111101010 00100000010000000110111011100110 00100000001000001000001000111010 -01101111111000001100111111101000 +01101111111000001100111111110000 00100000011110100000000000000000 -01110000010011111110100000000000 -01110000010011111110010100000000 +01110000010011111111000000000000 +01110000010011111110110100000000 00100000001000000000001001001011 -01101111111000001100111111101000 +01101111111000001100111111110000 00100100011110100000000000000000 -01110000010011111110100000000001 -01110000010011111110010100000110 +01110000010011111111000000000001 +01110000010011111110110100000110 00100000001000000000001001001000 -01101111111000001100111111101000 +01101111111000001100111111110000 00100000011110100000000000000000 -11011010011000000100111111100101 +11011010011000000100111111101101 11011010010000000000001001000100 00100000001000000100001011100000 -01110000010011111110010100000110 -01101111111000001100111111100111 +01110000010011111110110100000110 +01101111111000001100111111101111 11000000000000001000001001001011 00100000001000000000001001001000 -01110000010011111110011100000001 -01101000010010001100111111100110 +01110000010011111110111100000001 +01101000010010001100111111101110 00100000001000000110111011110011 -01110000010011111110011100000000 -01101000010010001100111111100110 +01110000010011111110111100000000 +01101000010010001100111111101110 00100000001000000110111011110111 -11011010011000000100111111100011 +11011010011000000100111111101011 11011010010000000000001001010001 00100000001000000100001011100000 -01110000010011111110001100000101 -01101000010010001100111111100010 +01110000010011111110101100000101 +01101000010010001100111111101010 00100000010000000110111011100110 00100000001000001000001001010111 00100000010000000000001001001011 00100000001000000100001100100111 -01101111111000001100111111101000 +01101111111000001100111111110000 00100100011110100000000000000000 -01110000010011111110100000000001 -01110000010011111110010100000110 +01110000010011111111000000000001 +01110000010011111110110100000110 00100000001000000000001001001000 11011010011000000100010100011000 11011010010000000000001001011111 @@ -609,30 +609,30 @@ 00100000010000000100001100100101 00100000010000000110001101001110 00100000001000000110001110011110 -11011010011000000100111111000101 +11011010011000000100111111001101 11011010010000000000001001100110 00100000001000000100001011100000 -01101111111000001100111111000110 +01101111111000001100111111001110 11000000000000001000001001101011 11000000000000010000001001110011 -01110000010011111100011000000000 +01110000010011111100111000000000 00100000011000000000000000000000 -01110000010011111100011000000000 +01110000010011111100111000000000 00100000010000000000001001101110 00100000001000000110001101110001 11011010011000000100111110111101 00100000010000000110011100110000 00100000011110100000000000000000 -11011010011000000100111111000010 +11011010011000000100111111000101 00100000011000000000000000000000 -01110000010011111100011000000000 +01110000010011111100111000000000 00100000010000000000001001110110 00100000001000000110001101110001 -11011010011000000100111111010111 +11011010011000000100111111011111 00100000010000000110011100110000 00100000011110100000000000000000 01110000010010011110010100001010 -11011010011000000100111111101010 +11011010011000000100111111110010 00100000011000000000000000000000 00011010011000100111111000000000 11000000001000000000001010001000 @@ -762,11 +762,11 @@ 00100000001000000110010101011000 00100000011000000000000000000000 00100000011000000000000000000000 -01110000010011111100010100000110 -01101111111000001100111111000110 +01110000010011111100110100000110 +01101111111000001100111111001110 11000001000000010000000000000000 00011111111000001111111000000001 -01100111111000001100111111000110 +01100111111000001100111111001110 00100000011000000000000000000000 00100000011000000000000000000000 11011010011000000100101000110000 @@ -968,48 +968,48 @@ 00011111111000100010001000000000 00100000011000000000000000000000 00100000011000000000000000000000 -01110000010011111100111100000001 +01110000010011111101011100000001 00100000011000000000000000000000 -01101111111000001100111111001111 +01101111111000001100111111010111 00100000011110100000000000000000 -01101111111000001100111111010001 +01101111111000001100111111011001 00100000011110100000000000000000 -11011010011000000100111111010101 +11011010011000000100111111011101 11011010010000000000001111010011 00100000001000000100001011100000 -01110000010011111101010100000101 -01101111111000001100111111100000 +01110000010011111101110100000101 +01101111111000001100111111101000 01111001010000000111111000000000 -01100111111000001100111111100000 +01100111111000001100111111101000 11000000000000001000001111011011 00100000001000000000001111011001 -01101000010010001100111111100110 +01101000010010001100111111101110 00100000001000000110111011110111 -01101000010010001100111111100110 +01101000010010001100111111101110 00100000001000000110111011110011 -01101111111000001100111111010000 +01101111111000001100111111011000 00011111111000001111111000000001 -01100111111000001100111111010000 -01101000010010001100111111010100 +01100111111000001100111111011000 +01101000010010001100111111011100 10011000010001100111110000000000 00100000011000000000000000000000 -01101111111000001100111111001111 +01101111111000001100111111010111 00100000011110100000000000000000 00100000010000000000001111011101 00100100011000010000000000000000 -01110000010011111101000000000000 +01110000010011111101100000000000 01110000010001000000011100000001 00100000010000000110111111110011 00100000010000000110111111101011 00100000010000000000010001011100 00100000010000000000010000111101 -01100111111000010100111111001101 -11011010001000000100111111000111 +01100111111000010100111111010101 +11011010001000000100111111001111 00100000010000000000001111110101 01101111111000001100010000001100 11000010100000001000010000010101 11000011000000000000010000011001 -01110000010011111101001000000001 +01110000010011111101101000000001 00100000001000000000010000010111 11101111111001000000000000010001 01100111111001000000011001110000 @@ -1037,21 +1037,21 @@ 00011010001000100111111000000000 10011000010001101111110000000000 00100000010000000111110101011111 -01100111111000001100111111010011 +01100111111000001100111111011011 00100000011000000000000000000000 -01110000010011111101001101100100 +01110000010011111101101101100100 00100000011000000000000000000000 -01110000010011111101001100000000 +01110000010011111101101100000000 00100000011000000000000000000000 00100000010000000100001100100101 00100000001000000100001100100111 -01110000010011111101000100000001 +01110000010011111101100100000001 00100000011000000000000000000000 -01110000010011111101000100000000 -01101111111000001100111111010010 +01110000010011111101100100000000 +01101111111000001100111111011010 00100000011110100000000000000000 00100000010000000000001111011001 -01110000010011111101001000000000 +01110000010011111101101000000000 00100000011000000000000000000000 01101111111001000000000111111101 00100000001110100110111101111001 Index: output/eeprom.dat =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/eeprom.dat (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/eeprom.dat (working copy) @@ -1818,7 +1818,7 @@ d7 70 4f -e4 +ec 05 20 40 @@ -1891,7 +1891,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -1899,7 +1899,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2015,7 +2015,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2023,7 +2023,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2062,7 +2062,7 @@ 27 70 4f -e3 +eb 05 20 20 @@ -2099,7 +2099,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2107,7 +2107,7 @@ 68 48 cf -e2 +ea 79 3f 84 @@ -2223,7 +2223,7 @@ 6f e0 cf -d1 +d9 24 7a 00 @@ -2231,7 +2231,7 @@ da 60 4f -e4 +ec da 40 02 @@ -2242,12 +2242,12 @@ e0 70 4f -e4 +ec 05 68 48 cf -e2 +ea 20 40 6e @@ -2255,7 +2255,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2267,18 +2267,18 @@ 6f e0 cf -e8 +f0 20 7a 00 00 70 4f -e8 +f0 00 70 4f -e5 +ed 00 20 20 @@ -2287,18 +2287,18 @@ 6f e0 cf -e8 +f0 24 7a 00 00 70 4f -e8 +f0 01 70 4f -e5 +ed 06 20 20 @@ -2307,7 +2307,7 @@ 6f e0 cf -e8 +f0 20 7a 00 @@ -2315,7 +2315,7 @@ da 60 4f -e5 +ed da 40 02 @@ -2326,12 +2326,12 @@ e0 70 4f -e5 +ed 06 6f e0 cf -e7 +ef c0 00 82 @@ -2342,24 +2342,24 @@ 48 70 4f -e7 +ef 01 68 48 cf -e6 +ee 20 20 6e f3 70 4f -e7 +ef 00 68 48 cf -e6 +ee 20 20 6e @@ -2367,7 +2367,7 @@ da 60 4f -e3 +eb da 40 02 @@ -2378,12 +2378,12 @@ e0 70 4f -e3 +eb 05 68 48 cf -e2 +ea 20 40 6e @@ -2403,18 +2403,18 @@ 6f e0 cf -e8 +f0 24 7a 00 00 70 4f -e8 +f0 01 70 4f -e5 +ed 06 20 20 @@ -2451,7 +2451,7 @@ da 60 4f -c5 +cd da 40 02 @@ -2463,7 +2463,7 @@ 6f e0 cf -c6 +ce c0 00 82 @@ -2474,7 +2474,7 @@ 73 70 4f -c6 +ce 00 20 60 @@ -2482,7 +2482,7 @@ 00 70 4f -c6 +ce 00 20 40 @@ -2507,14 +2507,14 @@ da 60 4f -c2 +c5 20 60 00 00 70 4f -c6 +ce 00 20 40 @@ -2527,7 +2527,7 @@ da 60 4f -d7 +df 20 40 67 @@ -2543,7 +2543,7 @@ da 60 4f -ea +f2 20 60 00 @@ -3062,12 +3062,12 @@ 00 70 4f -c5 +cd 06 6f e0 cf -c6 +ce c1 01 00 @@ -3079,7 +3079,7 @@ 67 e0 cf -c6 +ce 20 60 00 @@ -3886,7 +3886,7 @@ 00 70 4f -cf +d7 01 20 60 @@ -3895,7 +3895,7 @@ 6f e0 cf -cf +d7 20 7a 00 @@ -3903,7 +3903,7 @@ 6f e0 cf -d1 +d9 20 7a 00 @@ -3911,7 +3911,7 @@ da 60 4f -d5 +dd da 40 03 @@ -3922,12 +3922,12 @@ e0 70 4f -d5 +dd 05 6f e0 cf -e0 +e8 79 40 7e @@ -3935,7 +3935,7 @@ 67 e0 cf -e0 +e8 c0 00 83 @@ -3947,7 +3947,7 @@ 68 48 cf -e6 +ee 20 20 6e @@ -3955,7 +3955,7 @@ 68 48 cf -e6 +ee 20 20 6e @@ -3963,7 +3963,7 @@ 6f e0 cf -d0 +d8 1f e0 fe @@ -3971,11 +3971,11 @@ 67 e0 cf -d0 +d8 68 48 cf -d4 +dc 98 46 7c @@ -3987,7 +3987,7 @@ 6f e0 cf -cf +d7 20 7a 00 @@ -4002,7 +4002,7 @@ 00 70 4f -d0 +d8 00 70 44 @@ -4027,11 +4027,11 @@ 67 e1 4f -cd +d5 da 20 4f -c7 +cf 20 40 03 @@ -4050,7 +4050,7 @@ 19 70 4f -d2 +da 01 20 20 @@ -4163,14 +4163,14 @@ 67 e0 cf -d3 +db 20 60 00 00 70 4f -d3 +db 64 20 60 @@ -4178,7 +4178,7 @@ 00 70 4f -d3 +db 00 20 60 @@ -4194,7 +4194,7 @@ 27 70 4f -d1 +d9 01 20 60 @@ -4202,12 +4202,12 @@ 00 70 4f -d1 +d9 00 6f e0 cf -d2 +da 20 7a 00 @@ -4218,7 +4218,7 @@ d9 70 4f -d2 +da 00 20 60 @@ -4580,8 +4580,8 @@ 60 00 00 -f0 -51 +fb +d8 aa 55 40 @@ -4817,42 +4817,42 @@ 55 01 00 -e9 +f1 4f 01 aa 55 01 00 -e6 +ee 4f 08 aa 55 01 00 -e2 +ea 4f 12 aa 55 01 00 -d5 +dd 4f 05 aa 55 01 00 -d4 +dc 4f 05 aa 55 06 00 -c7 +cf 4f 65 10 @@ -5207,7 +5207,7 @@ 00 aa 55 -08 +07 00 bd 4f @@ -5215,7 +5215,15 @@ 01 1d 1e +25 +26 +00 +aa +55 +03 00 +c5 +4f 1f 20 00 @@ -5223,7 +5231,7 @@ 55 08 00 -d7 +df 4f 1b 1c @@ -5237,7 +5245,7 @@ 55 06 00 -ea +f2 4f 1b 1c @@ -5298,7 +5306,7 @@ 01 aa 55 -d4 +ee 01 02 4c @@ -5619,7 +5627,7 @@ 00 83 40 -0d +0c 40 0a 04 @@ -5770,6 +5778,32 @@ 07 05 0e +0a +23 +00 +83 +80 +0d +d1 +0d +04 +80 +0d +f1 +0d +0a +23 +00 +00 +80 +0d +d1 +0d +04 +80 +0d +f1 +0d aa 55 03 @@ -6698,44 +6732,10 @@ aa aa 55 -27 -7b -05 -75 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +b1 +84 +e0 +b5 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -39 -ee +b2 +8d Index: output/flash.dat =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/flash.dat (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/flash.dat (working copy) @@ -1818,7 +1818,7 @@ d7 70 4f -e4 +ec 05 20 40 @@ -1891,7 +1891,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -1899,7 +1899,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2015,7 +2015,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2023,7 +2023,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2062,7 +2062,7 @@ 27 70 4f -e3 +eb 05 20 20 @@ -2099,7 +2099,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2107,7 +2107,7 @@ 68 48 cf -e2 +ea 79 3f 84 @@ -2223,7 +2223,7 @@ 6f e0 cf -d1 +d9 24 7a 00 @@ -2231,7 +2231,7 @@ da 60 4f -e4 +ec da 40 02 @@ -2242,12 +2242,12 @@ e0 70 4f -e4 +ec 05 68 48 cf -e2 +ea 20 40 6e @@ -2255,7 +2255,7 @@ 68 48 cf -e2 +ea 20 40 6e @@ -2267,18 +2267,18 @@ 6f e0 cf -e8 +f0 20 7a 00 00 70 4f -e8 +f0 00 70 4f -e5 +ed 00 20 20 @@ -2287,18 +2287,18 @@ 6f e0 cf -e8 +f0 24 7a 00 00 70 4f -e8 +f0 01 70 4f -e5 +ed 06 20 20 @@ -2307,7 +2307,7 @@ 6f e0 cf -e8 +f0 20 7a 00 @@ -2315,7 +2315,7 @@ da 60 4f -e5 +ed da 40 02 @@ -2326,12 +2326,12 @@ e0 70 4f -e5 +ed 06 6f e0 cf -e7 +ef c0 00 82 @@ -2342,24 +2342,24 @@ 48 70 4f -e7 +ef 01 68 48 cf -e6 +ee 20 20 6e f3 70 4f -e7 +ef 00 68 48 cf -e6 +ee 20 20 6e @@ -2367,7 +2367,7 @@ da 60 4f -e3 +eb da 40 02 @@ -2378,12 +2378,12 @@ e0 70 4f -e3 +eb 05 68 48 cf -e2 +ea 20 40 6e @@ -2403,18 +2403,18 @@ 6f e0 cf -e8 +f0 24 7a 00 00 70 4f -e8 +f0 01 70 4f -e5 +ed 06 20 20 @@ -2451,7 +2451,7 @@ da 60 4f -c5 +cd da 40 02 @@ -2463,7 +2463,7 @@ 6f e0 cf -c6 +ce c0 00 82 @@ -2474,7 +2474,7 @@ 73 70 4f -c6 +ce 00 20 60 @@ -2482,7 +2482,7 @@ 00 70 4f -c6 +ce 00 20 40 @@ -2507,14 +2507,14 @@ da 60 4f -c2 +c5 20 60 00 00 70 4f -c6 +ce 00 20 40 @@ -2527,7 +2527,7 @@ da 60 4f -d7 +df 20 40 67 @@ -2543,7 +2543,7 @@ da 60 4f -ea +f2 20 60 00 @@ -3062,12 +3062,12 @@ 00 70 4f -c5 +cd 06 6f e0 cf -c6 +ce c1 01 00 @@ -3079,7 +3079,7 @@ 67 e0 cf -c6 +ce 20 60 00 @@ -3886,7 +3886,7 @@ 00 70 4f -cf +d7 01 20 60 @@ -3895,7 +3895,7 @@ 6f e0 cf -cf +d7 20 7a 00 @@ -3903,7 +3903,7 @@ 6f e0 cf -d1 +d9 20 7a 00 @@ -3911,7 +3911,7 @@ da 60 4f -d5 +dd da 40 03 @@ -3922,12 +3922,12 @@ e0 70 4f -d5 +dd 05 6f e0 cf -e0 +e8 79 40 7e @@ -3935,7 +3935,7 @@ 67 e0 cf -e0 +e8 c0 00 83 @@ -3947,7 +3947,7 @@ 68 48 cf -e6 +ee 20 20 6e @@ -3955,7 +3955,7 @@ 68 48 cf -e6 +ee 20 20 6e @@ -3963,7 +3963,7 @@ 6f e0 cf -d0 +d8 1f e0 fe @@ -3971,11 +3971,11 @@ 67 e0 cf -d0 +d8 68 48 cf -d4 +dc 98 46 7c @@ -3987,7 +3987,7 @@ 6f e0 cf -cf +d7 20 7a 00 @@ -4002,7 +4002,7 @@ 00 70 4f -d0 +d8 00 70 44 @@ -4027,11 +4027,11 @@ 67 e1 4f -cd +d5 da 20 4f -c7 +cf 20 40 03 @@ -4050,7 +4050,7 @@ 19 70 4f -d2 +da 01 20 20 @@ -4163,14 +4163,14 @@ 67 e0 cf -d3 +db 20 60 00 00 70 4f -d3 +db 64 20 60 @@ -4178,7 +4178,7 @@ 00 70 4f -d3 +db 00 20 60 @@ -4194,7 +4194,7 @@ 27 70 4f -d1 +d9 01 20 60 @@ -4202,12 +4202,12 @@ 00 70 4f -d1 +d9 00 6f e0 cf -d2 +da 20 7a 00 @@ -4218,7 +4218,7 @@ d9 70 4f -d2 +da 00 20 60 @@ -4580,8 +4580,8 @@ 60 00 00 -f0 -51 +fb +d8 aa 55 40 @@ -4817,42 +4817,42 @@ 55 01 00 -e9 +f1 4f 01 aa 55 01 00 -e6 +ee 4f 08 aa 55 01 00 -e2 +ea 4f 12 aa 55 01 00 -d5 +dd 4f 05 aa 55 01 00 -d4 +dc 4f 05 aa 55 06 00 -c7 +cf 4f 65 10 @@ -5207,7 +5207,7 @@ 00 aa 55 -08 +07 00 bd 4f @@ -5215,7 +5215,15 @@ 01 1d 1e +25 +26 +00 +aa +55 +03 00 +c5 +4f 1f 20 00 @@ -5223,7 +5231,7 @@ 55 08 00 -d7 +df 4f 1b 1c @@ -5237,7 +5245,7 @@ 55 06 00 -ea +f2 4f 1b 1c @@ -5298,7 +5306,7 @@ 01 aa 55 -d4 +ee 01 02 4c @@ -5619,7 +5627,7 @@ 00 83 40 -0d +0c 40 0a 04 @@ -5770,6 +5778,32 @@ 07 05 0e +0a +23 +00 +83 +80 +0d +d1 +0d +04 +80 +0d +f1 +0d +0a +23 +00 +00 +80 +0d +d1 +0d +04 +80 +0d +f1 +0d aa 55 03 @@ -6698,44 +6732,10 @@ aa aa 55 -27 -7b -05 -75 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +b1 +84 +e0 +b5 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -39 -ee +b2 +8d Index: output/memmap.format =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/memmap.format (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/memmap.format (working copy) @@ -2435,35 +2435,35 @@ 0x4fb8 mem_shutter_key_evt_timer_count 0x4fb9 mem_shutter_key_evt_btclk 0x4fbd mem_shutter_mode_step_android -0x4fc2 mem_shutter_mode_step_ios -0x4fc5 mem_shutter_mode_step_time -0x4fc6 mem_shutter_mode_step_click_count -0x4fc7 mem_shutter_vdd_calculate_set -0x4fc7 mem_shutter_vdd_full_vol -0x4fc9 mem_shutter_vdd_empty_vol -0x4fcb mem_shutter_vdd_low_vol -0x4fcd mem_shutter_vdd_now_vol -0x4fcf mem_shutter_start_adc_flag -0x4fd0 mem_shutter_adc_read_timer -0x4fd1 mem_shutter_enable_low_voltage_flag -0x4fd2 mem_shutter_adc_last_low_voltage_flag -0x4fd3 mem_shutter_battery_level_percentage -0x4fd4 mem_shutter_adc_read_time_init -0x4fd5 mem_shutter_low_volatge_led_time -0x4fd6 mem_shutter_low_voltage_led_status -0x4fd7 mem_shutter_dy_step_mode_android -0x4fe0 mem_shutter_low_led_flag -0x4fe1 mem_shutter_low_voltage_led_gpio -0x4fe2 mem_chrg_wake_gpio -0x4fe3 mem_chrg_event_time -0x4fe4 mem_chrg_poweron_event_time -0x4fe5 mem_shutter_red_led_on_time -0x4fe6 mem_shutter_red_led_gpio -0x4fe7 mem_shutter_led_state -0x4fe8 mem_shutter_charge_flag -0x4fe9 mem_shutter_use_bit1 -0x4fea mem_shutter_dy_step_mode_ios -0x4ff2 mem_shutter_dy_end +0x4fc5 mem_shutter_mode_step_ios +0x4fcd mem_shutter_mode_step_time +0x4fce mem_shutter_mode_step_click_count +0x4fcf mem_shutter_vdd_calculate_set +0x4fcf mem_shutter_vdd_full_vol +0x4fd1 mem_shutter_vdd_empty_vol +0x4fd3 mem_shutter_vdd_low_vol +0x4fd5 mem_shutter_vdd_now_vol +0x4fd7 mem_shutter_start_adc_flag +0x4fd8 mem_shutter_adc_read_timer +0x4fd9 mem_shutter_enable_low_voltage_flag +0x4fda mem_shutter_adc_last_low_voltage_flag +0x4fdb mem_shutter_battery_level_percentage +0x4fdc mem_shutter_adc_read_time_init +0x4fdd mem_shutter_low_volatge_led_time +0x4fde mem_shutter_low_voltage_led_status +0x4fdf mem_shutter_dy_step_mode_android +0x4fe8 mem_shutter_low_led_flag +0x4fe9 mem_shutter_low_voltage_led_gpio +0x4fea mem_chrg_wake_gpio +0x4feb mem_chrg_event_time +0x4fec mem_chrg_poweron_event_time +0x4fed mem_shutter_red_led_on_time +0x4fee mem_shutter_red_led_gpio +0x4fef mem_shutter_led_state +0x4ff0 mem_shutter_charge_flag +0x4ff1 mem_shutter_use_bit1 +0x4ff2 mem_shutter_dy_step_mode_ios +0x4ffa mem_shutter_dy_end 0x45ed mem_mesh_vendor_timer_timing_index_cyclic 0x45ee mem_mesh_vendor_timer_timing_time_cyclic Index: output/program.lis =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/program.lis (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/program.lis (working copy) @@ -569,7 +569,7 @@ 01c2 20407396 call enable_authrom 01c3 20758000 rtn wake 01c4 204070d7 call wdt_set_disable -01c5 704fe405 jam 5,mem_chrg_poweron_event_time //保证能进p_chrg_check_poweron_timer定时器，开机后循环检测是否充电 +01c5 704fec05 jam 5,mem_chrg_poweron_event_time //保证能进p_chrg_check_poweron_timer定时器，开机后循环检测是否充电 01c6 204042a3 call app_param_init 01c7 204003ca call p_shutter_adc_config_init 01c8 204001ba call p_shutter_dy_key_conf @@ -587,9 +587,9 @@ 01d4 67e143d3 store 2,mem_cb_check_wakelock 01d5 58001e1e setarg 0x1e1e 01d6 67e1451d store 2,mem_shutter_soft_switch_poweron_time -01d7 6848cfe2 fetcht 1,mem_chrg_wake_gpio +01d7 6848cfea fetcht 1,mem_chrg_wake_gpio 01d8 20406edd call gpio_config_input -01d9 6848cfe2 fetcht 1,mem_chrg_wake_gpio +01d9 6848cfea fetcht 1,mem_chrg_wake_gpio 01da 20406ee6 call gpio_get_bit 01db 2440824b ncall p_shutter_red_led_off,true 01dc 58000204 setarg p_shutter_le_before_hibernate @@ -620,9 +620,9 @@ 01f5 20407780 call ui_button_polling p_ui_soft_switch_first_power_on: -01f6 6848cfe2 fetcht 1,mem_chrg_wake_gpio +01f6 6848cfea fetcht 1,mem_chrg_wake_gpio 01f7 20406edd call gpio_config_input -01f8 6848cfe2 fetcht 1,mem_chrg_wake_gpio +01f8 6848cfea fetcht 1,mem_chrg_wake_gpio 01f9 20406ee6 call gpio_get_bit 01fa 20208202 branch p_chrg_wake_event,true 01fb 6fe0c6d0 fetch 1,mem_shutter_soft_switch_first_power_on @@ -636,7 +636,7 @@ 0201 20204327 branch app_enter_hibernate p_chrg_wake_event: -0202 704fe305 jam 5,mem_chrg_event_time +0202 704feb05 jam 5,mem_chrg_event_time 0203 20200248 branch p_shutter_red_led_on p_shutter_le_before_hibernate: @@ -649,9 +649,9 @@ 020a 2020739a branch disable_authrom p_chrg_wake_set: -020b 6848cfe2 fetcht 1,mem_chrg_wake_gpio +020b 6848cfea fetcht 1,mem_chrg_wake_gpio 020c 20406edd call gpio_config_input -020d 6848cfe2 fetcht 1,mem_chrg_wake_gpio +020d 6848cfea fetcht 1,mem_chrg_wake_gpio 020e 793f8407 set0 gpio_active_bit,temp 020f 20206eb6 branch gpio_set_wake @@ -692,73 +692,73 @@ 0229 202064d9 branch shutter_dy_check_power_off_timer p_chrg_check_poweron_timer: -022a 6fe0cfd1 fetch 1,mem_shutter_enable_low_voltage_flag +022a 6fe0cfd9 fetch 1,mem_shutter_enable_low_voltage_flag 022b 247a0000 nrtn blank -022c da604fe4 arg mem_chrg_poweron_event_time,regc +022c da604fec arg mem_chrg_poweron_event_time,regc 022d da40022f arg p_chrg_poweron_event_timeout,regb 022e 202042e0 branch timer_single_step p_chrg_poweron_event_timeout: -022f 704fe405 jam 5,mem_chrg_poweron_event_time //在mem_chrg_poweron_event_time自减为0后重新赋值，保证每次都能进入p_chrg_check_poweron_timer定时器 -0230 6848cfe2 fetcht 1,mem_chrg_wake_gpio +022f 704fec05 jam 5,mem_chrg_poweron_event_time //在mem_chrg_poweron_event_time自减为0后重新赋值，保证每次都能进入p_chrg_check_poweron_timer定时器 +0230 6848cfea fetcht 1,mem_chrg_wake_gpio 0231 20406edd call gpio_config_input //设置为上拉输入 -0232 6848cfe2 fetcht 1,mem_chrg_wake_gpio +0232 6848cfea fetcht 1,mem_chrg_wake_gpio 0233 20406ee6 call gpio_get_bit //bit7为0，输入为低电平则true为1，表示在充电 0234 2020823a branch p_chrg_poweron_event_enable,true //在充电 -0235 6fe0cfe8 fetch 1,mem_shutter_charge_flag // 没充电或者充满后 +0235 6fe0cff0 fetch 1,mem_shutter_charge_flag // 没充电或者充满后 0236 207a0000 rtn blank -0237 704fe800 jam 0,mem_shutter_charge_flag -0238 704fe500 jam 0,mem_shutter_red_led_on_time +0237 704ff000 jam 0,mem_shutter_charge_flag +0238 704fed00 jam 0,mem_shutter_red_led_on_time 0239 2020024b branch p_shutter_red_led_off p_chrg_poweron_event_enable: -023a 6fe0cfe8 fetch 1,mem_shutter_charge_flag //初始为0 +023a 6fe0cff0 fetch 1,mem_shutter_charge_flag //初始为0 023b 247a0000 nrtn blank -023c 704fe801 jam 1,mem_shutter_charge_flag //充电则置1 -023d 704fe506 jam 6,mem_shutter_red_led_on_time +023c 704ff001 jam 1,mem_shutter_charge_flag //充电则置1 +023d 704fed06 jam 6,mem_shutter_red_led_on_time 023e 20200248 branch p_shutter_red_led_on p_shutter_red_led_on_timer: -023f 6fe0cfe8 fetch 1,mem_shutter_charge_flag +023f 6fe0cff0 fetch 1,mem_shutter_charge_flag 0240 207a0000 rtn blank -0241 da604fe5 arg mem_shutter_red_led_on_time,regc +0241 da604fed arg mem_shutter_red_led_on_time,regc 0242 da400244 arg p_shutter_red_led_on_timeout,regb 0243 202042e0 branch timer_single_step p_shutter_red_led_on_timeout: -0244 704fe506 jam 6,mem_shutter_red_led_on_time -0245 6fe0cfe7 fetch 1,mem_shutter_led_state +0244 704fed06 jam 6,mem_shutter_red_led_on_time +0245 6fe0cfef fetch 1,mem_shutter_led_state 0246 c000824b beq on,p_shutter_red_led_off 0247 20200248 branch p_shutter_red_led_on p_shutter_red_led_on: -0248 704fe701 jam on,mem_shutter_led_state -0249 6848cfe6 fetcht 1,mem_shutter_red_led_gpio +0248 704fef01 jam on,mem_shutter_led_state +0249 6848cfee fetcht 1,mem_shutter_red_led_gpio 024a 20206ef3 branch gpio_out_inactive //高电平点亮 p_shutter_red_led_off: -024b 704fe700 jam off,mem_shutter_led_state -024c 6848cfe6 fetcht 1,mem_shutter_red_led_gpio +024b 704fef00 jam off,mem_shutter_led_state +024c 6848cfee fetcht 1,mem_shutter_red_led_gpio 024d 20206ef7 branch gpio_out_active p_chrg_wake_event_timer: -024e da604fe3 arg mem_chrg_event_time,regc +024e da604feb arg mem_chrg_event_time,regc 024f da400251 arg p_chrg_wake_event_timeout,regb 0250 202042e0 branch timer_single_step p_chrg_wake_event_timeout: -0251 704fe305 jam 5,mem_chrg_event_time -0252 6848cfe2 fetcht 1,mem_chrg_wake_gpio +0251 704feb05 jam 5,mem_chrg_event_time +0252 6848cfea fetcht 1,mem_chrg_wake_gpio 0253 20406ee6 call gpio_get_bit 0254 20208257 branch p_chrg_wake_led_event,true //在充电 0255 2040024b call p_shutter_red_led_off 0256 20204327 branch app_enter_hibernate p_chrg_wake_led_event: -0257 6fe0cfe8 fetch 1,mem_shutter_charge_flag //初始为0 +0257 6fe0cff0 fetch 1,mem_shutter_charge_flag //初始为0 0258 247a0000 nrtn blank -0259 704fe801 jam 1,mem_shutter_charge_flag //充电则置1 -025a 704fe506 jam 6,mem_shutter_red_led_on_time +0259 704ff001 jam 1,mem_shutter_charge_flag //充电则置1 +025a 704fed06 jam 6,mem_shutter_red_led_on_time 025b 20200248 branch p_shutter_red_led_on p_shutter_check_sleep_timer: @@ -773,19 +773,19 @@ 0262 2020639e branch shutter_wait_power_off p_shutter_mode_step_event_timer: -0263 da604fc5 arg mem_shutter_mode_step_time,regc +0263 da604fcd arg mem_shutter_mode_step_time,regc 0264 da400266 arg p_shutter_mode_step_event_timeout,regb 0265 202042e0 branch timer_single_step p_shutter_mode_step_event_timeout: -0266 6fe0cfc6 fetch 1,mem_shutter_mode_step_click_count +0266 6fe0cfce fetch 1,mem_shutter_mode_step_click_count 0267 c000826b beq 1,p_shutter_mode_step_event_one 0268 c0010273 beq 2,p_shutter_mode_step_event_double -0269 704fc600 jam 0,mem_shutter_mode_step_click_count +0269 704fce00 jam 0,mem_shutter_mode_step_click_count 026a 20600000 rtn p_shutter_mode_step_event_one: -026b 704fc600 jam 0,mem_shutter_mode_step_click_count +026b 704fce00 jam 0,mem_shutter_mode_step_click_count 026c 2040026e call p_shutter_mode_step_ptr 026d 20206371 branch push_buffer_in_queue @@ -793,20 +793,20 @@ 026e da604fbd arg mem_shutter_mode_step_android,regc 026f 20406730 call shutter_dy_check_iphone 0270 207a0000 rtn blank -0271 da604fc2 arg mem_shutter_mode_step_ios,regc +0271 da604fc5 arg mem_shutter_mode_step_ios,regc 0272 20600000 rtn p_shutter_mode_step_event_double: -0273 704fc600 jam 0,mem_shutter_mode_step_click_count +0273 704fce00 jam 0,mem_shutter_mode_step_click_count 0274 20400276 call p_shutter_dy_mode_step_ptr 0275 20206371 branch push_buffer_in_queue p_shutter_dy_mode_step_ptr: -0276 da604fd7 arg mem_shutter_dy_step_mode_android,regc +0276 da604fdf arg mem_shutter_dy_step_mode_android,regc 0277 20406730 call shutter_dy_check_iphone 0278 207a0000 rtn blank 0279 7049e50a jam 10,mem_send_data_delay -027a da604fea arg mem_shutter_dy_step_mode_ios,regc +027a da604ff2 arg mem_shutter_dy_step_mode_ios,regc 027b 20600000 rtn p_shutter_dy_process_bb_event: @@ -978,11 +978,11 @@ 02fb 20600000 rtn p_shutter_fun2_key_release: -02fc 704fc506 jam 6,mem_shutter_mode_step_time -02fd 6fe0cfc6 fetch 1,mem_shutter_mode_step_click_count +02fc 704fcd06 jam 6,mem_shutter_mode_step_time +02fd 6fe0cfce fetch 1,mem_shutter_mode_step_click_count 02fe c1010000 rtneq 2 02ff 1fe0fe01 increase 1,pdata -0300 67e0cfc6 store 1,mem_shutter_mode_step_click_count +0300 67e0cfce store 1,mem_shutter_mode_step_click_count 0301 20600000 rtn p_shutter_fun3_key_release: @@ -1266,66 +1266,66 @@ 03c9 20600000 rtn p_shutter_adc_config_init: -03ca 704fcf01 jam 1,mem_shutter_start_adc_flag +03ca 704fd701 jam 1,mem_shutter_start_adc_flag 03cb 20600000 rtn p_shutter_low_voltage_led_timer: -03cc 6fe0cfcf fetch 1,mem_shutter_start_adc_flag +03cc 6fe0cfd7 fetch 1,mem_shutter_start_adc_flag 03cd 207a0000 rtn blank -03ce 6fe0cfd1 fetch 1,mem_shutter_enable_low_voltage_flag +03ce 6fe0cfd9 fetch 1,mem_shutter_enable_low_voltage_flag 03cf 207a0000 rtn blank -03d0 da604fd5 arg mem_shutter_low_volatge_led_time,regc +03d0 da604fdd arg mem_shutter_low_volatge_led_time,regc 03d1 da4003d3 arg p_shutter_low_voltage_led_timeout,regb 03d2 202042e0 branch timer_single_step p_shutter_low_voltage_led_timeout: -03d3 704fd505 jam 5,mem_shutter_low_volatge_led_time -03d4 6fe0cfe0 fetch 1,mem_shutter_low_led_flag +03d3 704fdd05 jam 5,mem_shutter_low_volatge_led_time +03d4 6fe0cfe8 fetch 1,mem_shutter_low_led_flag 03d5 79407e00 setflip 0,pdata -03d6 67e0cfe0 store 1,mem_shutter_low_led_flag +03d6 67e0cfe8 store 1,mem_shutter_low_led_flag 03d7 c00083db beq 1,p_shutter_low_voltage_led_on 03d8 202003d9 branch p_shutter_low_voltage_led_off p_shutter_low_voltage_led_off: -03d9 6848cfe6 fetcht 1,mem_shutter_red_led_gpio +03d9 6848cfee fetcht 1,mem_shutter_red_led_gpio 03da 20206ef7 branch gpio_out_active p_shutter_low_voltage_led_on: -03db 6848cfe6 fetcht 1,mem_shutter_red_led_gpio +03db 6848cfee fetcht 1,mem_shutter_red_led_gpio 03dc 20206ef3 branch gpio_out_inactive p_shutter_adc_read_interval: -03dd 6fe0cfd0 fetch 1,mem_shutter_adc_read_timer +03dd 6fe0cfd8 fetch 1,mem_shutter_adc_read_timer 03de 1fe0fe01 increase 1,pdata -03df 67e0cfd0 store 1,mem_shutter_adc_read_timer -03e0 6848cfd4 fetcht 1,mem_shutter_adc_read_time_init //1s read adc +03df 67e0cfd8 store 1,mem_shutter_adc_read_timer +03e0 6848cfdc fetcht 1,mem_shutter_adc_read_time_init //1s read adc 03e1 98467c00 isub temp,null 03e2 20600000 rtn p_shutter_adc_read_timer: p_shutter_adc_read_start: -03e3 6fe0cfcf fetch 1,mem_shutter_start_adc_flag +03e3 6fe0cfd7 fetch 1,mem_shutter_start_adc_flag 03e4 207a0000 rtn blank 03e5 204003dd call p_shutter_adc_read_interval p_shutter_adc_read_start_next: 03e6 24610000 nrtn positive -03e7 704fd000 jam 0,mem_shutter_adc_read_timer +03e7 704fd800 jam 0,mem_shutter_adc_read_timer 03e8 70440701 jam adc_config_hvin,mem_adc_config_flag 03e9 20406ff3 call adc_clear_no_power_flag 03ea 20406feb call adc_clear_low_power_flag 03eb 2040045c call p_enable_adc 03ec 2040043d call p_vdd_calculate_by_mode -03ed 67e14fcd store 2,mem_shutter_vdd_now_vol +03ed 67e14fd5 store 2,mem_shutter_vdd_now_vol p_shutter_adc_data_process: -03ee da204fc7 arg mem_shutter_vdd_calculate_set,rega +03ee da204fcf arg mem_shutter_vdd_calculate_set,rega 03ef 204003f5 call p_shutter_bat_percent_lowpower_out 03f0 6fe0c40c fetch 1,mem_adc_power_flag 03f1 c2808415 bbit1 1,p_shutter_low_voltage_power_down 03f2 c3000419 bbit0 0,p_shutter_adc_no_low_voltage -03f3 704fd201 jam 1,mem_shutter_adc_last_low_voltage_flag +03f3 704fda01 jam 1,mem_shutter_adc_last_low_voltage_flag 03f4 20200417 branch p_shutter_adc_low_voltage p_shutter_bat_percent_lowpower_out: @@ -1359,15 +1359,15 @@ 040c 1a227e00 copy rega,pdata 040d 9846fc00 idiv temp 040e 20407d5f call get_div_result -040f 67e0cfd3 store 1,mem_shutter_battery_level_percentage +040f 67e0cfdb store 1,mem_shutter_battery_level_percentage 0410 20600000 rtn p_shutter_adc_bat_level_100_percent: -0411 704fd364 jam 100,mem_shutter_battery_level_percentage +0411 704fdb64 jam 100,mem_shutter_battery_level_percentage 0412 20600000 rtn p_shutter_adc_bat_level_0_percent: -0413 704fd300 jam 0,mem_shutter_battery_level_percentage +0413 704fdb00 jam 0,mem_shutter_battery_level_percentage 0414 20600000 rtn p_shutter_low_voltage_power_down: @@ -1375,15 +1375,15 @@ 0416 20204327 branch app_enter_hibernate p_shutter_adc_low_voltage: -0417 704fd101 jam 1,mem_shutter_enable_low_voltage_flag +0417 704fd901 jam 1,mem_shutter_enable_low_voltage_flag 0418 20600000 rtn p_shutter_adc_no_low_voltage: -0419 704fd100 jam 0,mem_shutter_enable_low_voltage_flag -041a 6fe0cfd2 fetch 1,mem_shutter_adc_last_low_voltage_flag +0419 704fd900 jam 0,mem_shutter_enable_low_voltage_flag +041a 6fe0cfda fetch 1,mem_shutter_adc_last_low_voltage_flag 041b 207a0000 rtn blank 041c 204003d9 call p_shutter_low_voltage_led_off -041d 704fd200 jam 0,mem_shutter_adc_last_low_voltage_flag +041d 704fda00 jam 0,mem_shutter_adc_last_low_voltage_flag 041e 20600000 rtn p_adc_init_data: Index: output/ramcode.rom =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/ramcode.rom (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/ramcode.rom (working copy) @@ -451,7 +451,7 @@ 20407396 20758000 204070d7 -704fe405 +704fec05 204042a3 204003ca 204001ba @@ -469,9 +469,9 @@ 67e143d3 58001e1e 67e1451d -6848cfe2 +6848cfea 20406edd -6848cfe2 +6848cfea 20406ee6 2440824b 58000204 @@ -500,9 +500,9 @@ 7044e401 20407776 20407780 -6848cfe2 +6848cfea 20406edd -6848cfe2 +6848cfea 20406ee6 20208202 6fe0c6d0 @@ -512,7 +512,7 @@ 6fe144e9 c3860000 20204327 -704fe305 +704feb05 20200248 20406f35 7044ecff @@ -521,9 +521,9 @@ 2040701b 2040020b 2020739a -6848cfe2 +6848cfea 20406edd -6848cfe2 +6848cfea 793f8407 20206eb6 6fe0c6ce @@ -552,55 +552,55 @@ 2040675a 2040025c 202064d9 -6fe0cfd1 +6fe0cfd9 247a0000 -da604fe4 +da604fec da40022f 202042e0 -704fe405 -6848cfe2 +704fec05 +6848cfea 20406edd -6848cfe2 +6848cfea 20406ee6 2020823a -6fe0cfe8 +6fe0cff0 207a0000 -704fe800 -704fe500 +704ff000 +704fed00 2020024b -6fe0cfe8 +6fe0cff0 247a0000 -704fe801 -704fe506 +704ff001 +704fed06 20200248 -6fe0cfe8 +6fe0cff0 207a0000 -da604fe5 +da604fed da400244 202042e0 -704fe506 -6fe0cfe7 +704fed06 +6fe0cfef c000824b 20200248 -704fe701 -6848cfe6 +704fef01 +6848cfee 20206ef3 -704fe700 -6848cfe6 +704fef00 +6848cfee 20206ef7 -da604fe3 +da604feb da400251 202042e0 -704fe305 -6848cfe2 +704feb05 +6848cfea 20406ee6 20208257 2040024b 20204327 -6fe0cfe8 +6fe0cff0 247a0000 -704fe801 -704fe506 +704ff001 +704fed06 20200248 da604518 da40025f @@ -609,30 +609,30 @@ 20404325 2040634e 2020639e -da604fc5 +da604fcd da400266 202042e0 -6fe0cfc6 +6fe0cfce c000826b c0010273 -704fc600 +704fce00 20600000 -704fc600 +704fce00 2040026e 20206371 da604fbd 20406730 207a0000 -da604fc2 +da604fc5 20600000 -704fc600 +704fce00 20400276 20206371 -da604fd7 +da604fdf 20406730 207a0000 7049e50a -da604fea +da604ff2 20600000 1a627e00 c0200288 @@ -762,11 +762,11 @@ 20206558 20600000 20600000 -704fc506 -6fe0cfc6 +704fcd06 +6fe0cfce c1010000 1fe0fe01 -67e0cfc6 +67e0cfce 20600000 20600000 da604a30 @@ -968,48 +968,48 @@ 1fe22200 20600000 20600000 -704fcf01 +704fd701 20600000 -6fe0cfcf +6fe0cfd7 207a0000 -6fe0cfd1 +6fe0cfd9 207a0000 -da604fd5 +da604fdd da4003d3 202042e0 -704fd505 -6fe0cfe0 +704fdd05 +6fe0cfe8 79407e00 -67e0cfe0 +67e0cfe8 c00083db 202003d9 -6848cfe6 +6848cfee 20206ef7 -6848cfe6 +6848cfee 20206ef3 -6fe0cfd0 +6fe0cfd8 1fe0fe01 -67e0cfd0 -6848cfd4 +67e0cfd8 +6848cfdc 98467c00 20600000 -6fe0cfcf +6fe0cfd7 207a0000 204003dd 24610000 -704fd000 +704fd800 70440701 20406ff3 20406feb 2040045c 2040043d -67e14fcd -da204fc7 +67e14fd5 +da204fcf 204003f5 6fe0c40c c2808415 c3000419 -704fd201 +704fda01 20200417 efe40011 67e40670 @@ -1037,21 +1037,21 @@ 1a227e00 9846fc00 20407d5f -67e0cfd3 +67e0cfdb 20600000 -704fd364 +704fdb64 20600000 -704fd300 +704fdb00 20600000 20404325 20204327 -704fd101 +704fd901 20600000 -704fd100 -6fe0cfd2 +704fd900 +6fe0cfda 207a0000 204003d9 -704fd200 +704fda00 20600000 6fe401fd 203a6f79 Index: output/sched.rom =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/sched.rom (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/output/sched.rom (working copy) @@ -316,7 +316,7 @@ ################################### mode step config ###################################### -mem_shutter_mode_step_android:02 01 1d 1e 00 +mem_shutter_mode_step_android:02 01 1d 1e 25 26 00 mem_shutter_mode_step_ios:1f 20 00 mem_shutter_dy_step_mode_android:1b 1c 1c 1c 1c 1b 1c 00 @@ -363,7 +363,7 @@ 0a 23 00 83 80 06 40 0a 04 80 07 40 04 #16 0a 23 00 83 40 08 40 0a 04 40 09 40 04 #17 0a 23 00 83 80 0a 40 0a 04 80 0b 40 04 #18 -0a 23 00 83 40 0d 40 0a 04 40 0d 40 04 #19 +0a 23 00 83 40 0c 40 0a 04 40 0d 40 04 #19 0a 23 00 00 80 0f 40 0a 04 80 0e 40 04 #1a #like 0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #1b @@ -380,6 +380,9 @@ 0a 23 00 00 f0 07 70 0d 04 f0 07 1c 0e #22 0a 23 00 83 f0 07 50 0d 04 f0 07 05 0e #23 0a 23 00 00 f0 07 50 0d 04 f0 07 05 0e #24 +#android mode step plus +0a 23 00 83 80 0d d1 0d 04 80 0d f1 0d #25 +0a 23 00 00 80 0d d1 0d 04 80 0d f1 0d #26 mem_shutter_move_data: Index: program/patch.prog =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/program/patch.prog (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/program/patch.prog (working copy) @@ -315,7 +315,7 @@ p_shutter_dy_not_iphone_read_conf: branch p_shutter_dy_remote_not_iphone - + p_shutter_dy_remote_not_iphone: jam 1,mem_shutter_back_count jam 0,mem_iphone_flag @@ -358,7 +358,7 @@ p_fouse_down_long_release: rtn p_shutter_fouse_release_clear: - + rtn p_main_loop: @@ -624,7 +624,7 @@ fetcht 1,mem_chrg_wake_gpio call gpio_get_bit ncall p_shutter_red_led_off,true - + setarg p_shutter_le_before_hibernate store 2,mem_cb_before_hibernate @@ -650,7 +650,7 @@ fetch 8,mem_ble_shutter_interval_min_new store 8,mem_ble_shutter_interval_min - + // call shutter_dy_iphone_every_move_max_set fetch 1, mem_shutter_hard_soft_switch_case beq HARD_SWITCH, shutter_hart_swtich_power_on @@ -761,7 +761,7 @@ fetch 1,mem_shutter_charge_flag //初始为0 nrtn blank jam 1,mem_shutter_charge_flag //充电则置1 - jam 6,mem_shutter_red_led_on_time + jam 6,mem_shutter_red_led_on_time branch p_shutter_red_led_on p_shutter_red_led_on_timer: @@ -785,7 +785,7 @@ p_shutter_red_led_off: jam OFF,mem_shutter_led_state fetcht 1,mem_shutter_red_led_gpio - branch gpio_out_active + branch gpio_out_active p_chrg_wake_event_timer: arg mem_chrg_event_time,regc @@ -799,7 +799,7 @@ call gpio_get_bit branch p_chrg_wake_led_event,true //在充电 call p_shutter_red_led_off - branch app_enter_hibernate + branch app_enter_hibernate p_chrg_wake_led_event: @@ -807,7 +807,7 @@ fetch 1,mem_shutter_charge_flag //初始为0 nrtn blank jam 1,mem_shutter_charge_flag //充电则置1 - jam 6,mem_shutter_red_led_on_time + jam 6,mem_shutter_red_led_on_time branch p_shutter_red_led_on p_shutter_check_sleep_timer: @@ -1277,7 +1277,7 @@ rtn p_shutter_dy_fouseup_event_ios: rtn -p_shutter_dy_fouseup_init: +p_shutter_dy_fouseup_init: rtn p_shutter_dy_fousedown_event: rtn @@ -1320,8 +1320,8 @@ store 1,mem_shutter_low_led_flag beq 1,p_shutter_low_voltage_led_on branch p_shutter_low_voltage_led_off - -p_shutter_low_voltage_led_off: + +p_shutter_low_voltage_led_off: fetcht 1,mem_shutter_red_led_gpio branch gpio_out_active @@ -1511,7 +1511,7 @@ jam 0x00,core_gpadc_cfg3 rtn -p_enable_adc: +p_enable_adc: // fetch 1,mem_shutter_use_bit1 // rtnbit0 SHUTTER_BIT_ADC_ENABLE ifdef ADC_1121SB_1V8_MODE Index: sched/shutter_dy.dat =================================================================== --- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/sched/shutter_dy.dat (revision 5125) +++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM129_7key/sched/shutter_dy.dat (working copy) @@ -249,7 +249,7 @@ ################################### mode step config ###################################### -mem_shutter_mode_step_android:02 01 1d 1e 00 +mem_shutter_mode_step_android:02 01 1d 1e 25 26 00 mem_shutter_mode_step_ios:1f 20 00 mem_shutter_dy_step_mode_android:1b 1c 1c 1c 1c 1b 1c 00 @@ -296,7 +296,7 @@ 0a 23 00 83 80 06 40 0a 04 80 07 40 04 #16 0a 23 00 83 40 08 40 0a 04 40 09 40 04 #17 0a 23 00 83 80 0a 40 0a 04 80 0b 40 04 #18 -0a 23 00 83 40 0d 40 0a 04 40 0d 40 04 #19 +0a 23 00 83 40 0c 40 0a 04 40 0d 40 04 #19 0a 23 00 00 80 0f 40 0a 04 80 0e 40 04 #1a #like 0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #1b @@ -313,6 +313,9 @@ 0a 23 00 00 f0 07 70 0d 04 f0 07 1c 0e #22 0a 23 00 83 f0 07 50 0d 04 f0 07 05 0e #23 0a 23 00 00 f0 07 50 0d 04 f0 07 05 0e #24 +#android mode step plus +0a 23 00 83 80 0d d1 0d 04 80 0d f1 0d #25 +0a 23 00 00 80 0d d1 0d 04 80 0d f1 0d #26 mem_shutter_move_data: