Changeset 1848

Timestamp:

05/11/12 08:11:56 (12 months ago)

Author:

msl

Message:

Some minor changes

• sudoku: change hard coded marker color to COLOR_HISTO_G_PLAY, green for all cameras in play mode
• SX230: Enable CAM_HAS_MOVIE_DIGEST_MODE fix
• SX220/230: platform_camera.h cleanup tabs & spaces

Location:

trunk

Files:

• core/games/gui_sudoku.c (modified) (1 diff)
• platform/sx220hs/platform_camera.h (modified) (6 diffs)
• platform/sx230hs/platform_camera.h (modified) (4 diffs)

trunk/core/games/gui_sudoku.c

@@ -32 +32 @@
 //-------------------------------------------------------------------
 #define SUDOKU_BG_COLOR         MAKE_COLOR(COLOR_WHITE, COLOR_WHITE)
-#define MARKER_COLOR            0xFA //COLOR_BLUE appears black on my a570 1.01a
+#define MARKER_COLOR            COLOR_HISTO_G_PLAY // green for all cameras in play mode
 #define TEXT_COLOR                      MAKE_COLOR(SUDOKU_BG_COLOR, COLOR_BLACK)
 #define MARKER_TEXT_COLOR       MAKE_COLOR(MARKER_COLOR, COLOR_WHITE)

trunk/platform/sx220hs/platform_camera.h

@@ -39 +39 @@
 
     #define CAM_HAS_ND_FILTER               1
-        
+
     #undef  CAM_CAN_SD_OVER_NOT_IN_MF
     #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
@@ -45 +45 @@
     #define CAM_HAS_VIDEO_BUTTON            1
     #define CAM_VIDEO_QUALITY_ONLY          1
- 
+
     #undef  CAM_VIDEO_CONTROL
 
@@ -51 +51 @@
     #undef  CAM_USE_ZOOM_FOR_MF
 
-    #undef  CAM_UNCACHED_BIT  // shut up compiler
+    #undef  CAM_UNCACHED_BIT                    // shut up compiler
     #define CAM_UNCACHED_BIT                0x40000000
 
@@ -76 +76 @@
 
     #define CAM_EXT_TV_RANGE                1
-    
+
     #undef  CAM_BITMAP_PALETTE
     #define CAM_BITMAP_PALETTE              10
@@ -98 +98 @@
     #define CAM_ZEBRA_NOBUF                 1
 
-    //#define CAM_QUALITY_OVERRIDE            1
+    //#define CAM_QUALITY_OVERRIDE            1 // works not really
     #define CAM_CHDK_HAS_EXT_VIDEO_TIME     1
-    
+
     #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1
 
@@ -108 +108 @@
     #define CAMERA_MAX_DIST                 2000000 // Override max subject distance 1739131 //testscript=1098902
 
-        #define REMOTE_SYNC_STATUS_LED  0xC0220130              // specifies an LED that turns on while camera waits for USB remote to sync
-        
-        #define DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY       1
-        #define CAM_HAS_MOVIE_DIGEST_MODE               1
+    #define REMOTE_SYNC_STATUS_LED          0xC0220130  // specifies an LED that turns on while camera waits for USB remote to sync
+
+    #define DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY   1
+    #define CAM_HAS_MOVIE_DIGEST_MODE       1
 //----------------------------------------------------------

trunk/platform/sx230hs/platform_camera.h

@@ -39 +39 @@
 
     #define CAM_HAS_ND_FILTER               1
-        
+
     #undef  CAM_CAN_SD_OVER_NOT_IN_MF
     #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
     #define CAM_HAS_VIDEO_BUTTON            1
     #define CAM_VIDEO_QUALITY_ONLY          1
- 
+
     #undef  CAM_VIDEO_CONTROL
    
@@ -55 +55 @@
     #define CAM_DNG_LENS_INFO               { 50,10, 700,10, 31,10, 59,10 } // See comments in camera.h
     #define cam_CFAPattern                  0x02010100
-  
+
     #define CAM_COLORMATRIX1                            \
     544808, 1000000, -174047, 1000000, -80399, 1000000, \
     -75055, 1000000,  440444, 1000000,  11367, 1000000, \
      -5801, 1000000,   71589, 1000000, 118914, 1000000
- 
+
     #define cam_CalibrationIlluminant1      17
-   
+
     #define CAM_JPEG_WIDTH                  4000
     #define CAM_JPEG_HEIGHT                 3000
-                                                
+
     #define CAM_ACTIVE_AREA_X1              96
     #define CAM_ACTIVE_AREA_Y1              24
@@ -105 +105 @@
     #undef  CAMERA_MIN_DIST
     #define CAMERA_MIN_DIST                 99     // Override min subject distance
-    
+
     #define CAM_HAS_GPS                     1
-        
+
     #define CAM_CHDK_HAS_EXT_VIDEO_TIME     1
 
@@ -113 +113 @@
     #define OVEREXP_COMPENSATE_OVERALL      1
 
-        
-        #define REMOTE_SYNC_STATUS_LED  0xC0220130              // specifies an LED that turns on while camera waits for USB remote to sync
+    #define REMOTE_SYNC_STATUS_LED          0xC0220130  // specifies an LED that turns on while camera waits for USB remote to sync
+
+    #define CAM_HAS_MOVIE_DIGEST_MODE       1 
 //----------------------------------------------------------