Changeset 1552

Timestamp:

01/14/12 22:04:32 (16 months ago)

Author:

philmoz

Message:

Add A3300 firmware 1.00a (from mk11174 and waterwingz)
​http://chdk.setepontos.com/index.php?topic=650.msg79808#msg79808

Location:

trunk

Files:

• camera_list.csv (modified) (1 diff)
• core/gui_draw.h (modified) (1 diff)
• core/kbd.c (modified) (1 diff)
• loader/a3300 (added)
• loader/a3300/Makefile (added)
• loader/a3300/blobs.S (added)
• loader/a3300/entry.S (added)
• loader/a3300/main.c (added)
• loader/a3300/resetcode (added)
• loader/a3300/resetcode/Makefile (added)
• loader/a3300/resetcode/entry.S (added)
• loader/a3300/resetcode/main.c (added)
• platform/a3300 (added)
• platform/a3300/Makefile (added)
• platform/a3300/kbd.c (added)
• platform/a3300/lib.c (added)
• platform/a3300/main.c (added)
• platform/a3300/notes.txt (added)
• platform/a3300/platform_camera.h (added)
• platform/a3300/shooting.c (added)
• platform/a3300/sub (added)
• platform/a3300/sub/100a (added)
• platform/a3300/sub/100a/Makefile (added)
• platform/a3300/sub/100a/boot.c (added)
• platform/a3300/sub/100a/capt_seq.c (added)
• platform/a3300/sub/100a/kbd.c (added)
• platform/a3300/sub/100a/lib.c (added)
• platform/a3300/sub/100a/makefile.inc (added)
• platform/a3300/sub/100a/movie_rec.c (added)
• platform/a3300/sub/100a/stubs_asm.h (added)
• platform/a3300/sub/100a/stubs_auto.S (added)
• platform/a3300/sub/100a/stubs_entry.S (added)
• platform/a3300/sub/100a/stubs_entry_2.S (added)
• platform/a3300/sub/100a/stubs_min.S (added)
• platform/a3300/sub/Makefile (added)
• platform/a3300/wrappers.c (added)

trunk/camera_list.csv

@@ -5 +5 @@
 a3000,100c,BETA,,
 a3000,100d,BETA,,
+a3300,100a,ALPHA,,SKIP_AUTOBUILD
 a410,100f,BETA,100e,
 a430,100b,BETA,,SKIP_AUTOBUILD

trunk/core/gui_draw.h

@@ -734 +734 @@
 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW
 
+#elif CAM_BITMAP_PALETTE==14
+
+// Used by :- A3300IS
+
+#define COLOR_WHITE         0x01
+#define COLOR_RED           0x6C
+#define COLOR_GREY          0x1a
+#define COLOR_GREY_LIGHT    0x0B
+#define COLOR_GREY_DARK     0x19
+#define COLOR_GREEN         0xa0
+#define COLOR_BLUE_LT       0x96
+#define COLOR_BLUE          0xa1
+#define COLOR_YELLOW        0x92
+#define COLOR_BG            0x62
+#define COLOR_FG            COLOR_WHITE
+#define COLOR_SELECTED_BG   0x0e
+#define COLOR_SELECTED_FG   COLOR_BLACK
+#define COLOR_ALT_BG        COLOR_BG
+#define COLOR_SPLASH_RED    COLOR_RED
+#define COLOR_SPLASH_PINK   0x9F    // Orange
+#define COLOR_SPLASH_GREY   0x16
+#define COLOR_HISTO_R       0x6C
+#define COLOR_HISTO_R_PLAY  COLOR_RED
+#define COLOR_HISTO_B       0x6D
+#define COLOR_HISTO_B_PLAY  COLOR_BLUE
+#define COLOR_HISTO_G       0x90
+#define COLOR_HISTO_G_PLAY  COLOR_GREEN
+#define COLOR_HISTO_BG      0x52    // COLOR_BLUE_LT
+#define COLOR_HISTO_RG      0x51    // COLOR_YELLOW
+#define COLOR_HISTO_RB      0x3D    // COLOR_RED
+#define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB
+#define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT
+#define COLOR_HISTO_RG_PLAY COLOR_YELLOW
+#undef SCREEN_COLOR
+#define SCREEN_COLOR            0x1D
+
+// Icon colors
+// 3 shades of Red, Green, Yellow and Grey
+// Separate definitions for record and playback mode
+// to cater for cameras with variable palettes
+#define COLOR_ICON_REC_RED                      0x3D
+#define COLOR_ICON_REC_RED_DK           0x9F
+#define COLOR_ICON_REC_RED_LT           0x1E
+#define COLOR_ICON_REC_GREEN            0x90
+#define COLOR_ICON_REC_GREEN_DK         0x5A
+#define COLOR_ICON_REC_GREEN_LT         0x59
+#define COLOR_ICON_REC_YELLOW           0x2D
+#define COLOR_ICON_REC_YELLOW_DK        0x1E
+#define COLOR_ICON_REC_YELLOW_LT        0x20
+#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                      0x9F
+#define COLOR_ICON_PLY_RED_DK           0x9F
+#define COLOR_ICON_PLY_RED_LT           0x1E
+#define COLOR_ICON_PLY_GREEN            0xA0
+#define COLOR_ICON_PLY_GREEN_DK         0xA0
+#define COLOR_ICON_PLY_GREEN_LT         0x9E
+#define COLOR_ICON_PLY_YELLOW           0x55
+#define COLOR_ICON_PLY_YELLOW_DK        0x55
+#define COLOR_ICON_PLY_YELLOW_LT        0x4C
+#define COLOR_ICON_PLY_GREY                     COLOR_ICON_REC_GREY
+#define COLOR_ICON_PLY_GREY_DK          COLOR_ICON_REC_GREY_DK
+#define COLOR_ICON_PLY_GREY_LT          COLOR_ICON_REC_GREY_LT
+
+
 #else
 #error CAM_BITMAP_PALETTE not defined

trunk/core/kbd.c

@@ -75 +75 @@
         defined(CAMERA_a550) || defined(CAMERA_a560) || defined(CAMERA_a570) || defined(CAMERA_a580) || defined(CAMERA_a590) || \
         defined(CAMERA_ixus860_sd870) || defined(CAMERA_ixus960_sd950) || defined(CAMERA_ixus80_sd1100) || \
-        defined(CAMERA_ixus970_sd890) || defined(CAMERA_ixus980_sd990) || defined(CAMERA_a1100) || defined(CAMERA_a3000)
+        defined(CAMERA_ixus970_sd890) || defined(CAMERA_ixus980_sd990) || defined(CAMERA_a1100) || defined(CAMERA_a3000)|| defined(CAMERA_a3300)
 #define ZSTEP_TABLE_SIZE 8
 static int nTxtbl[]={0,1,2,3,4,5,6,7};