Changeset 1786
- Timestamp:
- 04/01/12 16:00:08 (14 months ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
core/gui.c (modified) (1 diff)
-
platform/sx220hs/kbd.c (modified) (2 diffs)
-
platform/sx220hs/notes.txt (modified) (1 diff)
-
platform/sx230hs/kbd.c (modified) (3 diffs)
-
platform/sx230hs/notes.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/core/gui.c
r1764 r1786 1225 1225 static const char* names[]={ "Print", "Display"}; 1226 1226 static const int keys[] = {KEY_PRINT, KEY_DISPLAY}; 1227 #elif defined(CAMERA_sx220hs) || defined(CAMERA_sx230hs) 1228 static const char* names[]={ "Disp+Set", "Display", "Playback", "Video"}; 1229 static const int keys[] = {KEY_PRINT, KEY_DISPLAY, KEY_PLAYBACK, KEY_VIDEO}; 1230 #elif defined(CAMERA_sx150is) 1227 #elif defined(CAMERA_sx150is) || (CAMERA_sx220hs) || defined(CAMERA_sx230hs) 1231 1228 static const char* names[]={ "Playback", "Video", "Display" }; 1232 1229 static const int keys[] = {KEY_PRINT, KEY_VIDEO, KEY_DISPLAY}; -
trunk/platform/sx220hs/kbd.c
r1568 r1786 17 17 static KeyMap keymap[]; 18 18 static long last_kbd_key = 0; 19 20 static long alt_mode_key_mask = 0x00010800; // disp + set21 19 static int alt_mode_led=0; 22 20 extern void _GetKbdState(long*); … … 50 48 static KeyMap keymap[] = { 51 49 52 /* tiny bug: key order matters. see kbd_get_pressed_key() 53 * for example*/ 54 55 56 { 0, KEY_ZOOM_OUT , 0x00000001 }, 57 { 0, KEY_ZOOM_OUT1 , 0x00000001 }, 58 { 0, KEY_ZOOM_OUT , 0x00000002 }, 59 { 0, KEY_ZOOM_OUT3 , 0x00000002 }, 60 { 0, KEY_ZOOM_OUT , 0x00000003 }, 61 { 0, KEY_ZOOM_OUT2 , 0x00000003 }, 62 { 0, KEY_ZOOM_IN , 0x00000004 }, 63 { 0, KEY_ZOOM_IN1 , 0x00000004 }, 64 { 0, KEY_ZOOM_IN , 0x00000008 }, 65 { 0, KEY_ZOOM_IN3 , 0x00000008 }, 66 { 0, KEY_ZOOM_IN , 0x0000000C }, 67 { 0, KEY_ZOOM_IN2 , 0x0000000C }, 68 { 0, KEY_DISPLAY , 0x00000800 }, 69 { 0, KEY_UP , 0x00001000 }, 70 { 0, KEY_RIGHT , 0x00006000 }, 71 { 0, KEY_SET , 0x00010000 }, 72 { 0, KEY_PRINT , 0x00010800 }, //DISP+SET for ALT menu 73 { 0, KEY_DOWN , 0x00020000 }, 74 { 0, KEY_MENU , 0x00040000 }, 75 { 0, KEY_VIDEO , 0x00080000 }, 76 { 0, KEY_RIGHT_SOFT , 0x00002000 }, 77 { 0, KEY_UP_SOFT , 0x00000400 }, 78 { 0, KEY_DOWN_SOFT , 0x00008000 }, 79 80 { 2, KEY_LEFT_SOFT , 0x00000080 }, 81 { 2, KEY_LEFT , 0x00000100 }, 82 { 2, KEY_SHOOT_FULL , 0x00002002 }, 83 { 2, KEY_SHOOT_FULL_ONLY , 0x00000002 }, 84 { 2, KEY_SHOOT_HALF , 0x00002000 }, 85 86 { 1, KEY_PLAYBACK , 0x00200000 }, 87 88 { 0, 0, 0 } 50 /* tiny bug: key order matters. see kbd_get_pressed_key() 51 * for example*/ 52 53 { 0, KEY_ZOOM_OUT , 0x00000001 }, 54 { 0, KEY_ZOOM_OUT1 , 0x00000001 }, 55 { 0, KEY_ZOOM_OUT , 0x00000002 }, 56 { 0, KEY_ZOOM_OUT3 , 0x00000002 }, 57 { 0, KEY_ZOOM_OUT , 0x00000003 }, 58 { 0, KEY_ZOOM_OUT2 , 0x00000003 }, 59 { 0, KEY_ZOOM_IN , 0x00000004 }, 60 { 0, KEY_ZOOM_IN1 , 0x00000004 }, 61 { 0, KEY_ZOOM_IN , 0x00000008 }, 62 { 0, KEY_ZOOM_IN3 , 0x00000008 }, 63 { 0, KEY_ZOOM_IN , 0x0000000C }, 64 { 0, KEY_ZOOM_IN2 , 0x0000000C }, 65 { 0, KEY_DISPLAY , 0x00000800 }, 66 { 0, KEY_UP , 0x00001000 }, 67 { 0, KEY_RIGHT , 0x00006000 }, 68 { 0, KEY_SET , 0x00010000 }, 69 { 0, KEY_DOWN , 0x00020000 }, 70 { 0, KEY_MENU , 0x00040000 }, 71 { 0, KEY_VIDEO , 0x00080000 }, 72 { 0, KEY_RIGHT_SOFT , 0x00002000 }, 73 { 0, KEY_UP_SOFT , 0x00000400 }, 74 { 0, KEY_DOWN_SOFT , 0x00008000 }, 75 76 { 1, KEY_PRINT , 0x00200000 }, // playback = alt button 77 { 1, KEY_PLAYBACK , 0x00200000 }, 78 79 { 2, KEY_LEFT_SOFT , 0x00000080 }, 80 { 2, KEY_LEFT , 0x00000100 }, 81 { 2, KEY_SHOOT_FULL , 0x00002002 }, 82 { 2, KEY_SHOOT_FULL_ONLY , 0x00000002 }, 83 { 2, KEY_SHOOT_HALF , 0x00002000 }, 84 85 { 0, 0, 0 } 89 86 }; 90 87 88 // NOP 91 89 void kbd_set_alt_mode_key_mask(long key) 92 90 { 93 int i;94 for (i=0; keymap[i].hackkey; ++i) {95 if (keymap[i].hackkey == key) {96 alt_mode_key_mask = keymap[i].canonkey;97 return;98 }99 }100 91 } 101 92 -
trunk/platform/sx220hs/notes.txt
r1230 r1786 2 2 SX220 HS Notes 3 3 4 To enter CHDK <Alt> mode use the DISP+SETbutton.4 To enter CHDK <Alt> mode use the playback button. 5 5 6 6 Support for dual partition is not available. -
trunk/platform/sx230hs/kbd.c
r1719 r1786 20 20 static KeyMap keymap[]; 21 21 static long last_kbd_key = 0; 22 ;23 static long alt_mode_key_mask = 0x00010800; // disp + set24 22 static int alt_mode_led=0; 25 23 extern void _GetKbdState(long*); … … 79 77 { 0, KEY_DOWN_SOFT , 0x00008000 }, 80 78 { 0, KEY_SET , 0x00010000 }, 81 { 0, KEY_PRINT , 0x00010800 }, //DISP+SET for ALT menu82 79 { 0, KEY_DOWN , 0x00020000 }, 83 80 { 0, KEY_MENU , 0x00040000 }, 84 81 { 0, KEY_VIDEO , 0x00080000 }, 82 83 { 1, KEY_PRINT , 0x00200000 }, // playback = alt button 85 84 { 1, KEY_PLAYBACK , 0x00200000 }, 85 86 86 { 2, KEY_LEFT_SOFT , 0x00000080 }, 87 87 { 2, KEY_LEFT , 0x00000100 }, … … 89 89 { 2, KEY_SHOOT_FULL_ONLY , 0x00000002 }, 90 90 { 2, KEY_SHOOT_HALF , 0x00002000 }, 91 91 92 { 0, 0, 0 } 92 93 }; 93 94 95 // NOP 94 96 void kbd_set_alt_mode_key_mask(long key) 95 97 { 96 int i; 97 for (i=0; keymap[i].hackkey; ++i) { 98 if (keymap[i].hackkey == key) { 99 alt_mode_key_mask = keymap[i].canonkey; 100 return; 101 } 102 } 103 } 98 } 99 104 100 void my_blinkk(void) { 105 101 int i; -
trunk/platform/sx230hs/notes.txt
r1326 r1786 2 2 SX230 HS Notes 3 3 4 To enter CHDK <Alt> mode use the DISP+SETbutton.4 To enter CHDK <Alt> mode use the playback button. 5 5 6 6 Support for dual partition is not available.
Note: See TracChangeset
for help on using the changeset viewer.
