Context Navigation

-                      r1235
+                      r1237
     static const char* names[]={ "Print", "Display"};
     static const int keys[] = {KEY_PRINT, KEY_DISPLAY};
+#elif defined(CAMERA_sx220hs)
+    static const char* names[]={ "Disp+Set", "Display", "Video"};
+    static const int keys[] = {KEY_PRINT, KEY_DISPLAY, KEY_VIDEO};
 #else
     #error camera alt-buttons not defined

trunk/core/gui_draw.h

-                      r1234
+                      r1237
 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT
 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW
+#undef SCREEN_COLOR
+#define SCREEN_COLOR            0x1D
+#elif CAM_BITMAP_PALETTE==10 //(a1100)
+#define COLOR_TRANSPARENT   0x00
+#define COLOR_WHITE         0x0A
+#define COLOR_RED           0x6B
+#define COLOR_GREY          0x17
+#define COLOR_GREEN         0x96
+#define COLOR_BLUE_LT       0x79
+#define COLOR_BLUE          0x8A
+#define COLOR_YELLOW        0x54
+#define COLOR_BLACK         0xFF
+#define COLOR_BG            0x1F
+#define COLOR_FG            COLOR_WHITE
+#define COLOR_SELECTED_BG   COLOR_RED
+#define COLOR_SELECTED_FG   COLOR_WHITE
+#define COLOR_ALT_BG        0x87
+#define COLOR_SPLASH_RED    0x60
+#define COLOR_SPLASH_PINK   0xBD
+#define COLOR_SPLASH_GREY   0x16
+// colors for blended histo
+#define COLOR_HISTO_R       COLOR_RED
+#define COLOR_HISTO_R_PLAY  COLOR_RED
+#define COLOR_HISTO_B       COLOR_BLUE
+#define COLOR_HISTO_G       COLOR_GREEN
+#define COLOR_HISTO_G_PLAY  COLOR_GREEN
+#define COLOR_HISTO_BG      COLOR_BLUE_LT
+#define COLOR_HISTO_RG      COLOR_YELLOW
+#define COLOR_HISTO_RB      0x66
+#define COLOR_HISTO_RB_PLAY 0xE2
+#define COLOR_HISTO_B_PLAY  0xCC
+#define COLOR_HISTO_BG_PLAY 0x99
+#define COLOR_HISTO_RG_PLAY 0x66
 #undef SCREEN_COLOR
 #define SCREEN_COLOR            0x1D

r1224	r1237
161	161	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
162	162
	163	#undef CAM_AV_OVERRIDE_IRIS_FIX // for cameras that require _MoveIrisWithAv function to override Av.
	164
163	165	//----------------------------------------------------------
164	166	// Override Default values for Camera if necessary

-                      r1224
+                      r1237
                                                 // Used to enabled bracketing in custom timer, required on many recent cameras
                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
+        #define CAM_AV_OVERRIDE_IRIS_FIX        1                               // for cameras that require _MoveIrisWithAv function to override Av.
 //----------------------------------------------------------

-                      r1232
+                      r1237
  if(is_now) {
    _SetPropertyCase(PROPCASE_AV, &v, sizeof(v));
         #if defined(CAMERA_sx220hs)
+        #if CAM_AV_OVERRIDE_IRIS_FIX
         extern int _MoveIrisWithAv(short*);
         _MoveIrisWithAv(&v);
 …
+    {
         shooting_set_av96_direct(value, SET_NOW);
-// sx30 and g12 apparently do not set aperture from propcase in continuous mode
-// TODO if this is common to other models it should become a camera.h define
-#if defined(CAMERA_sx30) || defined(CAMERA_g12) || defined(CAMERA_sx220hs)
-        extern int _MoveIrisWithAv(short*);
-        _MoveIrisWithAv(&value);
-#endif
+    }
+}

-                      r1224
+                      r1237
     #define cam_CalibrationIlluminant1 17 // Standard Light A
     // cropping
     #define CAM_JPEG_WIDTH  3600
     #define CAM_JPEG_HEIGHT 2700
     #define CAM_ACTIVE_AREA_X1 52
     #define CAM_ACTIVE_AREA_Y1 14
     #define CAM_ACTIVE_AREA_X2 3648
     #define CAM_ACTIVE_AREA_Y2 2736
+    // cropping. modified to be more in line with G11 and S90
+    #define CAM_JPEG_WIDTH  3648     // 3600
+    #define CAM_JPEG_HEIGHT 2736     // 2700
+    #define CAM_ACTIVE_AREA_X1 16    // 52
+    #define CAM_ACTIVE_AREA_Y1 8     // 14
+    #define CAM_ACTIVE_AREA_X2 3692  // 3648
+    #define CAM_ACTIVE_AREA_Y2 2776  // 2736
    #define CAM_ZEBRA_ASPECT_ADJUST 1

-                      r1230
+                      r1237
 static int remote_key, remote_count;
 static int shoot_counter=0;
 //static long alt_mode_key_mask = 0x00010800; // disp + set
+static long alt_mode_key_mask = 0x00010800; // disp + set
 static int alt_mode_led=0;
 extern void _GetKbdState(long*);
 …
         { 0, 0, 0 }
 };
+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 my_blinkk(void) {

-                      r1230
+                      r1237
 // don't override them again in here.
+        #define CAM_DRIVE_MODE_FROM_TIMER_MODE 1
+        #define CAM_AV_OVERRIDE_IRIS_FIX                1               // for cameras that require _MoveIrisWithAv function to override Av.
+        #define CAM_KEY_CLICK_DELAY                     150
+        #define CAM_ADJUSTABLE_ALT_BUTTON               1
+        #define CAM_DRIVE_MODE_FROM_TIMER_MODE  1
     #define CAM_DRYOS_2_3_R39                   1

-                      r1230
+                      r1237
         { MODE_SCN_HIGHSPEED_BURST,     16904  },
         { MODE_SCN_BEST_IMAGE,          16905  },
+        { MODE_SCN_TOY_CAMERA,                   9862  },
+        { MODE_SCN_MONOCHROME,                   9754  },
+        { MODE_SCN_TOY_CAMERA,                   8751  },
+        { MODE_SCN_MONOCHROME,                   8754  },
+        { MODE_SCN_WINK_SELF_TIMER,             16938  },
+    { MODE_SCN_FACE_SELF_TIMER,         16936  },
 };

r1224	r1237
105	105	// Used to enabled bracketing in custom timer, required on many recent cameras
106	106	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
107
	107
	108	#define CAM_AV_OVERRIDE_IRIS_FIX 1 // for cameras that require _MoveIrisWithAv function to override Av.
108	109	//----------------------------------------------------------

Note: See TracChangeset for help on using the changeset viewer.