Changeset 1370

Timestamp:

10/17/11 07:17:44 (20 months ago)

Author:

philmoz

Message:

Updates from waterwingz:

• colored icons for SD940 ​http://chdk.setepontos.com/index.php?topic=650.msg74493#msg74493
• script fix ​http://chdk.setepontos.com/index.php?topic=650.msg74497#msg74497

Location:

trunk

Files:

• CHDK/SCRIPTS/4Pack/Lua/interval.lua (modified) (1 diff)
• core/gui_draw.h (modified) (1 diff)
• platform/ixus120_sd940/platform_camera.h (modified) (1 diff)

trunk/CHDK/SCRIPTS/4Pack/Lua/interval.lua

@@ -8 +8 @@
         shoot()
     sleep(a*1000 - (get_tick_count() - start))
-until ( 0 )
+until ( false )
 
 

trunk/core/gui_draw.h

@@ -212 +212 @@
         #define COLOR_ICON_PLY_GREY_LT          COLOR_ICON_REC_GREY_LT
 #endif
+#if defined (CAMERA_ixus120_sd940)
+        #define COLOR_ICON_REC_RED                      0xE7
+        #define COLOR_ICON_REC_RED_DK           0xEA
+        #define COLOR_ICON_REC_RED_LT           0xE3
+        #define COLOR_ICON_REC_GREEN            0x7F
+        #define COLOR_ICON_REC_GREEN_DK         0x86
+        #define COLOR_ICON_REC_GREEN_LT         0x78
+        #define COLOR_ICON_REC_YELLOW           0x92
+        #define COLOR_ICON_REC_YELLOW_DK        0x87
+        #define COLOR_ICON_REC_YELLOW_LT        0xA9
+        #define COLOR_ICON_REC_GREY                     COLOR_GREY
+        #define COLOR_ICON_REC_GREY_DK          0x1A
+        #define COLOR_ICON_REC_GREY_LT          0x11
+        
+        #define COLOR_ICON_PLY_RED                      0x15
+        #define COLOR_ICON_PLY_RED_DK           0x1E
+        #define COLOR_ICON_PLY_RED_LT           0x2c
+        #define COLOR_ICON_PLY_GREEN            0x9E
+        #define COLOR_ICON_PLY_GREEN_DK         0x9E
+        #define COLOR_ICON_PLY_GREEN_LT         0x9E
+        #define COLOR_ICON_PLY_YELLOW           0xCC
+        #define COLOR_ICON_PLY_YELLOW_DK        0xCD
+        #define COLOR_ICON_PLY_YELLOW_LT        0xCB
+        #define COLOR_ICON_PLY_GREY                     COLOR_GREY
+        #define COLOR_ICON_PLY_GREY_DK          0x1A
+        #define COLOR_ICON_PLY_GREY_LT          0x11
+#endif
 
 #elif CAM_BITMAP_PALETTE==4

trunk/platform/ixus120_sd940/platform_camera.h

@@ -104 +104 @@
                                                                                                 
         #define CAM_DETECT_SCREEN_ERASE 1                       // http://chdk.setepontos.com/index.php?topic=6705.msg71062#msg71062    
-                                                                                        
+                                        
+   #define CAM_USE_COLORED_ICONS  1       // Enable using the CHDK-DE colored icons.
+                                        
    //----------------------------------------------------------