Changeset 1008

Timestamp:

07/11/12 11:04:43 (11 months ago)

Author:

rudi_de

Message:

Aktualisierung auf Rev. 1973 internationaler Branch: Release-1.0
​http://trac.assembla.com/chdk/changeset/1973/branches/release-1_0

Betrifft ixus220, ixus230

• Korrektur der Tastaturverarbeitung

Location:

trunk/platform

Files:

• ixus220_elph300hs/kbd.c (modified) (4 diffs)
• ixus230_elph310hs/kbd.c (modified) (4 diffs)

trunk/platform/ixus220_elph300hs/kbd.c

@@ -13 +13 @@
         line 35: alt_mode_key_mask = 0x00004000
         line 62: { 2, KEY_PRINT              ,0x00004000 },  //KEY_VIDEO for ALT menu
-        
-        In line 255 special handling of KEY_VIDEO is defined:
-        Short Press of KEY_VIDEO toggles <ALT> mode
-        Long Press of KEY_VIDEO executes original Canon functionality
-        
-        In future versions this will be changed from KEY_VIDEO to KEY_PLAYBACK.
         
 ------------------------------------------------------------------------------*/
@@ -238 +232 @@
 void my_kbd_read_keys()
 {
-        static int altDownTimer=0;
-        const int DISP_DOWN_TIME = 20;
-
         kbd_prev_state[0] = kbd_new_state[0];
         kbd_prev_state[1] = kbd_new_state[1];
@@ -252 +243 @@
         
         kbd_new_state[2] |=0x00008000;  /// disable the battery door switch
-
-        // support for short/long press of Video button
-        if (kbd_is_key_pressed(KEY_VIDEO)) {                    // Video Button held down
-                altDownTimer++;                                                         // timer for KEY_VIDEO
-        }
-        else {
-                altDownTimer = 0;
-        }
 
         if (kbd_process() == 0) {
@@ -276 +259 @@
                 physw_status[1] = (kbd_new_state[1] & (~KEYS_MASK1)) | (kbd_mod_state[1] & KEYS_MASK1);
                 physw_status[2] = (kbd_new_state[2] & (~KEYS_MASK2)) |(kbd_mod_state[2] & KEYS_MASK2);
-
-                if (altDownTimer > DISP_DOWN_TIME) {
-                        physw_status[0] &= ~alt_mode_key_mask;  // press the VIDEO button
-                }
         }
         

trunk/platform/ixus230_elph310hs/kbd.c

@@ -13 +13 @@
         line 35: alt_mode_key_mask = 0x00004000
         line 62: { 2, KEY_PRINT              ,0x00004000 },  //KEY_VIDEO for ALT menu
-        
-        In line 255 special handling of KEY_VIDEO is defined:
-        Short Press of KEY_VIDEO toggles <ALT> mode
-        Long Press of KEY_VIDEO executes original Canon functionality
-        
-        In future versions this will be changed from KEY_VIDEO to KEY_PLAYBACK.
         
 ------------------------------------------------------------------------------*/
@@ -238 +232 @@
 void my_kbd_read_keys()
 {
-        static int altDownTimer=0;
-        const int DISP_DOWN_TIME = 20;
-
         kbd_prev_state[0] = kbd_new_state[0];
         kbd_prev_state[1] = kbd_new_state[1];
@@ -253 +244 @@
         kbd_new_state[2] |=0x00008000;  /// disable the battery door switch
 
-        // support for short/long press of Video button
-        if (kbd_is_key_pressed(KEY_VIDEO)) {                    // Video Button held down
-                altDownTimer++;                                                         // timer for KEY_VIDEO
-        }
-        else {
-                altDownTimer = 0;
-        }
 
         if (kbd_process() == 0) {
@@ -276 +260 @@
                 physw_status[1] = (kbd_new_state[1] & (~KEYS_MASK1)) | (kbd_mod_state[1] & KEYS_MASK1);
                 physw_status[2] = (kbd_new_state[2] & (~KEYS_MASK2)) |(kbd_mod_state[2] & KEYS_MASK2);
-
-                if (altDownTimer > DISP_DOWN_TIME) {
-                        physw_status[0] &= ~alt_mode_key_mask;  // press the VIDEO button
-                }
         }