Index: format/app.format
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/format/app.format	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/format/app.format	(working copy)
@@ -65,10 +65,19 @@
 
 
 //adc
+0 mem_reference_inter1p8v_2v_adc_io_data
+0 mem_inter1v_adc_ft_data
 2 mem_3v_adc_io_data
+0 mem_reference_inter1p8v_2p6v_adc_vdcdc_data
+0 mem_inter1p2v_adc_ft_data
 2 mem_2v_adc_hvin_data
+0 mem_reference_inter1p8v_1v_adc_io_data
+0 mem_io1v_adc_ft_data
 2 mem_1v_adc_io_data
+0 mem_reference_inter1p8v_4p6v_adc_vdcdc_data
+0 mem_io2v_adc_ft_data
 2 mem_3v_adc_hvin_data
+0 mem_adc_ratio
 2 mem_reference_voltage
 1 mem_adc_config_flag
 1 mem_adc_channel
@@ -208,7 +217,7 @@
 5 OTP_OFFSET_SCHED_BISTFIX 	//2 byte
 7 OTP_OFFSET_XRAM_BISTFIX	//2 byte
 9 OTP_OFFSET_PATCH_BISTFIX	//2 byte
-
+0xfc0 OTP_OFFSET_ADC_PARAM_L_C0
 0xfd0 OTP_OFFSET_ADC_PARAM_L
 0xff0 OTP_OFFSET_UCODE_KEY_L
 0x1000 OTP_OFFSET_H
@@ -369,3 +378,8 @@
 0x0e ADC_CH_GPIO13
 )
 
+//mem_adc_reference_mode
+(
+1 SADC_REFERENCE_INTER3V
+2 SADC_REFERENCE_INTER1P8V_DIV2
+)
Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/format/app_shutter_dy.format	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/format/app_shutter_dy.format	(working copy)
@@ -186,6 +186,22 @@
 8 mem_shutter_reconn_or_discovery_blink_time_conf
 
 8 mem_ble_shutter_dy_interval_min_ios
+
+//adc
+//adc struct
+0 mem_shutter_vdd_calculate_set
+2 mem_shutter_vdd_full_vol
+2 mem_shutter_vdd_empty_vol
+2 mem_shutter_vdd_low_vol
+2 mem_shutter_vdd_now_vol
+
+1 mem_shutter_start_adc_flag
+1 mem_shutter_adc_read_timer
+1 mem_shutter_enable_low_voltage_flag
+1 mem_shutter_adc_last_low_voltage_flag
+
+1 mem_shutter_battery_level_percentage
+1 mem_shutter_adc_read_time_init
 )
 
 
Index: format/bt.format
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/format/bt.format	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/format/bt.format	(working copy)
@@ -209,8 +209,17 @@
 1 mem_system_clk
 
 ifdef DEBUG_RF_INIT
-18 mem_rf_init_data
+5 mem_rf_init_data
 endif
+
+0 mem_adc_reference3v_ft_data
+2 mem_adc_reference3v_gpio1v_ft_data
+2 mem_adc_reference3v_gpio2v_ft_data
+2 mem_adc_reference3v_vdcdc3p6v_ft_data
+2 mem_adc_reference3v_vdcdc4p6v_ft_data
+2 mem_adc_reference3v_inter1v_ft_data
+2 mem_adc_reference3v_inter1v_now_data
+1 mem_adc_reference_mode
 1 mem_otp_charge_pump_x
 1 mem_otp_dpll_ibais_x
 
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/output/otp.dat	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/output/otp.dat	(working copy)
@@ -11,92 +11,100 @@
 00
 aa
 55
-0a
-0f
+62
+11
 c2
 84
 00
-16
+18
 c0
 00
 00
-1d
+1f
 c0
 01
 01
-d4
+d6
 c0
 08
 81
-dd
+df
 c0
 0a
 03
-81
+71
 c0
 0a
 82
-69
+6c
 c0
 0c
 02
-77
+7a
 c0
 0c
 82
-36
+39
 c0
 0d
 01
-ef
+f1
 c0
 12
 83
-a3
+93
 c0
 13
 80
-48
+4a
 c0
 51
 80
-81
+83
 c0
 52
 81
-be
+c0
 c0
 53
 00
-53
+55
 c0
 53
 80
-5c
+5e
 c0
 55
 01
-ad
+af
 c0
 56
 80
-9d
+9f
 c0
 58
 82
-81
+84
 c0
 62
 82
-7e
+81
 c0
 6d
 03
-52
+5a
+c0
+6d
+83
+ff
 c0
 6e
-03
-62
+04
+3c
+c0
+6e
+84
+1d
 20
 20
 23
@@ -104,23 +112,23 @@
 c0
 12
 00
-21
+23
 c0
 12
 81
-96
+98
 c0
 13
 01
-9b
+9d
 c0
 1c
 83
-9d
+8d
 c0
 26
 83
-a1
+91
 c1
 7f
 80
@@ -152,7 +160,7 @@
 c5
 97
 80
-27
+29
 78
 3c
 fc
@@ -196,7 +204,7 @@
 20
 37
 00
-30
+32
 1b
 42
 04
@@ -244,7 +252,7 @@
 20
 40
 00
-3e
+40
 6f
 e0
 81
@@ -348,7 +356,7 @@
 20
 40
 00
-58
+5a
 6f
 e0
 ce
@@ -396,7 +404,7 @@
 20
 40
 00
-62
+64
 20
 74
 00
@@ -444,7 +452,7 @@
 20
 22
 80
-6e
+70
 18
 e0
 8e
@@ -452,7 +460,7 @@
 20
 20
 00
-63
+65
 67
 e1
 4a
@@ -480,7 +488,7 @@
 20
 40
 00
-a6
+a8
 20
 20
 66
@@ -504,11 +512,11 @@
 20
 22
 80
-7c
+7e
 20
 20
 00
-7b
+7d
 70
 4e
 c0
@@ -524,7 +532,7 @@
 20
 40
 00
-a6
+a8
 20
 20
 66
@@ -572,7 +580,7 @@
 24
 42
 81
-90
+92
 6f
 e0
 ce
@@ -580,7 +588,7 @@
 24
 5a
 01
-8b
+8d
 18
 e2
 7e
@@ -600,7 +608,7 @@
 20
 22
 80
-96
+98
 6f
 e0
 ce
@@ -608,7 +616,7 @@
 24
 3a
 00
-98
+9a
 20
 20
 65
@@ -620,7 +628,7 @@
 20
 20
 00
-aa
+ac
 20
 40
 67
@@ -636,11 +644,11 @@
 20
 40
 00
-af
+b1
 20
 20
 00
-aa
+ac
 20
 40
 68
@@ -652,7 +660,7 @@
 20
 3a
 00
-a1
+a3
 20
 20
 68
@@ -692,11 +700,11 @@
 20
 40
 00
-af
+b1
 20
 40
 00
-f2
+f4
 20
 40
 67
@@ -704,7 +712,7 @@
 24
 3a
 00
-c1
+c3
 df
 e0
 00
@@ -720,11 +728,11 @@
 c0
 00
 80
-b3
+b5
 c0
 00
 00
-b9
+bb
 20
 60
 00
@@ -736,19 +744,19 @@
 c0
 02
 80
-fc
+fe
 c0
 00
 01
-0d
+0f
 c0
 02
 01
-15
+17
 c0
 01
 01
-33
+35
 20
 60
 00
@@ -760,23 +768,23 @@
 c0
 00
 80
-fc
+fe
 c0
 01
 01
-0d
+0f
 c0
 01
 81
-15
+17
 c0
 02
 01
-33
+35
 c0
 02
 80
-c0
+c2
 20
 60
 00
@@ -784,19 +792,19 @@
 20
 20
 01
-74
+76
 20
 40
 00
-c9
+cb
 20
 40
 00
-de
+e0
 20
 40
 00
-e8
+ea
 df
 e0
 00
@@ -820,7 +828,7 @@
 20
 40
 00
-d4
+d6
 18
 42
 7e
@@ -860,7 +868,7 @@
 20
 20
 00
-cd
+cf
 68
 48
 ce
@@ -940,7 +948,7 @@
 20
 20
 00
-e1
+e3
 6f
 e0
 ce
@@ -980,7 +988,7 @@
 20
 20
 00
-eb
+ed
 6f
 e0
 ce
@@ -996,7 +1004,7 @@
 20
 20
 01
-03
+05
 6f
 e0
 ce
@@ -1024,7 +1032,7 @@
 20
 40
 01
-53
+55
 6f
 e1
 4e
@@ -1036,7 +1044,7 @@
 24
 41
 00
-f6
+f8
 24
 61
 00
@@ -1056,7 +1064,7 @@
 20
 3a
 01
-63
+65
 6f
 e1
 4e
@@ -1084,11 +1092,11 @@
 20
 40
 01
-6a
+6c
 20
 20
 01
-74
+76
 20
 40
 67
@@ -1096,11 +1104,11 @@
 24
 5a
 01
-58
+5a
 20
 40
 01
-53
+55
 6f
 e1
 4e
@@ -1120,7 +1128,7 @@
 20
 20
 01
-02
+04
 20
 40
 67
@@ -1128,11 +1136,11 @@
 20
 3a
 01
-2c
+2e
 20
 40
 01
-53
+55
 6f
 e1
 4e
@@ -1168,7 +1176,7 @@
 24
 21
 01
-03
+05
 58
 00
 0f
@@ -1188,7 +1196,7 @@
 20
 22
 81
-29
+2b
 18
 40
 84
@@ -1200,7 +1208,7 @@
 20
 20
 01
-4c
+4e
 70
 4e
 ad
@@ -1212,11 +1220,11 @@
 20
 20
 01
-4c
+4e
 20
 40
 01
-53
+55
 6f
 e1
 4e
@@ -1240,7 +1248,7 @@
 20
 20
 01
-03
+05
 20
 40
 67
@@ -1248,11 +1256,11 @@
 20
 3a
 01
-3c
+3e
 20
 40
 01
-53
+55
 6f
 e1
 4e
@@ -1272,15 +1280,15 @@
 20
 21
 01
-42
+44
 20
 20
 01
-4c
+4e
 20
 40
 01
-53
+55
 6f
 e1
 4e
@@ -1300,7 +1308,7 @@
 20
 20
 01
-4c
+4e
 20
 40
 67
@@ -1308,7 +1316,7 @@
 20
 3a
 01
-4e
+50
 6f
 e0
 ce
@@ -1316,7 +1324,7 @@
 20
 3a
 01
-4e
+50
 1f
 e0
 ff
@@ -1348,7 +1356,7 @@
 20
 20
 01
-03
+05
 58
 00
 0f
@@ -1356,7 +1364,7 @@
 20
 20
 01
-4c
+4e
 70
 4e
 ac
@@ -1368,7 +1376,7 @@
 20
 20
 01
-02
+04
 d8
 40
 00
@@ -1420,7 +1428,7 @@
 20
 22
 81
-50
+52
 18
 40
 84
@@ -1432,7 +1440,7 @@
 20
 20
 01
-02
+04
 6f
 e1
 4e
@@ -1456,11 +1464,11 @@
 20
 40
 01
-6a
+6c
 20
 20
 01
-74
+76
 20
 40
 67
@@ -1468,7 +1476,7 @@
 24
 3a
 01
-7e
+80
 58
 00
 00
@@ -1508,7 +1516,7 @@
 24
 3a
 01
-7e
+80
 58
 00
 00
@@ -1600,7 +1608,7 @@
 c0
 03
 01
-8e
+90
 20
 60
 00
@@ -1620,7 +1628,7 @@
 20
 3a
 01
-93
+95
 20
 20
 65
@@ -1748,7 +1756,7 @@
 c0
 00
 81
-b3
+b5
 20
 20
 66
@@ -1764,7 +1772,7 @@
 c0
 03
 01
-b7
+b9
 20
 60
 00
@@ -1772,7 +1780,7 @@
 20
 40
 01
-b9
+bb
 20
 20
 67
@@ -1856,7 +1864,7 @@
 24
 3a
 01
-ce
+d0
 20
 20
 65
@@ -1920,7 +1928,7 @@
 20
 20
 01
-d4
+d6
 70
 8a
 0f
@@ -2015,6 +2023,10 @@
 10
 70
 8a
+88
+40
+70
+8a
 13
 cd
 70
@@ -2036,7 +2048,7 @@
 20
 40
 02
-3e
+41
 6f
 e0
 c4
@@ -2048,7 +2060,7 @@
 24
 55
 81
-eb
+ed
 37
 d9
 82
@@ -2064,7 +2076,7 @@
 c0
 08
 02
-2b
+2e
 6f
 e0
 c4
@@ -2108,7 +2120,7 @@
 20
 40
 02
-1d
+20
 70
 80
 43
@@ -2132,15 +2144,15 @@
 20
 40
 03
-24
+2c
 20
 40
 03
-4f
+57
 20
 40
 02
-17
+1a
 70
 41
 48
@@ -2152,7 +2164,7 @@
 20
 20
 03
-51
+59
 20
 75
 80
@@ -2184,7 +2196,7 @@
 c0
 0c
 02
-23
+26
 6f
 e0
 c4
@@ -2276,7 +2288,7 @@
 20
 20
 02
-09
+0c
 6f
 e0
 c1
@@ -2284,7 +2296,7 @@
 c0
 05
 02
-39
+3c
 20
 20
 22
@@ -2312,7 +2324,7 @@
 20
 35
 82
-65
+68
 6f
 e2
 02
@@ -2480,7 +2492,7 @@
 20
 20
 02
-4f
+52
 20
 40
 68
@@ -2587,6 +2599,14 @@
 00
 20
 40
+70
+d7
+20
+40
+03
+bc
+20
+40
 64
 54
 20
@@ -2608,7 +2628,7 @@
 58
 00
 02
-e1
+e7
 67
 e1
 43
@@ -2616,7 +2636,7 @@
 58
 00
 02
-b6
+bc
 67
 e1
 43
@@ -2624,7 +2644,7 @@
 58
 00
 02
-d3
+d9
 67
 e1
 43
@@ -2640,7 +2660,7 @@
 58
 00
 02
-9a
+9f
 67
 e1
 43
@@ -2656,7 +2676,7 @@
 58
 00
 02
-af
+b4
 67
 e1
 43
@@ -2688,7 +2708,7 @@
 20
 40
 02
-9f
+a4
 20
 40
 70
@@ -2732,7 +2752,7 @@
 20
 22
 82
-aa
+af
 1f
 e2
 04
@@ -2740,7 +2760,7 @@
 20
 40
 02
-ad
+b2
 1a
 20
 a2
@@ -2748,7 +2768,7 @@
 c2
 00
 02
-a4
+a9
 20
 60
 00
@@ -2763,6 +2783,10 @@
 dd
 20
 40
+03
+c4
+20
+40
 63
 22
 20
@@ -2796,11 +2820,11 @@
 c0
 20
 02
-ca
+d0
 c0
 18
 82
-ba
+c0
 20
 20
 64
@@ -2812,7 +2836,7 @@
 20
 40
 02
-bd
+c3
 20
 60
 00
@@ -2824,11 +2848,11 @@
 20
 3a
 02
-c0
+c6
 20
 20
 02
-c5
+cb
 6f
 e1
 4f
@@ -2892,7 +2916,7 @@
 24
 3a
 02
-de
+e4
 6f
 e4
 4f
@@ -2912,7 +2936,7 @@
 c0
 12
 02
-d6
+dc
 20
 60
 00
@@ -2936,7 +2960,7 @@
 24
 3a
 02
-de
+e4
 6f
 e4
 4f
@@ -2961,6 +2985,14 @@
 20
 2e
 93
+df
+e0
+00
+0a
+20
+40
+70
+c8
 20
 40
 64
@@ -3000,7 +3032,7 @@
 20
 20
 02
-eb
+f3
 6f
 e1
 48
@@ -3064,7 +3096,7 @@
 20
 40
 03
-08
+10
 6f
 e1
 06
@@ -3112,7 +3144,7 @@
 c2
 00
 02
-f4
+fc
 20
 60
 00
@@ -3156,7 +3188,7 @@
 20
 20
 03
-12
+1a
 1a
 60
 8c
@@ -3168,7 +3200,7 @@
 20
 20
 03
-15
+1d
 20
 40
 65
@@ -3192,7 +3224,7 @@
 20
 40
 03
-1c
+24
 20
 20
 65
@@ -3280,7 +3312,7 @@
 20
 40
 03
-41
+49
 2a
 2f
 fe
@@ -3312,7 +3344,7 @@
 20
 40
 03
-41
+49
 d8
 a0
 8a
@@ -3340,7 +3372,7 @@
 20
 21
 03
-36
+3e
 20
 20
 21
@@ -3444,7 +3476,7 @@
 20
 40
 03
-7a
+6a
 70
 8a
 08
@@ -3477,102 +3509,6 @@
 60
 00
 00
-20
-40
-03
-70
-6f
-f0
-8a
-09
-79
-3f
-fe
-07
-67
-f0
-8a
-09
-70
-8a
-07
-77
-70
-8a
-08
-c1
-70
-8a
-0b
-01
-20
-40
-6f
-90
-6f
-e0
-c4
-09
-67
-f0
-80
-cd
-20
-00
-0b
-b8
-20
-40
-03
-7a
-70
-80
-cd
-00
-20
-20
-6f
-a1
-6f
-f0
-80
-cc
-79
-20
-7e
-01
-67
-f0
-80
-cc
-6a
-40
-c4
-19
-6f
-e0
-c4
-33
-67
-e0
-c4
-19
-df
-20
-00
-08
-20
-40
-6f
-67
-62
-40
-c4
-19
-20
-60
-00
-00
 70
 80
 cc
@@ -3584,7 +3520,7 @@
 c3
 02
 83
-7b
+6b
 68
 59
 01
@@ -3620,7 +3556,7 @@
 c0
 08
 03
-9a
+8a
 58
 00
 57
@@ -3664,7 +3600,7 @@
 c0
 08
 03
-97
+87
 58
 00
 2b
@@ -3697,172 +3633,836 @@
 f1
 09
 07
-20
-20
-03
-93
-58
-00
-83
-12
+20
+20
+03
+83
+58
+00
+83
+12
+67
+f1
+09
+07
+20
+20
+03
+78
+6f
+e0
+c3
+34
+c1
+00
+00
+00
+c0
+01
+b0
+4a
+20
+20
+28
+e1
+79
+3f
+80
+30
+20
+20
+2a
+f6
+6f
+e1
+43
+e9
+20
+40
+7d
+79
+6f
+e2
+40
+ad
+98
+40
+fe
+00
+67
+e2
+40
+ad
+20
+40
+03
+a4
+6f
+e0
+c0
+cb
+79
+20
+7e
+04
+20
+40
+23
+e1
+24
+55
+a3
+cb
+37
+d9
+82
+00
+1b
+22
+7e
+00
+67
+e3
+40
+b1
+6f
+e1
+c0
+c6
+6a
+20
+c0
+c9
+df
+20
+00
+03
+20
+20
+24
+2e
+60
+04
+40
+e7
+d8
+c0
+80
+70
+d8
+a0
+40
+cc
+20
+40
+7c
+8f
+d8
+c0
+80
+d4
+20
+40
+7c
+89
+6f
+f0
+80
+80
+67
+e0
+c0
+ef
+18
+42
+24
+00
+df
+20
+00
+0c
+da
+20
+00
+16
+da
+60
+81
+4d
+37
+d9
+82
+00
+ef
+e0
+80
+11
+e8
+40
+80
+13
+98
+46
+7c
+00
+20
+22
+83
+b7
+e7
+e0
+80
+13
+37
+d9
+82
+00
+1a
+20
+a2
+01
+1a
+60
+a6
+01
+c2
+00
+03
+b1
+1a
+42
+04
+00
+20
+60
+00
+00
+70
+4f
+c0
+01
+20
+60
+00
+00
+6f
+e0
+cf
+c1
+1f
+e0
+fe
+01
+67
+e0
+cf
+c1
+68
+48
+cf
+c5
+98
+46
+7c
+00
+20
+60
+00
+00
+6f
+e0
+cf
+c0
+20
+7a
+00
+00
+20
+40
+03
+be
+24
+61
+00
+00
+70
+4f
+c1
+00
+70
+44
+07
+01
+20
+40
+6f
+f3
+20
+40
+6f
+eb
+20
+40
+04
+3c
+20
+40
+04
+1d
+67
+e1
+4f
+be
+da
+20
+4f
+b8
+20
+40
+03
+d6
+6f
+e0
+c4
+0c
+c2
+80
+83
+f6
+c3
+00
+03
+fa
+70
+4f
+c3
+01
+20
+20
+03
+f8
+ef
+e4
+00
+11
+67
+e4
+06
+70
+20
+40
+6f
+f3
+20
+40
+6f
+eb
+6f
+e1
+06
+76
+68
+49
+06
+72
+98
+46
+7c
+00
+24
+41
+6f
+ef
+68
+49
+06
+74
+98
+46
+7c
+00
+24
+41
+6f
+e7
+6f
+e1
+06
+76
+68
+49
+06
+70
+98
+46
+7c
+00
+20
+21
+03
+f2
+68
+49
+06
+72
+98
+46
+7e
+00
+24
+21
+03
+f4
+20
+3a
+03
+f4
+1f
+ef
+a2
+64
+6f
+e1
+06
+70
+68
+49
+06
+72
+98
+46
+04
+00
+1a
+22
+7e
+00
+98
+46
+fc
+00
+20
+40
+7d
+5f
+67
+e0
+cf
+c4
+20
+60
+00
+00
+70
+4f
+c4
+64
+20
+60
+00
+00
+70
+4f
+c4
+00
+20
+60
+00
+00
+20
+40
+43
+25
+20
+20
+43
+27
+70
+4f
+c2
+01
+20
+60
+00
+00
+70
+4f
+c2
+00
+6f
+e0
+cf
+c3
+20
+7a
+00
+00
+70
+4f
+c3
+00
+20
+60
+00
+00
+6f
+e4
+01
+fd
+20
+3a
+6f
+79
+67
+e4
+43
+fd
+20
+40
+6b
+3a
+20
+40
+6a
+ad
+df
+e0
+0f
+c0
+9a
+40
+a4
+00
+df
+20
+00
+0a
+da
+20
+01
+fd
+20
+40
+6b
+74
+20
+40
+6b
+37
+6f
+e4
+01
+fd
+20
+7a
+00
+00
+67
+e4
+41
+4e
+ef
+e1
+00
+06
+e7
+e1
+00
+05
+20
+60
+00
+00
+6f
+f0
+80
+cc
+79
+20
+7e
+01
+67
+f0
+80
+cc
+6a
+40
+c4
+19
+6f
+e0
+c4
+33
+67
+e0
+c4
+19
+df
+20
+00
+08
+20
+40
+6f
+67
+62
+40
+c4
+19
+6f
+f0
+8a
+0a
+79
+3f
+fe
+04
+67
+f0
+8a
+0a
+20
+60
+00
+00
+6f
+e0
+c4
+07
+c0
+00
+84
+21
+c0
+01
+04
+28
+20
+60
+00
+00
+58
+00
+03
+e8
+67
+e1
+44
+05
+68
+49
+41
+52
+6f
+e1
+41
+54
+da
+60
+0e
+10
+20
+40
+6f
+c0
+20
+20
+04
+2e
+58
+00
+03
+e8
+67
+e1
+44
+05
+68
+49
+41
+4e
+6f
+e1
+41
+50
+da
+60
+03
+e8
+20
+40
+6f
+c0
+68
+49
+41
+56
+98
+4f
+fe
+00
+68
+49
+41
+58
+98
+46
+fc
+00
+20
+20
+7d
+5f
+20
+40
+04
+10
+6f
+f0
+8a
+09
+79
+3f
+fe
+07
 67
-f1
+f0
+8a
 09
+70
+8a
 07
-20
-20
-03
-88
-6f
-e0
-c3
-34
+77
+70
+8a
+08
 c1
+70
+8a
+0d
+61
+70
+8a
+0b
 00
+20
+60
 00
 00
-c0
-01
-b0
-4a
-20
-20
-28
-e1
-79
-3f
-80
-30
 20
+40
+04
+33
 20
-2a
-f6
+40
 6f
-e1
-43
-e9
+90
+6f
+e0
+c4
+09
+67
+f0
+80
+cd
 20
 40
-7d
-79
 6f
-e2
-40
-ad
-98
-40
-fe
+97
+70
+8a
+0d
+60
+70
+80
+cd
 00
-67
-e2
-40
-ad
 20
 40
-03
-aa
-20
-20
-24
-25
-60
 04
-40
-e7
-d8
-c0
+33
+6f
+e0
+c4
+09
+67
+f0
 80
+cd
 70
-d8
-a0
-40
+8a
+0b
+50
+70
+8a
+0e
+c0
+df
+00
+00
+0b
+6d
+e1
+44
+0a
+70
+80
 cc
+03
 20
 40
-7c
-8f
-d8
-c0
-80
-d4
+04
+55
+68
+59
+01
+64
+60
+49
+41
+58
 20
 40
-7c
-89
 6f
-f0
-80
-80
-67
-e0
-c0
-ef
-18
-42
-24
-00
+9c
 df
-20
 00
-0c
-da
-20
 00
-16
-da
+0b
+65
+e1
+44
+0a
+70
+8a
+0d
 60
-81
-4d
-37
-d9
-82
-00
-ef
-e0
-80
-11
-e8
-40
+70
 80
-13
-98
-46
-7c
+cd
 00
-20
-22
-83
-bd
-e7
-e0
+70
 80
-13
-37
-d9
-82
+cc
 00
-1a
 20
-a2
-01
-1a
 60
-a6
-01
-c2
 00
-03
-b7
-1a
-42
-04
 00
+6f
+f0
+81
+29
+c3
+02
+84
+55
 20
 60
 00
 00
-01
-e0
+57
+d6
 aa
 55
 40
@@ -3896,7 +4496,7 @@
 20
 00
 00
-14
+3c
 00
 00
 00
@@ -3987,8 +4587,8 @@
 4f
 b0
 1f
-70
-1a
+00
+1b
 aa
 55
 02
@@ -4077,6 +4677,25 @@
 0b
 aa
 55
+01
+00
+c5
+4f
+05
+aa
+55
+06
+00
+b8
+4f
+e4
+0c
+c8
+0b
+2f
+0c
+aa
+55
 08
 00
 e3
@@ -6222,7 +6841,7 @@
 aa
 aa
 55
-07
-6c
-5f
-23
+e3
+71
+7d
+7e
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/output/ramcode.rom	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/output/ramcode.rom	(working copy)
@@ -1,30 +1,32 @@
-c2840016
-c000001d
-c00101d4
-c00881dd
-c00a0381
-c00a8269
-c00c0277
-c00c8236
-c00d01ef
-c01283a3
-c0138048
-c0518081
-c05281be
-c0530053
-c053805c
-c05501ad
-c056809d
-c0588281
-c062827e
-c06d0352
-c06e0362
+c2840018
+c000001f
+c00101d6
+c00881df
+c00a0371
+c00a826c
+c00c027a
+c00c8239
+c00d01f1
+c0128393
+c013804a
+c0518083
+c05281c0
+c0530055
+c053805e
+c05501af
+c056809f
+c0588284
+c0628281
+c06d035a
+c06d83ff
+c06e043c
+c06e841d
 2020235a
-c0120021
-c0128196
-c013019b
-c01c839d
-c02683a1
+c0120023
+c0128198
+c013019d
+c01c838d
+c0268391
 c17f8000
 2020235a
 2435a002
@@ -32,7 +34,7 @@
 37d98200
 20202002
 204025c2
-c5978027
+c5978029
 783cfc00
 2000001e
 204025c2
@@ -43,7 +45,7 @@
 78507c00
 19623600
 37c18400
-20370030
+20370032
 1b420400
 604b000f
 242c26fa
@@ -55,7 +57,7 @@
 984fb600
 20406877
 20372677
-2040003e
+20400040
 6fe08168
 c301a677
 2055a477
@@ -81,7 +83,7 @@
 20407d10
 1a220400
 2020247d
-20400058
+2040005a
 6fe0cec7
 c00065a2
 c000e5a5
@@ -93,7 +95,7 @@
 6fe0cec7
 c000e5cf
 20406628
-20400062
+20400064
 20740000
 202065cf
 d8e00000
@@ -105,27 +107,27 @@
 207a0000
 684906f1
 9842fc00
-2022806e
+20228070
 18e08e01
-20200063
+20200065
 67e14acf
 20404323
 da604ad1
 dfe0000a
 98effe00
 9a60a600
-204000a6
+204000a8
 20206633
 6fe14acf
 207a0000
 684906f1
 18467c00
-2022807c
-2020007b
+2022807e
+2020007d
 704ec001
 20404325
 da604b0d
-204000a6
+204000a8
 20206639
 6fe0cf9f
 243a6502
@@ -137,27 +139,27 @@
 18e27e00
 6848cec5
 98467c00
-24428190
+24428192
 6fe0cec9
-245a018b
+245a018d
 18e27e00
 67e0cec5
 6848cec8
 98467c00
-20228096
+20228098
 6fe0cec9
-243a0098
+243a009a
 2020651c
 704ec601
-202000aa
+202000ac
 2040677f
 18e27e00
 c000e51c
-204000af
-202000aa
+204000b1
+202000ac
 20406821
 20406730
-203a00a1
+203a00a3
 20206812
 6fe14f74
 67e14eae
@@ -167,39 +169,39 @@
 2040677f
 efe08013
 207a0000
-204000af
-204000f2
+204000b1
+204000f4
 20406730
-243a00c1
+243a00c3
 dfe00035
 20206382
 6fe0cec7
-c00080b3
-c00000b9
+c00080b5
+c00000bb
 20600000
 18e27e00
-c00280fc
-c000010d
-c0020115
-c0010133
+c00280fe
+c000010f
+c0020117
+c0010135
 20600000
 efe08013
-c00080fc
-c001010d
-c0018115
-c0020133
-c00280c0
-20600000
-20200174
-204000c9
-204000de
-204000e8
+c00080fe
+c001010f
+c0018117
+c0020135
+c00280c2
+20600000
+20200176
+204000cb
+204000e0
+204000ea
 dfe00005
 20406382
 7049e53c
 dfe00006
 20206382
-204000d4
+204000d6
 18427e00
 207a0000
 67e0ceb3
@@ -209,7 +211,7 @@
 1fe0ffff
 67e0ceb3
 207a0000
-202000cd
+202000cf
 6848ceaa
 20406730
 207a0000
@@ -229,7 +231,7 @@
 1fe0ffff
 67e0ceb4
 207a0000
-202000e1
+202000e3
 6fe0cead
 207a0000
 67e0ceb5
@@ -239,45 +241,45 @@
 1fe0ffff
 67e0ceb5
 207a0000
-202000eb
+202000ed
 6fe0ceab
 247a0000
 704eab01
-20200103
+20200105
 6fe0ceac
 207a0000
 1fe0ffff
 67e0ceac
 dfe00072
 20600000
-20400153
+20400155
 6fe14eae
 98467c00
-244100f6
+244100f8
 24610000
 98467e00
 67e14eae
 20406730
-203a0163
+203a0165
 6fe14eae
 68494eb0
 184d0400
 18520400
 9840fe00
 67e1cb17
-2040016a
-20200174
+2040016c
+20200176
 20406730
-245a0158
-20400153
+245a015a
+20400155
 6fe14eae
 9840fe00
 d8400fff
 20407d6c
-20200102
+20200104
 20406730
-203a012c
-20400153
+203a012e
+20400155
 6fe14eb0
 98467e00
 67e14eb0
@@ -286,44 +288,44 @@
 98467e00
 d8400072
 98460400
-24210103
+24210105
 58000fff
 98467e00
 6848cead
 18467c05
-20228129
+2022812b
 18408401
 6048cead
-2020014c
+2020014e
 704ead00
 58000fff
-2020014c
-20400153
+2020014e
+20400155
 6fe14eb0
 98467c00
 24610000
 98467e00
 67e14eb0
-20200103
+20200105
 20406730
-203a013c
-20400153
+203a013e
+20400155
 6fe14eb0
 9840fe00
 d8400fff
 98462200
-20210142
-2020014c
-20400153
+20210144
+2020014e
+20400155
 6fe14eb0
 9840fe00
 d8400fff
 20407d6c
-2020014c
+2020014e
 20406730
-203a014e
+203a0150
 6fe0cead
-203a014e
+203a0150
 1fe0ffff
 67e0cead
 58000fff
@@ -331,12 +333,12 @@
 98467e00
 9a20fe00
 67e14eb0
-20200103
+20200105
 58000fff
-2020014c
+2020014e
 704eac00
 dfe00000
-20200102
+20200104
 d840002a
 20406730
 207a0000
@@ -349,19 +351,19 @@
 18427e00
 6848ceac
 18467c03
-20228150
+20228152
 18408401
 6048ceac
-20200102
+20200104
 6fe14eae
 68494eb0
 18500400
 9840fe00
 67e24b17
-2040016a
-20200174
+2040016c
+20200176
 20406730
-243a017e
+243a0180
 58000017
 1feffe0a
 d8404c02
@@ -371,7 +373,7 @@
 e7e20005
 202067be
 20406730
-243a017e
+243a0180
 58000034
 1feffe0a
 d8404c02
@@ -394,12 +396,12 @@
 e7e18005
 202067be
 18e27e00
-c003018e
+c0030190
 20600000
 704ec900
 20204325
 6fe0cec9
-203a0193
+203a0195
 20206529
 20406730
 207a0000
@@ -431,13 +433,13 @@
 efe18006
 67e1c397
 c003e704
-c00081b3
+c00081b5
 202066db
 18c08dfe
 efe08006
-c00301b7
+c00301b9
 20600000
-204001b9
+204001bb
 202067bf
 704eaa01
 7049e400
@@ -458,7 +460,7 @@
 24417806
 1a608c09
 efe08006
-243a01ce
+243a01d0
 20206547
 704ec001
 2040656b
@@ -474,7 +476,7 @@
 20402018
 2040310f
 2040248c
-202001d4
+202001d6
 708a0f60
 708a10aa
 708a127a
@@ -498,19 +500,20 @@
 37d98200
 7089460d
 70896f10
+708a8840
 708a13cd
 708a0610
 708a844a
 708a8540
 708a16fe
-2040023e
+20400241
 6fe0c436
 205a70d7
-245581eb
+245581ed
 37d98200
 70813b5f
 6fe0c099
-c008022b
+c008022e
 6fe0c438
 1fe1fe04
 67f08a02
@@ -521,18 +524,18 @@
 67f18a73
 708a8660
 708a8b3b
-2040021d
+20400220
 70804300
 70804205
 58557474
 67f18968
 7089606e
-20400324
-2040034f
-20400217
+2040032c
+20400357
+2040021a
 7041480c
 20406f4e
-20200351
+20200359
 20758000
 37d98200
 6fe0c11c
@@ -540,7 +543,7 @@
 37d98200
 20600000
 6fe0c099
-c00c0223
+c00c0226
 6fe0c438
 1fe1fe06
 67f08a02
@@ -563,16 +566,16 @@
 67f18a73
 708a762a
 70890204
-20200209
+2020020c
 6fe0c141
-c0050239
+c005023c
 2020220e
 708a1425
 58a93f3f
 67f18a60
 708a631f
 20600000
-20358265
+20358268
 6fe2020d
 207a0000
 37d98200
@@ -614,7 +617,7 @@
 6fe1415b
 207a0000
 67e1020f
-2020024f
+20200252
 2040686f
 204021ba
 18002a08
@@ -641,24 +644,26 @@
 20206b38
 20407396
 20758000
+204070d7
+204003bc
 20406454
 20406459
 7040a60a
 58000001
 67e144f6
-580002e1
+580002e7
 67e143db
-580002b6
+580002bc
 67e143dd
-580002d3
+580002d9
 67e143df
 580062d3
 67e143d3
-5800029a
+5800029f
 67e143d5
 58006329
 67e143d7
-580002af
+580002b4
 67e143e3
 58006505
 67e14524
@@ -666,7 +671,7 @@
 2020647d
 20406f35
 7044ecff
-2040029f
+204002a4
 2040701b
 2020739a
 6fe0c6ce
@@ -677,14 +682,15 @@
 efe08011
 6848c6cf
 98467c00
-202282aa
+202282af
 1fe20400
-204002ad
+204002b2
 1a20a201
-c20002a4
+c20002a9
 20600000
 79200407
 20206edd
+204003c4
 20406322
 20406858
 2040675a
@@ -693,15 +699,15 @@
 20406311
 202064d9
 1a627e00
-c02002ca
-c01882ba
+c02002d0
+c01882c0
 202064e0
 704ec201
-204002bd
+204002c3
 20600000
 20406730
-203a02c0
-202002c5
+203a02c6
+202002cb
 6fe14f74
 67e14eae
 6fe14f76
@@ -717,24 +723,26 @@
 6fe4450a
 207a0000
 20406730
-243a02de
+243a02e4
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c01202d6
+c01202dc
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a02de
+243a02e4
 6fe44f02
 67e442d3
 20202e93
 6fe44fb0
 67e442d3
 20202e93
+dfe0000a
+204070c8
 2040649b
 d8e00009
 20407cef
@@ -744,7 +752,7 @@
 20407ce1
 78547c00
 2040701b
-202002eb
+202002f3
 6fe148ac
 67e1442e
 204065be
@@ -760,7 +768,7 @@
 67e1068c
 18e27e00
 67e1067a
-20400308
+20400310
 6fe1068c
 1fe22600
 6fe1067a
@@ -772,7 +780,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c20002f4
+c20002fc
 20600000
 1a60a405
 efe20012
@@ -783,16 +791,16 @@
 24417806
 580003e8
 98467c00
-20200312
+2020031a
 1a608c04
 efe08006
-20200315
+2020031d
 2040656b
 6fe0cec9
 243a655d
 20406561
 20216500
-2040031c
+20400324
 20206557
 da604a30
 20406730
@@ -814,7 +822,7 @@
 708ac200
 708ac300
 d8e00006
-20400341
+20400349
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -822,14 +830,14 @@
 d8e00005
 2040211c
 2040211e
-20400341
+20400349
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-20210336
+2021033e
 2020214f
 2000003c
 58000f00
@@ -855,7 +863,7 @@
 6fe0c409
 67f080cd
 20000bb8
-2040037a
+2040036a
 708a08c1
 6a40c419
 df200008
@@ -864,33 +872,9 @@
 67e0c433
 6240c419
 20600000
-20400370
-6ff08a09
-793ffe07
-67f08a09
-708a0777
-708a08c1
-708a0b01
-20406f90
-6fe0c409
-67f080cd
-20000bb8
-2040037a
-7080cd00
-20206fa1
-6ff080cc
-79207e01
-67f080cc
-6a40c419
-6fe0c433
-67e0c419
-df200008
-20406f67
-6240c419
-20600000
 7080cc03
 6ff08129
-c302837b
+c302836b
 68590164
 6049440a
 7080cc00
@@ -899,7 +883,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c008039a
+c008038a
 58005762
 67f10907
 70890103
@@ -910,7 +894,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c0080397
+c0080387
 58002bb1
 67f10907
 c6978000
@@ -919,10 +903,10 @@
 20600000
 58004189
 67f10907
-20200393
+20200383
 58008312
 67f10907
-20200388
+20200378
 6fe0c334
 c1000000
 c001b04a
@@ -934,8 +918,18 @@
 6fe240ad
 9840fe00
 67e240ad
-204003aa
-20202425
+204003a4
+6fe0c0cb
+79207e04
+204023e1
+2455a3cb
+37d98200
+1b227e00
+67e340b1
+6fe1c0c6
+6a20c0c9
+df200003
+2020242e
 600440e7
 d8c08070
 d8a040cc
@@ -952,11 +946,167 @@
 efe08011
 e8408013
 98467c00
-202283bd
+202283b7
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c20003b7
+c20003b1
 1a420400
 20600000
+704fc001
+20600000
+6fe0cfc1
+1fe0fe01
+67e0cfc1
+6848cfc5
+98467c00
+20600000
+6fe0cfc0
+207a0000
+204003be
+24610000
+704fc100
+70440701
+20406ff3
+20406feb
+2040043c
+2040041d
+67e14fbe
+da204fb8
+204003d6
+6fe0c40c
+c28083f6
+c30003fa
+704fc301
+202003f8
+efe40011
+67e40670
+20406ff3
+20406feb
+6fe10676
+68490672
+98467c00
+24416fef
+68490674
+98467c00
+24416fe7
+6fe10676
+68490670
+98467c00
+202103f2
+68490672
+98467e00
+242103f4
+203a03f4
+1fefa264
+6fe10670
+68490672
+98460400
+1a227e00
+9846fc00
+20407d5f
+67e0cfc4
+20600000
+704fc464
+20600000
+704fc400
+20600000
+20404325
+20204327
+704fc201
+20600000
+704fc200
+6fe0cfc3
+207a0000
+704fc300
+20600000
+6fe401fd
+203a6f79
+67e443fd
+20406b3a
+20406aad
+dfe00fc0
+9a40a400
+df20000a
+da2001fd
+20406b74
+20406b37
+6fe401fd
+207a0000
+67e4414e
+efe10006
+e7e10005
+20600000
+6ff080cc
+79207e01
+67f080cc
+6a40c419
+6fe0c433
+67e0c419
+df200008
+20406f67
+6240c419
+6ff08a0a
+793ffe04
+67f08a0a
+20600000
+6fe0c407
+c0008421
+c0010428
+20600000
+580003e8
+67e14405
+68494152
+6fe14154
+da600e10
+20406fc0
+2020042e
+580003e8
+67e14405
+6849414e
+6fe14150
+da6003e8
+20406fc0
+68494156
+984ffe00
+68494158
+9846fc00
+20207d5f
+20400410
+6ff08a09
+793ffe07
+67f08a09
+708a0777
+708a08c1
+708a0d61
+708a0b00
+20600000
+20400433
+20406f90
+6fe0c409
+67f080cd
+20406f97
+708a0d60
+7080cd00
+20400433
+6fe0c409
+67f080cd
+708a0b50
+708a0ec0
+df00000b
+6de1440a
+7080cc03
+20400455
+68590164
+60494158
+20406f9c
+df00000b
+65e1440a
+708a0d60
+7080cd00
+7080cc00
+20600000
+6ff08129
+c3028455
+20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/output/sched.rom	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/output/sched.rom	(working copy)
@@ -26,7 +26,7 @@
 20   #mem_patch18
 00   #mem_patch19
 00   #mem_patch1a
-14   #mem_patch1b
+3c   #mem_patch1b
 00   #mem_patch1c
 00   #mem_patch1d
 00   #mem_patch1e
@@ -77,8 +77,8 @@
 mem_tx_power:06
 
 #save otp addr
-mem_shutter_efuse_start_offset: b0 1f
-mem_shutter_efuse_end_offset: 70 1a
+mem_shutter_efuse_start_offset:b0 1f
+mem_shutter_efuse_end_offset:00 1b
 
 mem_shutter_le_pairing_handle:2b 00
 
@@ -127,6 +127,12 @@
 b8 0b #sleep_timeout
 b8 0b #sleep_timer
 
+mem_shutter_adc_read_time_init:05
+mem_shutter_vdd_calculate_set:
+e4 0c	#mem_shutter_vdd_full_vol 3.3v*1000
+c8 0b	#mem_shutter_vdd_empty_vol 3.0V
+2f 0c	#mem_shutter_vdd_low_vol 3.1V
+
 #key config
 mem_shutter_key_num_conf:07
 mem_shutter_dy_key_conf:
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/program/patch.prog	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/program/patch.prog	(working copy)
@@ -1,6 +1,9 @@
 
 //define AUTO_TEST
-
+define ADC_1121SB
+ifdef ADC_1121SB
+//define ADC_1121SB_1V8_MODE
+endif
 	bbit1 8,pf_patch_ext
 	beq patch00_0,p_soft_reset
 	beq patch00_2,p_main_loop
@@ -24,7 +27,11 @@
 	beq patch16_1,p_shutter_dy_init
 	beq patch18_5,p_otp_read_data
 	beq patch1b_2,p_sadc_calibration
+ifdef ADC_1121SB
+	beq patch1b_3,p_adc_init_data
 	beq patch1b_4,p_enable_adc
+	beq patch1b_5,p_vdd_calculate_by_mode
+endif
 	branch assert
 
 pf_patch_ext:
@@ -657,7 +664,7 @@
 
 	jam 0x0d,0x8946
 	jam 0x10,0x896f
-
+	jam 0x40,core_rx_cfg0
 	jam 0xcd,0x8a13
 	jam 0x10,0x8a06
 	jam 0x4a,0x8a84
@@ -834,6 +841,10 @@
 p_shutter_dy_init:
 	call enable_authrom
 	rtn wake
+	call wdt_set_disable
+ifdef ADC_1121SB
+	call p_shutter_adc_config_init
+endif	
 	call shutter_dy_key_conf
 	call shutter_dy_adv_conf
 	jam 0x0a,mem_lpm_overhead
@@ -898,6 +909,9 @@
 	branch gpio_config_input
 
 p_shutter_dy_le_bb_event_timer:
+ifdef ADC_1121SB
+	call p_shutter_adc_read_timer
+endif
 	call ble_shutter_reconn_timer
 	call shutter_dy_shutter_1s_timer
 	// call shutter_dy_link_key_loop_timer
@@ -969,6 +983,8 @@
 	branch le_l2cap_tx_update_req
 
 p_shutter_dy_process_idle:
+	arg 10, pdata //Լ96ms
+	call wdt_init_config
 	call shutter_dy_shutter_send_data_to_master
 	arg key_scan_timer,queue
 	call timer_check
@@ -1126,34 +1142,6 @@
 	storer regb,1,mem_spi_write_addr
 	rtn
 
-p_enable_adc:
-	call p_sadc_cal_write
-	fetch 1,core_gpadc_cfg1
-	set0 7,pdata
-	store 1,core_gpadc_cfg1
-	jam 0x77,core_gpadc_ctrl
-	jam 0xc1,core_gpadc_cfg0
-	jam 0x01,core_gpadc_cfg3
-	call sadc_channel
-	fetch 1,mem_adc_clkdiv
-	store 1,core_sadc_clkdiv
-	nop 3000
-	call p_sadc_read
-	jam 0,core_sadc_clkdiv
-	branch sadc_dma
-
-p_sadc_cal_write:
-	fetch 1,core_sadc_ctrl
-	set1 1,pdata
-	store 1,core_sadc_ctrl
-	fetchr regb,1,mem_spi_write_addr
-	fetch 1,mem_adc_cal_c7
-	store 1,mem_spi_write_addr
-	arg 8,loopcnt	//rg_gpadc_sar_dat_sel c0-c7
-	call sadc_cal_write+4
-	storer regb,1,mem_spi_write_addr
-	rtn
-
 p_sadc_read:
 	jam 0x03,core_sadc_ctrl
 p_sadc_read_wait:
@@ -1221,7 +1209,18 @@
 	iadd temp,pdata
 	store 4,mem_sleep_counter_all
 	call p_lpm_save_context
-	branch lpm_sleep_skip_cb_function+4
+	fetch 1,mem_lpm_hv_sel
+	set1 LPM_DOZE_EN_BIT, pdata
+	call lpm_write_sel_hv
+	ncall lpm_preon_counter,wake
+	until null,lpo_edge
+	copy clkn,pdata
+	store 6,mem_sleep_clkn
+	// storer clkn,6,mem_sleep_clkn
+	fetch 3,mem_lpm_isogate
+	fetchr rega,1,mem_lpm_ldo_sel
+	arg 3,loopcnt
+	branch lpm_sleep_loop
 
 p_lpm_save_context:
 	storer mark,8,mem_saved_mark
@@ -1252,4 +1251,353 @@
 	copy regb,temp
 	rtn
 
+/////////////////////////////////////////////// adc ////////////////////////////////////////
+ifdef ADC_1121SB
+p_shutter_adc_config_init:
+	jam 1,mem_shutter_start_adc_flag
+	rtn
+
+p_shutter_adc_read_interval:
+	fetch 1,mem_shutter_adc_read_timer
+	increase 1,pdata
+	store 1,mem_shutter_adc_read_timer
+	fetcht 1,mem_shutter_adc_read_time_init	//1s read adc
+	isub temp,null
+	rtn
+
+p_shutter_adc_read_timer:
+p_shutter_adc_read_start:
+	fetch 1,mem_shutter_start_adc_flag
+	rtn blank
+	call p_shutter_adc_read_interval
+p_shutter_adc_read_start_next:
+	nrtn positive
+	jam 0,mem_shutter_adc_read_timer
+	jam ADC_CONFIG_HVIN,mem_adc_config_flag
+	call adc_clear_no_power_flag
+	call adc_clear_low_power_flag
+	call p_enable_adc
+	call p_vdd_calculate_by_mode
+	store 2,mem_shutter_vdd_now_vol
+p_shutter_adc_data_process:
+	arg mem_shutter_vdd_calculate_set,rega
+	call p_shutter_bat_percent_lowpower_out
+	fetch 1,mem_adc_power_flag
+	bbit1 1,p_shutter_low_voltage_power_down
+	bbit0 0,p_shutter_adc_no_low_voltage
+	jam 1,mem_shutter_adc_last_low_voltage_flag
+	branch p_shutter_adc_low_voltage
+
+p_shutter_bat_percent_lowpower_out:
+	ifetch 8,rega
+	store 8,mem_pdatatemp
+p_shutter_bat_percent_lowpower_out_battery:
+	call adc_clear_no_power_flag
+	call adc_clear_low_power_flag
+	fetch 2,mem_pdatatemp+6
+	fetcht 2,mem_pdatatemp+2	        //shutdown voltage
+	isub temp,null
+	ncall adc_set_no_power_flag,positive
+
+	fetcht 2,mem_pdatatemp+4		//low voltage
+	isub temp,null
+	ncall adc_set_low_power_flag,positive
+p_shutter_adc_bat_level_set:
+	fetch 2,mem_pdatatemp+6		//now voltage
+	fetcht 2,mem_pdatatemp		//full voltage
+	isub temp,null
+	branch p_shutter_adc_bat_level_100_percent,positive		// now >= full
+	fetcht 2,mem_pdatatemp+2	        //shutdown voltage
+	isub temp,pdata
+	nbranch p_shutter_adc_bat_level_0_percent,positive		// now < shutdown
+	branch p_shutter_adc_bat_level_0_percent,blank			// now = shutdown
+	mul32 pdata,100,rega								// (now - shutdown)*100 /(full - shutdown)
+	fetch 2,mem_pdatatemp
+	fetcht 2,mem_pdatatemp+2
+	isub temp,temp
+	copy rega,pdata
+	idiv temp
+	call get_div_result
+	store 1,mem_shutter_battery_level_percentage
+	rtn
+
+p_shutter_adc_bat_level_100_percent:
+	jam 100,mem_shutter_battery_level_percentage
+	rtn
+p_shutter_adc_bat_level_0_percent:
+	jam 0,mem_shutter_battery_level_percentage
+	rtn
+
+p_shutter_low_voltage_power_down:	//shutterdown
+	call app_led_off
+	branch app_enter_hibernate
+
+p_shutter_adc_low_voltage:
+	jam 1,mem_shutter_enable_low_voltage_flag
+	rtn
+
+p_shutter_adc_no_low_voltage:
+	jam 0,mem_shutter_enable_low_voltage_flag
+	fetch 1,mem_shutter_adc_last_low_voltage_flag
+	rtn blank
+	// call app_led_off
+	jam 0,mem_shutter_adc_last_low_voltage_flag
+	rtn
+endif
+
+ifdef ADC_1121SB
+
+p_adc_init_data:
+	fetch 8,mem_otp_adc
+	branch adc_init_cal_data_default,blank
+	store 8,mem_reference_inter1p8v_2v_adc_io_data
+	call enable_otp_read
+	call loadcode_check_otp_lock
+	arg OTP_OFFSET_ADC_PARAM_L_C0,pdata
+	iadd regb,regb
+	arg 10,loopcnt
+	arg mem_otp_temp,rega
+	call otp_read_data
+	call disable_otp
+	fetch 8, mem_otp_temp
+	rtn blank
+	store 8,mem_adc_reference3v_gpio1v_ft_data
+	ifetch 2,contr
+	istore 2,contw
+	//call  eut_test_data_init
+	rtn
+
+p_sadc_cal_write:
+	fetch 1,core_sadc_ctrl
+	set1 1,pdata
+	store 1,core_sadc_ctrl
+	fetchr regb,1,mem_spi_write_addr
+	fetch 1,mem_adc_cal_c7
+	store 1,mem_spi_write_addr
+	arg 8,loopcnt	//rg_gpadc_sar_dat_sel c0-c7
+	call sadc_cal_write+4
+	storer regb,1,mem_spi_write_addr
+	fetch 1,core_gpadc_cfg2
+	set0 4,pdata//caliberation write disable
+	store 1,core_gpadc_cfg2
+	rtn
+
+
+
+p_vdd_calculate_by_mode:
+ifdef  ADC_1121SB_1V8_MODE
+	fetch 1,mem_adc_reference_mode
+	beq SADC_REFERENCE_INTER3V,p_vdd_reference_inter3V_calculate
+	beq SADC_REFERENCE_INTER1P8V_DIV2,p_vdd_reference_inter1p8V_calculate
+	branch p_vdd_reference_inter3V_calculate
+endif
+
+p_vdd_reference_inter3V_calculate:
+	fetch 1,mem_adc_config_flag
+	beq ADC_CONFIG_HVIN,p_vdd_reference_inter3V_calculate_by_mode_vdcdc
+	beq ADC_CONFIG_GPIO,p_vdd_reference_inter3V_calculate_by_mode_gpio
+	rtn
+
+p_vdd_reference_inter3V_calculate_by_mode_vdcdc:
+	setarg 1000
+	store 2,mem_reference_voltage
+	fetcht 2,mem_adc_reference3v_vdcdc3p6v_ft_data
+	fetch 2,mem_adc_reference3v_vdcdc4p6v_ft_data
+	arg 3600,regc
+	call vdd_calculate
+	branch p_mul1V_div1V_to_cal
+
+p_vdd_reference_inter3V_calculate_by_mode_gpio:
+	setarg 1000
+	store 2,mem_reference_voltage
+	fetcht 2,mem_adc_reference3v_gpio1v_ft_data
+	fetch 2,mem_adc_reference3v_gpio2v_ft_data
+	arg 1000,regc
+	call vdd_calculate
+p_mul1V_div1V_to_cal:
+	fetcht 2,mem_adc_reference3v_inter1v_ft_data
+	imul32 temp,pdata
+	fetcht 2,mem_adc_reference3v_inter1v_now_data
+	idiv temp
+	branch get_div_result
+
+p_enable_adc_init_config:
+	call p_sadc_cal_write
+	fetch 1,core_gpadc_cfg1
+	set0 7,pdata
+	store 1,core_gpadc_cfg1
+	jam 0x77,core_gpadc_ctrl
+	jam 0xc1,core_gpadc_cfg0
+	jam 0x61,core_vtest_ctrl0
+	jam 0x00,core_gpadc_cfg3
+	rtn
+
+p_enable_adc:
+ifdef  ADC_1121SB_1V8_MODE
+	fetch 1,mem_adc_reference_mode
+	beq SADC_REFERENCE_INTER3V,p_enable_adc_reference_source_inter3V
+	beq SADC_REFERENCE_INTER1P8V_DIV2,p_enable_adc_reference_source_inter1p8V
+	branch p_enable_adc_reference_source_inter3V
+endif
+
+p_enable_adc_reference_source_inter3V:
+	call p_enable_adc_init_config
+	call sadc_channel
+	fetch 1,mem_adc_clkdiv
+	store 1,core_sadc_clkdiv
+	call sadc_read
+	jam 0x60,core_vtest_ctrl0
+	jam 0x00,core_sadc_clkdiv
+//	rtn
+
+p_read_adc_inter1V:
+	call p_enable_adc_init_config
+	fetch 1,mem_adc_clkdiv
+	store 1,core_sadc_clkdiv
+	jam 0x50,core_gpadc_cfg3
+	jam 0xc0,core_vtest_ctrl1//select vref1v
+
+	arg 0xb,regext_index
+	fetchr regext, 2,mem_adc_current_value
+
+	jam 0x03,core_sadc_ctrl
+	call p_sar_adc_read_wait
+	fetcht 2,core_sadc_data
+	storet 2,mem_adc_reference3v_inter1v_now_data
+	call sadc_read_wait+4
+
+	arg 0xb,regext_index
+	storer regext,2,mem_adc_current_value
+
+	jam 0x60,core_vtest_ctrl0
+	jam 0x00,core_sadc_clkdiv
+	jam 0x00,core_sadc_ctrl
+	rtn
+
+p_sar_adc_read_wait:
+	fetch 1,core_perf_status
+	bbit0 SARADC_DONE,p_sar_adc_read_wait
+	rtn
+
+ifdef  ADC_1121SB_1V8_MODE
+p_vdd_reference_inter1p8V_calculate:
+	fetch 1,mem_adc_config_flag
+	beq ADC_CONFIG_HVIN,p_vdd_reference_inter1p8V_calculate_by_mode_vdcdc
+	beq ADC_CONFIG_GPIO,p_vdd_reference_inter1p8V_div2_calculate_by_mode_gpio
+	rtn
+
+p_vdd_reference_inter1p8V_calculate_by_mode_vdcdc:
+	setarg 2000
+	store 2,mem_reference_voltage
+	fetcht 2,mem_reference_inter1p8v_2p6v_adc_vdcdc_data
+	fetch 2,mem_reference_inter1p8v_4p6v_adc_vdcdc_data
+	arg 2600,regc
+	branch vdd_calculate
+
+p_vdd_reference_inter1p8V_div2_calculate_by_mode_gpio:
+	setarg 1000
+	store 2,mem_reference_voltage
+	fetcht 2,mem_reference_inter1p8v_2v_adc_io_data
+	fetch 2,mem_reference_inter1p8v_1v_adc_io_data
+	arg 2000,regc
+	branch p_vdd_calculate00
+
+p_vdd_calculate00:
+	isub temp,rega
+	fetch 2,mem_adc_current_value
+	isub temp,pdata
+	nbranch p_vdd_calculate11,positive
+	fetcht 2,mem_reference_voltage
+	imul32 temp,regb
+	copy regc,pdata
+	imul32 rega,pdata
+	isub regb,pdata
+	nbranch set_pdata_0,positive
+	branch vdd_calculate2
+
+p_vdd_calculate11:
+	copy temp,pdata
+	fetcht 2,mem_adc_current_value
+	isub temp,pdata
+	fetcht 2,mem_reference_voltage
+	imul32 temp,regb
+	copy regc,pdata
+	imul32 rega,pdata
+	iadd regb,pdata
+	branch vdd_calculate2
+
+
+p_enable_adc_reference_source_inter1p8V:
+	fetch 1,mem_adc_config_flag
+	beq ADC_CONFIG_HVIN,p_enable_adc_reference_source_inter1p8V_vdcdc
+p_enable_adc_reference_source_inter1p8V_div2_gpio:
+	call p_sadc_cal_write
+	fetch 1,core_gpadc_cfg1
+	set0 7,pdata
+	store 1,core_gpadc_cfg1
+	jam 0x77,core_gpadc_ctrl
+	jam 0x41,core_gpadc_cfg0
+	jam 0x14,0x8ac6			//div2
+	jam 0x00,core_gpadc_cfg3
+	call sadc_channel
+	fetch 1,mem_adc_clkdiv
+	store 1,core_sadc_clkdiv
+	call sadc_read
+
+	jam 0x00,core_sadc_clkdiv
+	jam 0x00,0x8ac6
+	rtn
+
+p_enable_adc_reference_source_inter1p8V_vdcdc:
+	call p_sadc_cal_write
+	fetch 1,core_gpadc_cfg1
+	set0 7,pdata
+	store 1,core_gpadc_cfg1
+	jam 0x77,core_gpadc_ctrl
+	jam 0x41,core_gpadc_cfg0
+	jam 0x10,0x8ac6			//not div2
+	jam 0x00,core_gpadc_cfg3
+	call sadc_channel
+	fetch 1,mem_adc_clkdiv
+	store 1,core_sadc_clkdiv
+	call  sadc_read
+
+	jam 0x00,core_sadc_clkdiv
+	jam 0x00,0x8ac6
+	rtn
+
+endif
+
+/*
+p_adc_set_gpio:
+	fetch 1,mem_adc_channel
+	call p_adc_channel_set_gpio
+	copy temp,pdata
+	set1 GPIO_ACTIVE_BIT,pdata
+	arg gpcfg_input,temp
+	branch gpio_config_function
+
+p_adc_channel_set_gpio:
+	arg 18,temp
+	rtneq 0x6
+	arg 10,temp
+	rtneq 0x7
+	arg 9,temp
+	rtneq 0x8
+	arg 12,temp
+	rtneq 0x9
+	arg 6,temp
+	rtneq 0xa
+	arg 20,temp
+	rtneq 0xb
+	arg 21,temp
+	rtneq 0xc
+	arg 22,temp
+	rtneq 0xd
+	arg 13,temp
+//	rtnne 0xe
+	rtn
+*/
+
+endif
 
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/sched/shutter_dy.dat	(revision 5624)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_yb_7key_roll/sched/shutter_dy.dat	(working copy)
@@ -10,8 +10,8 @@
 mem_tx_power:06
 
 #save otp addr
-mem_shutter_efuse_start_offset: b0 1f
-mem_shutter_efuse_end_offset: 70 1a
+mem_shutter_efuse_start_offset:b0 1f
+mem_shutter_efuse_end_offset:00 1b
 
 mem_shutter_le_pairing_handle:2b 00
 
@@ -60,6 +60,12 @@
 b8 0b #sleep_timeout
 b8 0b #sleep_timer
 
+mem_shutter_adc_read_time_init:05
+mem_shutter_vdd_calculate_set:
+e4 0c	#mem_shutter_vdd_full_vol 3.3v*1000
+c8 0b	#mem_shutter_vdd_empty_vol 3.0V
+2f 0c	#mem_shutter_vdd_low_vol 3.1V
+
 #key config
 mem_shutter_key_num_conf:07
 mem_shutter_dy_key_conf: