Index: /branches/release-1_0/platform/sx230hs/platform_camera.h =================================================================== --- /branches/release-1_0/platform/sx230hs/platform_camera.h (revision 1539) +++ /branches/release-1_0/platform/sx230hs/platform_camera.h (revision 1540) @@ -21,91 +21,81 @@ // don't override them again in here. - #define OPT_GPS 1 + #define OPT_GPS 1 + #define CAM_DRYOS_2_3_R47 1 + #define CAM_DETECT_SCREEN_ERASE 1 + #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 + #define DNG_VERT_RLE_BADPIXELS 1 + #define CAM_AV_OVERRIDE_IRIS_FIX 1 + #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_R47 1 - #define CAM_DETECT_SCREEN_ERASE 1 - #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 - #define DNG_VERT_RLE_BADPIXELS 1 - #define CAM_AV_OVERRIDE_IRIS_FIX 1 - #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 + #define CAM_PROPSET 4 + #define CAM_DATE_FOLDER_NAMING 1 + #define CAM_DRYOS 1 + #define CAM_RAW_ROWPIX 4168 // Found @0xff1565dc + #define CAM_RAW_ROWS 3060 // Found @0xff1565e0 - #define CAM_DRYOS_2_3_R39 1 - #define CAM_PROPSET 4 - #define CAM_DATE_FOLDER_NAMING 1 - #define CAM_DRYOS 1 - #define CAM_RAW_ROWPIX 4168 // Found @0xff1565dc - #define CAM_RAW_ROWS 3060 // Found @0xff1565e0 + #define CAM_HAS_CMOS 1 + #define CAM_HAS_ND_FILTER 1 - #define CAM_HAS_CMOS 1 - #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_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 - #undef CAM_VIDEO_CONTROL - - #define CAM_HAS_JOGDIAL 1 + #define CAM_HAS_JOGDIAL 1 #undef CAM_USE_ZOOM_FOR_MF - #undef CAM_UNCACHED_BIT - #define CAM_UNCACHED_BIT 0x40000000 // Found @0xff02bcc0 + #undef CAM_UNCACHED_BIT + #define CAM_UNCACHED_BIT 0x40000000 // Found @0xff02bcc0 #define CAM_DNG_LENS_INFO { 50,10, 700,10, 31,10, 59,10 } // See comments in camera.h - #define cam_CFAPattern 0x02010100 //Green Blue Red Green - - #define CAM_COLORMATRIX1 \ - 544808, 1000000, -174047, 1000000, -80399, 1000000, \ - -75055, 1000000, 440444, 1000000, 11367, 1000000, \ - -5801, 1000000, 71589, 1000000, 118914, 1000000 - - #define cam_CalibrationIlluminant1 1 - - #define CAM_JPEG_WIDTH 4000 - #define CAM_JPEG_HEIGHT 3000 - - #define CAM_ACTIVE_AREA_X1 96 - #define CAM_ACTIVE_AREA_Y1 24 - #define CAM_ACTIVE_AREA_X2 4168 - #define CAM_ACTIVE_AREA_Y2 3060 + #define cam_CFAPattern 0x02010100 //Green Blue Red Green - #define PARAM_CAMERA_NAME 4 - #undef CAM_SENSOR_BITS_PER_PIXEL - #define CAM_SENSOR_BITS_PER_PIXEL 12 + #define CAM_COLORMATRIX1 \ + 544808, 1000000, -174047, 1000000, -80399, 1000000, \ + -75055, 1000000, 440444, 1000000, 11367, 1000000, \ + -5801, 1000000, 71589, 1000000, 118914, 1000000 - #define CAM_EXT_TV_RANGE 1 - + #define cam_CalibrationIlluminant1 1 + + #define CAM_JPEG_WIDTH 4000 + #define CAM_JPEG_HEIGHT 3000 + + #define CAM_ACTIVE_AREA_X1 96 + #define CAM_ACTIVE_AREA_Y1 24 + #define CAM_ACTIVE_AREA_X2 4168 + #define CAM_ACTIVE_AREA_Y2 3060 + + #define PARAM_CAMERA_NAME 4 + #undef CAM_SENSOR_BITS_PER_PIXEL + #define CAM_SENSOR_BITS_PER_PIXEL 12 + + #define CAM_EXT_TV_RANGE 1 + #undef CAM_BITMAP_PALETTE - #define CAM_BITMAP_PALETTE 9 - #undef CAM_HAS_ERASE_BUTTON - #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 - - #define CAM_HAS_VARIABLE_ASPECT 1 - #undef CAM_USES_ASPECT_CORRECTION - #define CAM_USES_ASPECT_CORRECTION 1 + #define CAM_BITMAP_PALETTE 9 + #undef CAM_HAS_ERASE_BUTTON + #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 - #undef EDGE_HMARGIN - #define EDGE_HMARGIN 10 + #define CAM_HAS_VARIABLE_ASPECT 1 + #undef CAM_USES_ASPECT_CORRECTION + #define CAM_USES_ASPECT_CORRECTION 1 + + #undef EDGE_HMARGIN + #define EDGE_HMARGIN 10 #undef ZEBRA_HMARGIN0 - #define ZEBRA_HMARGIN0 30 + #define ZEBRA_HMARGIN0 30 - #define CAM_ZEBRA_ASPECT_ADJUST 1 - #define CAM_ZEBRA_NOBUF 1 + #define CAM_ZEBRA_ASPECT_ADJUST 1 + #define CAM_ZEBRA_NOBUF 1 - #define CAM_QUALITY_OVERRIDE 1 - #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 + #define CAM_QUALITY_OVERRIDE 1 + #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 - - #undef CAM_CHDK_PTP - #define CAM_CHDK_PTP 1 //SX220 added - - -//TODO #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 0 -//TODO #define CAM_MULTIPART 1 -//TODO #define CAM_BRACKETING 1 - -//TODO REMOVE #define CAM_DRIVE_MODE_FROM_TIMER_MODE + #define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons. Index: /branches/release-1_0/platform/sx220hs/platform_camera.h =================================================================== --- /branches/release-1_0/platform/sx220hs/platform_camera.h (revision 1539) +++ /branches/release-1_0/platform/sx220hs/platform_camera.h (revision 1540) @@ -20,72 +20,73 @@ // for information on each setting. If the default values are correct for your camera then // don't override them again in here. - - #define CAM_DRYOS_2_3_R47 1 - #define CAM_DETECT_SCREEN_ERASE 1 - #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 - #define DNG_VERT_RLE_BADPIXELS 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 - #define CAM_PROPSET 4 - #define CAM_DATE_FOLDER_NAMING 1 - #define CAM_DRYOS 1 - #define CAM_RAW_ROWPIX 4168 - #define CAM_RAW_ROWS 3060 // actual size from fw 12754080pix at FF375484 -> 19131120/12*8 - #define CAM_HAS_ND_FILTER 1 + #define CAM_DRYOS_2_3_R47 1 + #define CAM_DETECT_SCREEN_ERASE 1 + #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 + #define DNG_VERT_RLE_BADPIXELS 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 + #define CAM_PROPSET 4 + #define CAM_DATE_FOLDER_NAMING 1 + #define CAM_DRYOS 1 + #define CAM_RAW_ROWPIX 4168 + #define CAM_RAW_ROWS 3060 // actual size from fw 12754080pix at FF375484 -> 19131120/12*8 + #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_HAS_VIDEO_BUTTON 1 #define CAM_VIDEO_QUALITY_ONLY 1 #undef CAM_VIDEO_CONTROL - #define CAM_HAS_JOGDIAL 1 + #define CAM_HAS_JOGDIAL 1 #undef CAM_USE_ZOOM_FOR_MF - #undef CAM_UNCACHED_BIT // shut up compiler - #define CAM_UNCACHED_BIT 0x40000000 + #undef CAM_UNCACHED_BIT // shut up compiler + #define CAM_UNCACHED_BIT 0x40000000 #define CAM_DNG_LENS_INFO { 50,10, 700,10, 31,10, 59,10 } // See comments in camera.h - #define cam_CFAPattern 0x02010100 + #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_COLORMATRIX1 \ + 544808, 1000000, -174047, 1000000, -80399, 1000000, \ + -75055, 1000000, 440444, 1000000, 11367, 1000000, \ + -5801, 1000000, 71589, 1000000, 118914, 1000000 - #define cam_CalibrationIlluminant1 1 + #define cam_CalibrationIlluminant1 1 - #define CAM_JPEG_WIDTH 4000 - #define CAM_JPEG_HEIGHT 3000 - #define CAM_ACTIVE_AREA_X1 96 - #define CAM_ACTIVE_AREA_Y1 24 - #define CAM_ACTIVE_AREA_X2 4168 - #define CAM_ACTIVE_AREA_Y2 3060 - #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData + #define CAM_JPEG_WIDTH 4000 + #define CAM_JPEG_HEIGHT 3000 + #define CAM_ACTIVE_AREA_X1 96 + #define CAM_ACTIVE_AREA_Y1 24 + #define CAM_ACTIVE_AREA_X2 4168 + #define CAM_ACTIVE_AREA_Y2 3060 + #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData #undef CAM_SENSOR_BITS_PER_PIXEL - #define CAM_SENSOR_BITS_PER_PIXEL 12 - #define CAM_EXT_TV_RANGE 1 - #undef CAM_BITMAP_PALETTE - #define CAM_BITMAP_PALETTE 9 - #undef CAM_HAS_ERASE_BUTTON - #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 + #define CAM_SENSOR_BITS_PER_PIXEL 12 + #define CAM_EXT_TV_RANGE 1 + #undef CAM_BITMAP_PALETTE + #define CAM_BITMAP_PALETTE 9 + #undef CAM_HAS_ERASE_BUTTON + #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 - #define CAM_HAS_VARIABLE_ASPECT 1 - #undef CAM_USES_ASPECT_CORRECTION - #define CAM_USES_ASPECT_CORRECTION 1 //camera uses the modified graphics primitives to map screens an viewports to buffers more sized + #define CAM_HAS_VARIABLE_ASPECT 1 + #undef CAM_USES_ASPECT_CORRECTION + #define CAM_USES_ASPECT_CORRECTION 1 //camera uses the modified graphics primitives to map screens an viewports to buffers more sized - #undef EDGE_HMARGIN - #define EDGE_HMARGIN 10 + #undef EDGE_HMARGIN + #define EDGE_HMARGIN 10 - #undef ZEBRA_HMARGIN0 - #define ZEBRA_HMARGIN0 30 + #undef ZEBRA_HMARGIN0 + #define ZEBRA_HMARGIN0 30 - #define CAM_ZEBRA_ASPECT_ADJUST 1 - #define CAM_ZEBRA_NOBUF 1 + #define CAM_ZEBRA_ASPECT_ADJUST 1 + #define CAM_ZEBRA_NOBUF 1 - #define CAM_QUALITY_OVERRIDE 1 - - #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 - + #define CAM_QUALITY_OVERRIDE 1 + + #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 + + #define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons. //---------------------------------------------------------- Index: /branches/release-1_0/core/gui_draw.h =================================================================== --- /branches/release-1_0/core/gui_draw.h (revision 1539) +++ /branches/release-1_0/core/gui_draw.h (revision 1540) @@ -507,5 +507,5 @@ #define COLOR_BLUE 0xa1 #define COLOR_YELLOW 0x92 -#define COLOR_BG 0x62 +#define COLOR_BG 0x4B #define COLOR_FG COLOR_WHITE #define COLOR_SELECTED_BG 0x0e Index: /branches/release-1_0/CHDK/LANG/german.lng =================================================================== --- /branches/release-1_0/CHDK/LANG/german.lng (revision 1539) +++ /branches/release-1_0/CHDK/LANG/german.lng (revision 1540) @@ -579,2 +579,15 @@ 459 "badpixel.bin erstellen" 460 "REC-Modus erforderlich." +461 "%s ist nicht verfügbar!" + +462 "Touchscreen-Overrides" +463 "Video-AE-Kontrolle" +464 "-Shortcut-Tasten" + +465 "USB-Info" +466 "USB-Info-Anzeige" + +467 "ROM-Crash-Log speichern" +468 "FEHLER: SystemEventInit und System.Create gescheitert" +469 "ROM-Crash-Log konnte nicht gespeichert werden." +470 "ROM-Crash-Log in A/ROMLOG.LOG gespeichert."