Changeset 935

Timestamp:

01/30/12 08:33:25 (16 months ago)

Author:

rudi_de

Message:

neuen Kamera a3300, Status: Alpha

Danke mk11174 und waterwingz!

+ neue Kamera a3300, Firmwareversion 100a und 100d hinzugefügt

• Grundlage: internationaler Branch: Release-1.0, Changesets 1551,1617,1619

​http://trac.assembla.com/chdk/changeset/1551/branches/release-1_0
​http://trac.assembla.com/chdk/changeset/1617/branches/release-1_0
​http://trac.assembla.com/chdk/changeset/1619/branches/release-1_0

Location:

trunk

Files:

• camera_list.csv (modified) (1 diff)
• core/gui_draw.h (modified) (1 diff)
• core/kbd.c (modified) (1 diff)
• include/modelist.h (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_entry.S (added)
• platform/a3300/sub/100a/stubs_entry_2.S (added)
• platform/a3300/sub/100a/stubs_min.S (added)
• platform/a3300/sub/100d (added)
• platform/a3300/sub/100d/Makefile (added)
• platform/a3300/sub/100d/boot.c (added)
• platform/a3300/sub/100d/capt_seq.c (added)
• platform/a3300/sub/100d/kbd.c (added)
• platform/a3300/sub/100d/lib.c (added)
• platform/a3300/sub/100d/makefile.inc (added)
• platform/a3300/sub/100d/movie_rec.c (added)
• platform/a3300/sub/100d/stubs_asm.h (added)
• platform/a3300/sub/100d/stubs_entry.S (added)
• platform/a3300/sub/100d/stubs_entry_2.S (added)
• platform/a3300/sub/100d/stubs_min.S (added)
• platform/a3300/sub/Makefile (added)
• platform/a3300/wrappers.c (added)

trunk/camera_list.csv

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

trunk/core/gui_draw.h

@@ -700 +700 @@
     #define COLOR_HISTO_RG_PLAY COLOR_YELLOW
 
+#elif CAM_BITMAP_PALETTE==15    // Used by :- A3300IS
+    #define COLOR_TRANS                 0x4C
+    #define COLOR_WHITE         0x01
+    #define COLOR_RED           0x6C
+    #define COLOR_GREY          0x1D
+    #define COLOR_GREEN         0x5A
+    #define COLOR_BLUE_LT       0x58
+    #define COLOR_BLUE          0x6D
+    #define COLOR_YELLOW        0x51
+    #define COLOR_BG            COLOR_TRANS
+    #define COLOR_FG            COLOR_WHITE
+    #define COLOR_SELECTED_BG   COLOR_RED
+    #define COLOR_SELECTED_FG   COLOR_WHITE
+    #define COLOR_ALT_BG        COLOR_TRANS
+    #define COLOR_SPLASH_RED    COLOR_RED
+    #define COLOR_SPLASH_PINK   COLOR_YELLOW
+    #define COLOR_SPLASH_GREY   COLOR_GREY
+    // colors for blended histo
+    #define COLOR_HISTO_R       COLOR_RED
+    #define COLOR_HISTO_R_PLAY  0x9F
+    #define COLOR_HISTO_B       COLOR_BLUE
+    #define COLOR_HISTO_G       COLOR_GREEN
+    #define COLOR_HISTO_G_PLAY  0xA0
+    #define COLOR_HISTO_BG      COLOR_BLUE_LT
+    #define COLOR_HISTO_RG      COLOR_YELLOW
+    #define COLOR_HISTO_RB      0x66
+    #define COLOR_HISTO_RB_PLAY 0x9F
+    #define COLOR_HISTO_B_PLAY  0xA1
+    #define COLOR_HISTO_BG_PLAY 0xA0
+    #define COLOR_HISTO_RG_PLAY 0x9F
+    #undef SCREEN_COLOR
+    #define SCREEN_COLOR        0x4C
+
+    // Icon colors
+    // 3 shades of Red, Green, Yellow and Grey
+    // Separate definitions for record and playback mode
+    // to cater for cameras with variable palettes
+    // Record mode colors
+    #define     COLOR_ICON_REC_RED                      COLOR_RED
+    #define     COLOR_ICON_REC_RED_DK           COLOR_RED
+    #define     COLOR_ICON_REC_RED_LT           COLOR_RED
+    #define     COLOR_ICON_REC_GREEN            0x90
+    #define     COLOR_ICON_REC_GREEN_DK         COLOR_GREEN
+    #define     COLOR_ICON_REC_GREEN_LT         0x50
+    #define     COLOR_ICON_REC_YELLOW           0x6B
+    #define     COLOR_ICON_REC_YELLOW_DK        COLOR_YELLOW
+    #define     COLOR_ICON_REC_YELLOW_LT        0x6B
+    #define     COLOR_ICON_REC_GREY                     COLOR_GREY
+    #define     COLOR_ICON_REC_GREY_DK          COLOR_GREY
+    #define     COLOR_ICON_REC_GREY_LT          0x13
+    // Playback mode colors
+    #define     COLOR_ICON_PLY_RED                      0x9F
+    #define     COLOR_ICON_PLY_RED_DK           0x9F
+    #define     COLOR_ICON_PLY_RED_LT           0x9F
+    #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           0x92
+    #define     COLOR_ICON_PLY_YELLOW_DK        0x92
+    #define     COLOR_ICON_PLY_YELLOW_LT        0x90
+    #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

@@ -107 +107 @@
     defined(CAMERA_ixus980_sd990) || \
     defined(CAMERA_a1100) || \
-    defined(CAMERA_a3000)
+    defined(CAMERA_a3000) || \
+    defined(CAMERA_a3300)
 #define ZSTEP_TABLE_SIZE 8
 static int nTxtbl[]={0,1,2,3,4,5,6,7};

trunk/include/modelist.h

@@ -125 +125 @@
     MODE_SNOW               ,
     MODE_FIREWORK           , // ixus1000 end
+    MODE_LIVE               , // A3300is
+    MODE_DISCREET           , // A3300is
 };