Changeset 1935

Timestamp:

06/25/12 04:55:16 (11 months ago)

Author:

philmoz

Message:

Merged revision(s) 1931-1934 from trunk:
Update test branch with latest trunk changes.

Location:

branches/philmoz-uitest

Files:

• . (modified) (1 prop)
• camera_list.csv (modified) (1 diff)
• core/action_stack.c (modified) (2 diffs)
• core/edgeoverlay.c (modified) (2 diffs)
• core/edgeoverlay.h (modified) (1 diff)
• core/gui.c (modified) (1 diff)
• core/gui_osd.c (modified) (1 diff)
• core/usb_remote.c (modified) (4 diffs)
• core/usb_remote.h (modified) (1 diff)
• include/conf.h (modified) (1 diff)
• loader/a2200 (copied) (copied from trunk/loader/a2200)
• platform/a2200 (copied) (copied from trunk/platform/a2200)
• platform/a410/kbd.c (modified) (1 diff)
• platform/a410/platform_camera.h (modified) (1 diff)
• platform/a410/sub/100f/lib.c (modified) (3 diffs)
• platform/a420/kbd.c (modified) (1 diff)
• platform/a420/platform_camera.h (modified) (1 diff)
• platform/a430/kbd.c (modified) (1 diff)
• platform/a430/platform_camera.h (modified) (1 diff)
• platform/a530/kbd.c (modified) (1 diff)
• platform/a530/platform_camera.h (modified) (1 diff)
• platform/a540/kbd.c (modified) (1 diff)
• platform/a540/platform_camera.h (modified) (1 diff)
• platform/a610/kbd.c (modified) (1 diff)
• platform/a610/platform_camera.h (modified) (1 diff)
• platform/a620/kbd.c (modified) (1 diff)
• platform/a620/platform_camera.h (modified) (1 diff)
• platform/a630/kbd.c (modified) (1 diff)
• platform/a630/platform_camera.h (modified) (1 diff)
• platform/a640/kbd.c (modified) (1 diff)
• platform/a640/platform_camera.h (modified) (1 diff)
• platform/a700/kbd.c (modified) (1 diff)
• platform/a700/platform_camera.h (modified) (1 diff)
• platform/a710/kbd.c (modified) (1 diff)
• platform/a710/platform_camera.h (modified) (1 diff)
• platform/g10/kbd.c (modified) (1 diff)
• platform/generic/kbd.c (modified) (4 diffs)
• platform/ixus800_sd700/kbd.c (modified) (1 diff)
• platform/ixus800_sd700/platform_camera.h (modified) (1 diff)

branches/philmoz-uitest/camera_list.csv

@@ -5 +5 @@
 a2000,100c,BETA,100a:100b,
 a2100,100a,ALPHA,,SKIP_AUTOBUILD
+a2200,100b,ALPHA,,SKIP_AUTOBUILD
+a2200,100d,ALPHA,,SKIP_AUTOBUILD
 a3000,100b,BETA,,
 a3000,100c,BETA,,

branches/philmoz-uitest/core/action_stack.c

@@ -9 +9 @@
 #include "action_stack.h"
 
+extern int usb_sync_wait ;
+
+
 typedef struct _action_stack
 {
@@ -213 +216 @@
 int action_stack_standard(long p)
 {
+    long skey ;
+
     switch (p)
     {
     case AS_PRESS:
-        kbd_key_press(action_get_prev(2));
+        skey=action_get_prev(2) ;
+        if ((skey == KEY_SHOOT_FULL) &&  conf.remote_enable && conf.synch_enable ) usb_sync_wait = 1 ;
+        kbd_key_press(skey);
         action_pop();
         action_pop();

branches/philmoz-uitest/core/edgeoverlay.c

@@ -662 +662 @@
     case EDGE_LIVE:
     {
-        edge_state_draw=0;
+        conf.edge_state_draw=0;
         // In this state we assume no edge overlay in memory,
         // but we are ready to create one if the user presses wishes so.
@@ -699 +699 @@
     case EDGE_FROZEN:
     {
-        edge_state_draw=1;
+        conf.edge_state_draw=1;
         // We have a stored edge overlay in memory and we display
         // it on screen in 'frozen' mode.

branches/philmoz-uitest/core/edgeoverlay.h

@@ -16 +16 @@
 };
 
-int edge_state_draw;
-
 // Defines of exported to chdk symbols
 #ifdef THIS_IS_CHDK_CORE

branches/philmoz-uitest/core/gui.c

@@ -1471 +1471 @@
         static const char* names[]={ "Shrtcut", "Flash", "Video"};
         static const int keys[]={ KEY_PRINT, KEY_FLASH, KEY_VIDEO };
-    #elif defined(CAMERA_a570) || defined(CAMERA_a580) || defined(CAMERA_a590) || defined(CAMERA_a720) || defined(CAMERA_ixus65_sd630)
+    #elif defined(CAMERA_a410) || defined(CAMERA_a430) || defined(CAMERA_a420) || defined(CAMERA_a530) || defined(CAMERA_a540) || defined(CAMERA_a570) || defined(CAMERA_a580) || defined(CAMERA_a590) ||defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_a700) || defined(CAMERA_a710) || defined(CAMERA_a720) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus800_sd700) 
         static const char* names[]={ "Print", "Display"};
         static const int keys[] = {KEY_PRINT, KEY_DISPLAY};

branches/philmoz-uitest/core/gui_osd.c

@@ -280 +280 @@
     // edgeoverlay state
     if (conf.edge_overlay_enable || gui_mode==GUI_MODE_OSD) {
-        if (edge_state_draw==0) gui_print_osd_state_string_chr("EDGE:", "LIVE");
-        else if (edge_state_draw==1) gui_print_osd_state_string_chr("EDGE:", ((conf.edge_overlay_pano==0)?"FROZEN":"PANO"));
+        if (conf.edge_state_draw==0) gui_print_osd_state_string_chr("EDGE:", "LIVE");
+        else if (conf.edge_state_draw==1) gui_print_osd_state_string_chr("EDGE:", ((conf.edge_overlay_pano==0)?"FROZEN":"PANO"));
     }
 #endif

branches/philmoz-uitest/core/usb_remote.c

@@ -336 +336 @@
 /*---------------------------------------------------------------------------------------------------------
 
+         clear_usb_power()
+
+  ---------------------------------------------------------------------------------------------------------*/
+
+void clear_usb_power()
+{
+        usb_power = 0 ;
+        usb_count = 0 ;
+        logic_module_usb_count = 0;
+        usb_buffer_out = usb_buffer_in = usb_buffer ;
+}
+
+/*---------------------------------------------------------------------------------------------------------
+
          get_usb_power()
 
@@ -343 +357 @@
 int get_usb_power(int mode)
 {
-        int x;
+        int x = 0;
 
         switch( mode)
@@ -357 +371 @@
 
                 case BUFFERED_PULSE :
-                        if ( usb_buffer_out == usb_buffer_in )
-                        {
-                                x = 0 ;
-                        }
-                        else
+                        if ( usb_buffer_out != usb_buffer_in )
                         {
                                 if ( ++usb_buffer_out > &usb_buffer[USB_BUFFER_SIZE-1] ) usb_buffer_out = usb_buffer ;
@@ -377 +387 @@
                         logic_module_usb_count = 0;
                         break ;
-                        
-                default :
-                        x=0 ;
+
+                case CLEAR_USB_REGISTERS :
+                        clear_usb_power() ;
                         break ;
         }

branches/philmoz-uitest/core/usb_remote.h

@@ -109 +109 @@
         BUFFERED_PULSE ,
         PULSE_COUNT,
-        LM_PULSE_COUNT
+        LM_PULSE_COUNT,
+        CLEAR_USB_REGISTERS
 } ;
 

branches/philmoz-uitest/include/conf.h

@@ -305 +305 @@
     int edge_overlay_play;              // whether edge overlay is switched on also for play mode
     color edge_overlay_color;
+    int edge_state_draw;                // Current state of overlay (Live/Frozen/Pano) [not saved to config file]
 
     int synch_enable;

branches/philmoz-uitest/platform/a410/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x00001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a410/platform_camera.h

@@ -33 +33 @@
     #define CAM_HAS_ND_FILTER               1
     #undef  CAM_HAS_MANUAL_FOCUS
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #undef  CAM_HAS_USER_TV_MODES

branches/philmoz-uitest/platform/a410/sub/100f/lib.c

@@ -22 +22 @@
 }
 
-/*
-void *vid_get_viewport_live_fb()
-{
-    return (void*)0;
+int vid_get_viewport_width_proper() {
+    int m = mode_get();
+    if((m&MODE_MASK) == MODE_PLAY) {
+        return 720; //no tv-out
+    }
+    // return hard coded width since mode doesn't update at the same time as GetVRAMHPixelsSize
+    if((m&MODE_SHOOTING_MASK) == MODE_STITCH) {
+        return 360;
+    }
+    return *(int*)0x36a98;
 }
-*/
+
+int vid_get_viewport_height_proper() {
+    int m = mode_get();
+    if((m&MODE_MASK) == MODE_PLAY) {
+        return 240; //no tv-out
+    }
+    // return hard coded width since mode doesn't update at the same time as GetVRAMHPixelsSize
+    if((m&MODE_SHOOTING_MASK) == MODE_STITCH) {
+        return 120; 
+    }
+    return *(int*)0x36a9c;
+}
 
 void *vid_get_viewport_live_fb() // from a540
@@ -57 +74 @@
 }
 
+int vid_get_viewport_width() {
+    return vid_get_viewport_width_proper()>>1;
+}
+
 long vid_get_viewport_height()
 {
-    // return ((mode_get()&MODE_MASK) == MODE_PLAY) ? 240 : 230;
-    return 240;
+    return vid_get_viewport_height_proper();
 }
 
@@ -67 +87 @@
     return (char*)0x7F9F0; // @ffdd479c
 } 
+
+int vid_get_palette_type() { return 1; }
+int vid_get_palette_size() { return 16*4; }
+
+void *vid_get_bitmap_active_palette() {
+    return (void *)0x73028; // GetPaletteFromPhysicalScreen
+}
+
+void *vid_get_bitmap_active_buffer()
+{
+    return (void*)(*(int*)0x6694); // @ffd0a170 DisplayPhysicalScreenWithYUVPalette
+}
+
+int vid_get_viewport_fullscreen_height() {
+    // except for stitch, always full screen
+    int m = mode_get();
+    if((m&MODE_MASK) != MODE_PLAY && ((m&MODE_SHOOTING_MASK) == MODE_STITCH)) {
+        return 240;
+    }
+    return vid_get_viewport_height_proper();
+}
+
+int vid_get_viewport_fullscreen_width() {
+    // except for stitch, always full screen
+    int m = mode_get();
+    if((m&MODE_MASK) != MODE_PLAY && ((m&MODE_SHOOTING_MASK) == MODE_STITCH)) {
+        return 720;
+    }
+    return vid_get_viewport_width_proper();
+}
+
+int vid_get_viewport_display_xoffset() {
+    int m = mode_get();
+    if((m&MODE_MASK) == MODE_PLAY) {
+        return 0;
+    } else if((m&MODE_SHOOTING_MASK) == MODE_STITCH) { // checked visually, OK
+        short dir=0;
+        short seq=0;
+        get_property_case(PROPCASE_STITCH_DIRECTION,&dir,sizeof(dir));
+        get_property_case(PROPCASE_STITCH_SEQUENCE,&seq,sizeof(seq));
+        // overall stitch window is 3/4 screen width, centered
+        // live part is 1/2, so margin is either 1/8th or 3/8th
+        if(dir==0) {
+            return seq?132:44;
+        } else {
+            return seq?44:132;
+        }
+    }
+    return 0;
+}
+
+int vid_get_viewport_display_yoffset() {
+    int m = mode_get();
+    if((m&MODE_MASK) == MODE_PLAY) {
+        return 0;
+    }
+    return ((m&MODE_SHOOTING_MASK) == MODE_STITCH)?60:0; // window is 120, centered in 240 screen
+}

branches/philmoz-uitest/platform/a420/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a420/platform_camera.h

@@ -30 +30 @@
         #define CAM_DRAW_EXPOSITION                             1
         #undef  CAM_HAS_ERASE_BUTTON
+        #define CAM_ADJUSTABLE_ALT_BUTTON       1
+
         #undef  CAM_HAS_IRIS_DIAPHRAGM
         #define CAM_HAS_ND_FILTER                               1

branches/philmoz-uitest/platform/a430/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a430/platform_camera.h

@@ -29 +29 @@
     #undef  CAM_HAS_ZOOM_LEVER
     #define CAM_DRAW_EXPOSITION             1
-    #undef  CAM_HAS_ERASE_BUTTON
     #undef  CAM_HAS_IRIS_DIAPHRAGM
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
     #define CAM_HAS_ND_FILTER               1
     #undef  CAM_HAS_MANUAL_FOCUS

branches/philmoz-uitest/platform/a530/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a530/platform_camera.h

@@ -36 +36 @@
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
     #define CAM_EV_IN_VIDEO                 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 58,10, 232,10, 26,10, 55,10 } // See comments in camera.h

branches/philmoz-uitest/platform/a540/kbd.c

@@ -1 +1 @@
 
 #include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
 
 #include "../generic/kbd.c"

branches/philmoz-uitest/platform/a540/platform_camera.h

@@ -30 +30 @@
     #undef  CAM_HAS_IS
     #define CAM_CAN_MUTE_MICROPHONE         1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
     #define CAM_EV_IN_VIDEO                 1

branches/philmoz-uitest/platform/a610/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a610/platform_camera.h

@@ -33 +33 @@
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
     #define CAM_EV_IN_VIDEO                 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
+
     #define CAM_EXT_TV_RANGE                1
     #define CAM_DNG_LENS_INFO               { 73,10, 292,10, 28,10, 41,10 } // See comments in camera.h

branches/philmoz-uitest/platform/a620/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a620/platform_camera.h

@@ -32 +32 @@
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
     #define CAM_EV_IN_VIDEO                 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 73,10, 292,10, 28,10, 41,10 } // See comments in camera.h

branches/philmoz-uitest/platform/a630/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x00001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a630/platform_camera.h

@@ -33 +33 @@
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
     #define CAM_EV_IN_VIDEO                 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 73,10, 292,10, 28,10, 41,10 } // See comments in camera.h

branches/philmoz-uitest/platform/a640/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a640/platform_camera.h

@@ -33 +33 @@
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
     #define CAM_EV_IN_VIDEO                 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 73,10, 292,10, 28,10, 41,10 } // See comments in camera.h

branches/philmoz-uitest/platform/a700/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a700/platform_camera.h

@@ -30 +30 @@
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
     #define CAM_EV_IN_VIDEO                 1
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 58,10, 348,10, 28,10, 48,10 } // See comments in camera.h

branches/philmoz-uitest/platform/a710/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/a710/platform_camera.h

@@ -31 +31 @@
     #define CAM_EV_IN_VIDEO                 1
     #define CAM_REAR_CURTAIN                1 // http://chdk.setepontos.com/index.php/topic,650.msg54434.html#msg54434 
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 58,10, 348,10, 28,10, 48,10 } // See comments in camera.h

branches/philmoz-uitest/platform/g10/kbd.c

@@ -17 +17 @@
 
 static long last_kbd_key = 0;
-static long alt_mode_key_mask = 0x00000400;     // G10
+static long alt_mode_key_mask = 0x00000200;     // default to G10 Print Key
 
 extern void _GetKbdState(long*);

branches/philmoz-uitest/platform/generic/kbd.c

@@ -27 +27 @@
 #define SD_READONLY_FLAG (0x20000)
 
+#if defined(CAMERA_a530) || defined(CAMERA_a540)
+#define USB_MASK 0x4000
+#define USB_IDX 2
+#endif
+
+
+#if defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined(CAMERA_a410) || defined(CAMERA_a430) || defined(CAMERA_a420)
+#define USB_MASK 0x8000000
+#define USB_IDX 1
+#endif
+
 #if defined(CAMERA_a710) || defined(CAMERA_a700)
 #define USB_MASK 0x08
@@ -32 +43 @@
 #endif
 
-#if     defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610)\
-        || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a410)\
-    || defined(CAMERA_a420) || defined(CAMERA_a430)
-#define USB_MASK 0x8000000
-#define USB_IDX 1
-#endif
-
-#if defined(CAMERA_a530) || defined(CAMERA_a540)
-#define USB_MASK 0x4000
-#define USB_IDX 2
-#endif
 
 int get_usb_bit() 
@@ -148 +148 @@
         physw_status[1] = kbd_new_state[1];
         physw_status[2] = kbd_new_state[2];
+        physw_status[alt_mode_key_reg] |= alt_mode_key_mask;
+
     } else {
         // override keys
@@ -176 +178 @@
 }
 
+void kbd_set_alt_mode_key_mask(long key)
+{
+    int i;
+    for (i=0; keymap[i].hackkey; ++i) {
+        if (keymap[i].hackkey == key) {
+            alt_mode_key_mask = keymap[i].canonkey;
+            return;
+        }
+    }
+}
 
 void kbd_key_press(long key)

branches/philmoz-uitest/platform/ixus800_sd700/kbd.c

@@ +1 @@
+
+#include <stdlib.h>
+
+static long alt_mode_key_mask = 0x000001000; // =  KEY_PRINT
+static long alt_mode_key_reg  = 2;
+
 #include "../generic/kbd.c"
 

branches/philmoz-uitest/platform/ixus800_sd700/platform_camera.h

@@ -35 +35 @@
     #define CAM_SHOW_OSD_IN_SHOOT_MENU      1
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #define CAM_DNG_LENS_INFO               { 58,10, 232,10, 28,10, 55,10 } // See comments in camera.h