Index: format/app_shutter_dy.format =================================================================== --- /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format (revision 5974) +++ /1121s/branch/shutter/yc1089s_fouse_public/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 -7 mem_shutter_mode_step_ios_release +4 mem_shutter_mode_step_android +6 mem_shutter_mode_step_ios_release 1 mem_shutter_photo_time 1 mem_shutter_photo_click_count 1 mem_shutter_photo_double_time Index: output/otp.dat =================================================================== --- /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat (revision 5974) +++ /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat (working copy) @@ -620,7 +620,7 @@ da 60 4f -fb +f9 20 20 63 @@ -2708,7 +2708,7 @@ da 60 4f -e1 +e0 20 60 00 @@ -3799,7 +3799,7 @@ 00 70 4f -f3 +f1 01 20 60 @@ -3808,7 +3808,7 @@ 6f e0 cf -f3 +f1 20 7a 00 @@ -3816,7 +3816,7 @@ 6f e0 cf -f5 +f3 20 7a 00 @@ -3824,7 +3824,7 @@ da 60 4f -f9 +f7 da 40 03 @@ -3835,12 +3835,12 @@ e0 70 4f -f9 +f7 05 6f e0 cf -fa +f8 79 40 7e @@ -3848,7 +3848,7 @@ 67 e0 cf -fa +f8 c0 00 c3 @@ -3860,7 +3860,7 @@ 6f e0 cf -f4 +f2 1f e0 fe @@ -3868,11 +3868,11 @@ 67 e0 cf -f4 +f2 68 48 cf -f8 +f6 98 46 7c @@ -3884,7 +3884,7 @@ 6f e0 cf -f3 +f1 20 7a 00 @@ -3899,7 +3899,7 @@ 00 70 4f -f4 +f2 00 70 44 @@ -3924,11 +3924,11 @@ 67 e1 4f -f1 +ef da 20 4f -eb +e9 20 40 03 @@ -3947,7 +3947,7 @@ fd 70 4f -f6 +f4 01 20 20 @@ -4060,14 +4060,14 @@ 67 e0 cf -f7 +f5 20 60 00 00 70 4f -f7 +f5 64 20 60 @@ -4075,7 +4075,7 @@ 00 70 4f -f7 +f5 00 20 60 @@ -4091,7 +4091,7 @@ 27 70 4f -f5 +f3 01 20 60 @@ -4099,12 +4099,12 @@ 00 70 4f -f5 +f3 00 6f e0 cf -f6 +f4 20 7a 00 @@ -4115,7 +4115,7 @@ 25 70 4f -f6 +f4 00 20 60 @@ -4477,8 +4477,8 @@ 60 00 00 -59 -bf +e2 +05 aa 55 40 @@ -4705,21 +4705,21 @@ 55 01 00 -f9 +f7 4f 05 aa 55 01 00 -f8 +f6 4f 05 aa 55 06 00 -eb +e9 4f e4 0c @@ -4945,7 +4945,7 @@ 00 99 4a -06 +07 01 00 aa @@ -5094,7 +5094,7 @@ 00 aa 55 -0c +0a 00 dc 4f @@ -5102,19 +5102,17 @@ 01 2b 2c -00 2d 2e 2f 30 33 34 -00 aa 55 05 00 -fb +f9 4f 1b 1c @@ -6315,13 +6313,13 @@ 00 d0 49 -c3 +f3 00 -c3 +f3 00 aa 55 -c3 +f3 00 ae 48 @@ -6366,7 +6364,7 @@ 05 0d 09 -05 +04 a1 01 85 @@ -6410,7 +6408,7 @@ 81 02 09 -38 +47 75 01 95 @@ -6447,8 +6445,14 @@ c0 05 0d +09 +05 a1 -00 +01 +09 +22 +a1 +02 09 42 15 @@ -6484,7 +6488,7 @@ 81 02 09 -38 +47 75 01 95 @@ -6520,6 +6524,48 @@ 02 c0 c0 +05 +01 +09 +06 +a1 +01 +85 +05 +05 +04 +19 +e0 +29 +e7 +15 +00 +25 +01 +75 +01 +95 +08 +81 +02 +75 +08 +95 +01 +15 +00 +25 +f4 +05 +04 +19 +00 +29 +f4 +81 +00 +c0 +c0 aa 55 10 @@ -6734,7 +6780,7 @@ aa aa 55 -a0 -89 -63 -1a +c6 +95 +ea +5d Index: output/ramcode.rom =================================================================== --- /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom (revision 5974) +++ /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom (working copy) @@ -149,7 +149,7 @@ da604fc6 20206371 7049e596 -da604ffb +da604ff9 20206371 20600000 20600000 @@ -671,7 +671,7 @@ da604fdc 20406730 207a0000 -da604fe1 +da604fe0 20600000 20600000 da604a30 @@ -944,44 +944,44 @@ 7049e501 704fd903 20600000 -704ff301 +704ff101 20600000 -6fe0cff3 +6fe0cff1 207a0000 -6fe0cff5 +6fe0cff3 207a0000 -da604ff9 +da604ff7 da4003bb 202042e0 -704ff905 -6fe0cffa +704ff705 +6fe0cff8 79407e00 -67e0cffa +67e0cff8 c000c323 20204325 -6fe0cff4 +6fe0cff2 1fe0fe01 -67e0cff4 -6848cff8 +67e0cff2 +6848cff6 98467c00 20600000 -6fe0cff3 +6fe0cff1 207a0000 204003c1 24610000 -704ff400 +704ff200 70440701 20406ff3 20406feb 20400440 20400421 -67e14ff1 -da204feb +67e14fef +da204fe9 204003d9 6fe0c40c c28083f9 c30003fd -704ff601 +704ff401 202003fb efe40011 67e40670 @@ -1009,21 +1009,21 @@ 1a227e00 9846fc00 20407d5f -67e0cff7 +67e0cff5 20600000 -704ff764 +704ff564 20600000 -704ff700 +704ff500 20600000 20404325 20204327 -704ff501 +704ff301 20600000 -704ff500 -6fe0cff6 +704ff300 +6fe0cff4 207a0000 20404325 -704ff600 +704ff400 20600000 6fe401fd 203a6f79 Index: output/sched.rom =================================================================== --- /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom (revision 5974) +++ /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom (working copy) @@ -284,7 +284,7 @@ mem_key0_release_new: 19 18 17 16 15 14 13 00 mem_key0_long_press: -06 01 00 +07 01 00 #like mem_key1_release_new: 1b 1c 00 @@ -321,10 +321,10 @@ mem_fouse_down_long_press:29 00 mem_fouse_down_long_release:2a 00 -mem_shutter_mode_step_android:02 01 2b 2c 00 +mem_shutter_mode_step_android:02 01 2b 2c mem_shutter_mode_step_ios_release: -2d 2e 2f 30 33 34 00 +2d 2e 2f 30 33 34 mem_shutter_dy_step_mode_android:1b 1c 1b 1c 00 ################################### fouse config end ###################################### @@ -534,8 +534,8 @@ 30 00 02 00 28 02 0f 18 00 00 -mem_shutter_le_map_len_android:c3 00 -mem_shutter_le_map_len_ios:c3 00 +mem_shutter_le_map_len_android:f3 00 +mem_shutter_le_map_len_ios:f3 00 mem_shutter_le_hid_map: 05 0c # Usage Page(Consumer) #legth 30 09 01 # Usage(Consumer Control) @@ -557,7 +557,7 @@ c0 #end 05 0d #Usage Page (Digitizer) -09 05 # Usage(Touch Screen) +09 04 # Usage(Touch Screen) a1 01 #Collection (Application) 85 06 #Report Id (6) 09 22 #Usage (finger) @@ -578,7 +578,7 @@ 16 00 00 #Logical Minimum(0) 26 f0 0f #Logical Minimum(16) 81 02 #Input (Data,Value,Absolute,Bit Field) -09 38 #Usage(Confidence) +09 47 #Usage(Confidence) 75 01 #Report Size(1) 95 01 #Report Count(1) 81 02 #Input (Data,Value,Absolute,Bit Field) @@ -596,11 +596,10 @@ 81 02 #Input (Data,Value,Absolute,Bit Field) c0 #End Collection 05 0d #Usage Page (Digitizer) -# 09 05 # Usage(Touch Screen) -# a1 01 #Collection (Application) -# 09 22 #Usage (finger) -# a1 02 #Collection (Logical) -a1 00 #Collection (Logical) +09 05 # Usage(Touch Screen) +a1 01 #Collection (Application) +09 22 #Usage (finger) +a1 02 #Collection (Logical) 09 42 #Usage (Tip Switch) 15 00 #Logical minimum (0) 25 01 #Logical maximum (1) @@ -617,7 +616,7 @@ 16 00 00 #Logical Minimum(0) 26 f0 0f #Logical Minimum(16) 81 02 #Input (Data,Value,Absolute,Bit Field) -09 38 #Usage(Confidence) +09 47 #Usage(Confidence) 75 01 #Report Size(1) 95 01 #Report Count(1) 81 02 #Input (Data,Value,Absolute,Bit Field) @@ -636,30 +635,30 @@ c0 #End Collection c0 -# 05 01 #Usage Page (Generic Desktop Ctrls) -# 09 06 #Usage (Keyboard) -# A1 01 #Collection (Application) -# 85 05 #Report ID (5) -# 05 04 -# #05 07 #Usage Page (Kbrd/Keypad) -# 19 E0 #Usage Minimum (0xE0) -# 29 E7 #Usage Maximum (0xE7) -# 15 00 #Logical Minimum (0) -# 25 01 #Logical Maximum (1) -# 75 01 #Report Size (1) -# 95 08 #Report Count (8) -# 81 02 #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position) -# 75 08 #Report Size (8) -# 95 01 #Report Count (1) -# 15 00 #Logical Minimum (0) -# 25 F4 #Logical Maximum (-12) -# 05 04 -# #05 07 #Usage Page (Kbrd/Keypad) -# 19 00 #Usage Minimum (0x00) -# 29 F4 #Usage Maximum (0xF4) -# 81 00 #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position) -# C0 #End Collection -# c0 +05 01 #Usage Page (Generic Desktop Ctrls) +09 06 #Usage (Keyboard) +A1 01 #Collection (Application) +85 05 #Report ID (5) +05 04 +#05 07 #Usage Page (Kbrd/Keypad) +19 E0 #Usage Minimum (0xE0) +29 E7 #Usage Maximum (0xE7) +15 00 #Logical Minimum (0) +25 01 #Logical Maximum (1) +75 01 #Report Size (1) +95 08 #Report Count (8) +81 02 #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position) +75 08 #Report Size (8) +95 01 #Report Count (1) +15 00 #Logical Minimum (0) +25 F4 #Logical Maximum (-12) +05 04 +#05 07 #Usage Page (Kbrd/Keypad) +19 00 #Usage Minimum (0x00) +29 F4 #Usage Maximum (0xF4) +81 00 #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position) +C0 #End Collection +c0 # 05 0c # Usage Page(Consumer) # 09 01 # Usage(Consumer Control) Index: sched/shutter_dy.dat =================================================================== --- /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat (revision 5974) +++ /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat (working copy) @@ -217,7 +217,7 @@ mem_key0_release_new: 19 18 17 16 15 14 13 00 mem_key0_long_press: -06 01 00 +07 01 00 #like mem_key1_release_new: 1b 1c 00 @@ -254,10 +254,10 @@ mem_fouse_down_long_press:29 00 mem_fouse_down_long_release:2a 00 -mem_shutter_mode_step_android:02 01 2b 2c 00 +mem_shutter_mode_step_android:02 01 2b 2c mem_shutter_mode_step_ios_release: -2d 2e 2f 30 33 34 00 +2d 2e 2f 30 33 34 mem_shutter_dy_step_mode_android:1b 1c 1b 1c 00 ################################### fouse config end ###################################### @@ -467,8 +467,8 @@ 30 00 02 00 28 02 0f 18 00 00 -mem_shutter_le_map_len_android:c3 00 -mem_shutter_le_map_len_ios:c3 00 +mem_shutter_le_map_len_android:f3 00 +mem_shutter_le_map_len_ios:f3 00 mem_shutter_le_hid_map: 05 0c # Usage Page(Consumer) #legth 30 09 01 # Usage(Consumer Control) @@ -490,7 +490,7 @@ c0 #end 05 0d #Usage Page (Digitizer) -09 05 # Usage(Touch Screen) +09 04 # Usage(Touch Screen) a1 01 #Collection (Application) 85 06 #Report Id (6) 09 22 #Usage (finger) @@ -511,7 +511,7 @@ 16 00 00 #Logical Minimum(0) 26 f0 0f #Logical Minimum(16) 81 02 #Input (Data,Value,Absolute,Bit Field) -09 38 #Usage(Confidence) +09 47 #Usage(Confidence) 75 01 #Report Size(1) 95 01 #Report Count(1) 81 02 #Input (Data,Value,Absolute,Bit Field) @@ -529,11 +529,10 @@ 81 02 #Input (Data,Value,Absolute,Bit Field) c0 #End Collection 05 0d #Usage Page (Digitizer) -# 09 05 # Usage(Touch Screen) -# a1 01 #Collection (Application) -# 09 22 #Usage (finger) -# a1 02 #Collection (Logical) -a1 00 #Collection (Logical) +09 05 # Usage(Touch Screen) +a1 01 #Collection (Application) +09 22 #Usage (finger) +a1 02 #Collection (Logical) 09 42 #Usage (Tip Switch) 15 00 #Logical minimum (0) 25 01 #Logical maximum (1) @@ -550,7 +549,7 @@ 16 00 00 #Logical Minimum(0) 26 f0 0f #Logical Minimum(16) 81 02 #Input (Data,Value,Absolute,Bit Field) -09 38 #Usage(Confidence) +09 47 #Usage(Confidence) 75 01 #Report Size(1) 95 01 #Report Count(1) 81 02 #Input (Data,Value,Absolute,Bit Field) @@ -569,30 +568,30 @@ c0 #End Collection c0 -# 05 01 #Usage Page (Generic Desktop Ctrls) -# 09 06 #Usage (Keyboard) -# A1 01 #Collection (Application) -# 85 05 #Report ID (5) -# 05 04 -# #05 07 #Usage Page (Kbrd/Keypad) -# 19 E0 #Usage Minimum (0xE0) -# 29 E7 #Usage Maximum (0xE7) -# 15 00 #Logical Minimum (0) -# 25 01 #Logical Maximum (1) -# 75 01 #Report Size (1) -# 95 08 #Report Count (8) -# 81 02 #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position) -# 75 08 #Report Size (8) -# 95 01 #Report Count (1) -# 15 00 #Logical Minimum (0) -# 25 F4 #Logical Maximum (-12) -# 05 04 -# #05 07 #Usage Page (Kbrd/Keypad) -# 19 00 #Usage Minimum (0x00) -# 29 F4 #Usage Maximum (0xF4) -# 81 00 #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position) -# C0 #End Collection -# c0 +05 01 #Usage Page (Generic Desktop Ctrls) +09 06 #Usage (Keyboard) +A1 01 #Collection (Application) +85 05 #Report ID (5) +05 04 +#05 07 #Usage Page (Kbrd/Keypad) +19 E0 #Usage Minimum (0xE0) +29 E7 #Usage Maximum (0xE7) +15 00 #Logical Minimum (0) +25 01 #Logical Maximum (1) +75 01 #Report Size (1) +95 08 #Report Count (8) +81 02 #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position) +75 08 #Report Size (8) +95 01 #Report Count (1) +15 00 #Logical Minimum (0) +25 F4 #Logical Maximum (-12) +05 04 +#05 07 #Usage Page (Kbrd/Keypad) +19 00 #Usage Minimum (0x00) +29 F4 #Usage Maximum (0xF4) +81 00 #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position) +C0 #End Collection +c0 # 05 0c # Usage Page(Consumer) # 09 01 # Usage(Consumer Control)