Changeset 1556
- Timestamp:
- 01/15/12 00:43:11 (17 months ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
CHDK/LANG/german.lng (modified) (1 diff)
-
core/gui_draw.h (modified) (1 diff)
-
platform/a720/platform_camera.h (modified) (2 diffs)
-
platform/sx220hs/platform_camera.h (modified) (2 diffs)
-
platform/sx230hs/platform_camera.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CHDK/LANG/german.lng
r1317 r1556 579 579 459 "badpixel.bin erstellen" 580 580 460 "REC-Modus erforderlich." 581 461 "%s ist nicht verfügbar!" 582 583 462 "Touchscreen-Overrides" 584 463 "Video-AE-Kontrolle" 585 464 "<Alt>-Shortcut-Tasten" 586 587 465 "USB-Info" 588 466 "USB-Info-Anzeige" 589 590 467 "ROM-Crash-Log speichern" 591 468 "FEHLER: SystemEventInit und System.Create gescheitert" 592 469 "ROM-Crash-Log konnte nicht gespeichert werden." 593 470 "ROM-Crash-Log in A/ROMLOG.LOG gespeichert." -
trunk/core/gui_draw.h
r1552 r1556 510 510 #define COLOR_BLUE 0xa1 511 511 #define COLOR_YELLOW 0x92 512 #define COLOR_BG 0x 62512 #define COLOR_BG 0x4B 513 513 #define COLOR_FG COLOR_WHITE 514 514 #define COLOR_SELECTED_BG 0x0e -
trunk/platform/a720/platform_camera.h
r1555 r1556 21 21 // don't override them again in here. 22 22 23 #define CAM_PROPSET 224 #define CAM_DRYOS 123 #define CAM_PROPSET 2 24 #define CAM_DRYOS 1 25 25 26 #define CAM_RAW_ROWPIX 3336 // for new 8 MP27 #define CAM_RAW_ROWS 2480 // for new 8 MP26 #define CAM_RAW_ROWPIX 3336 // for new 8 MP 27 #define CAM_RAW_ROWS 2480 // for new 8 MP 28 28 29 #define CAM_MULTIPART 130 #define CAM_ADJUSTABLE_ALT_BUTTON 131 #define CAM_CAN_MUTE_MICROPHONE 129 #define CAM_MULTIPART 1 30 #define CAM_ADJUSTABLE_ALT_BUTTON 1 31 #define CAM_CAN_MUTE_MICROPHONE 1 32 32 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 33 #define CAM_EV_IN_VIDEO 133 #define CAM_EV_IN_VIDEO 1 34 34 #undef CAM_VIDEO_CONTROL 35 // disabled for now, see http://chdk.setepontos.com/index.php?topic=6182.0 36 // #define CAM_EXT_TV_RANGE 135 36 // #define CAM_EXT_TV_RANGE 1 // disabled for now, see http://chdk.setepontos.com/index.php?topic=6182.0 37 37 38 38 #define CAM_DNG_LENS_INFO { 58,10, 348,10, 28,10, 48,10 } // See comments in camera.h 39 39 // pattern 40 #define cam_CFAPattern 0x01000201// Green Blue Red Green40 #define cam_CFAPattern 0x01000201 // Green Blue Red Green 41 41 // color 42 42 #define CAM_COLORMATRIX1 \ … … 45 45 17965, 1000000, 78396, 1000000, 231868, 1000000 46 46 47 #define cam_CalibrationIlluminant1 1// Daylight47 #define cam_CalibrationIlluminant1 1 // Daylight 48 48 // cropping 49 #define CAM_JPEG_WIDTH 326450 #define CAM_JPEG_HEIGHT 244851 #define CAM_ACTIVE_AREA_X1 1052 #define CAM_ACTIVE_AREA_Y1 853 #define CAM_ACTIVE_AREA_X2 330254 #define CAM_ACTIVE_AREA_Y2 247449 #define CAM_JPEG_WIDTH 3264 50 #define CAM_JPEG_HEIGHT 2448 51 #define CAM_ACTIVE_AREA_X1 10 52 #define CAM_ACTIVE_AREA_Y1 8 53 #define CAM_ACTIVE_AREA_X2 3302 54 #define CAM_ACTIVE_AREA_Y2 2474 55 55 // camera name 56 #define PARAM_CAMERA_NAME 4// parameter number for GetParameterData56 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 57 57 58 #define DNG_EXT_FROM ".CR2" 59 #define CAM_CHDK_PTP 1 // include CHDK PTP support 58 #define DNG_EXT_FROM ".CR2" 59 60 #define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons. 60 61 61 62 #define REMOTE_SYNC_STATUS_LED 0xc02200C4 // specifies an LED that turns on while camera waits for USB remote to sync -
trunk/platform/sx220hs/platform_camera.h
r1555 r1556 20 20 // for information on each setting. If the default values are correct for your camera then 21 21 // don't override them again in here. 22 23 #define CAM_DRYOS_2_3_R47 124 #define CAM_DETECT_SCREEN_ERASE 125 #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 126 #define DNG_VERT_RLE_BADPIXELS 127 #define CAM_AV_OVERRIDE_IRIS_FIX 1 // for cameras that require _MoveIrisWithAv function to override Av.28 #define CAM_KEY_CLICK_DELAY 15029 #define CAM_ADJUSTABLE_ALT_BUTTON 130 #define CAM_DRIVE_MODE_FROM_TIMER_MODE 131 22 32 #define CAM_DRYOS_2_3_R39 1 33 #define CAM_PROPSET 4 34 #define CAM_DATE_FOLDER_NAMING 1 35 #define CAM_DRYOS 1 36 #define CAM_RAW_ROWPIX 4168 37 #define CAM_RAW_ROWS 3060 // actual size from fw 12754080pix at FF375484 -> 19131120/12*8 38 #define CAM_HAS_ND_FILTER 1 23 #define CAM_DRYOS_2_3_R47 1 24 #define CAM_DETECT_SCREEN_ERASE 1 25 #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 26 #define DNG_VERT_RLE_BADPIXELS 1 27 #define CAM_AV_OVERRIDE_IRIS_FIX 1 // for cameras that require _MoveIrisWithAv function to override Av. 28 #define CAM_KEY_CLICK_DELAY 150 29 #define CAM_ADJUSTABLE_ALT_BUTTON 1 30 #define CAM_DRIVE_MODE_FROM_TIMER_MODE 1 31 32 #define CAM_DRYOS_2_3_R39 1 33 #define CAM_PROPSET 4 34 #define CAM_DATE_FOLDER_NAMING 1 35 #define CAM_DRYOS 1 36 #define CAM_RAW_ROWPIX 4168 37 #define CAM_RAW_ROWS 3060 // actual size from fw 12754080pix at FF375484 -> 19131120/12*8 38 #define CAM_HAS_ND_FILTER 1 39 39 #undef CAM_CAN_SD_OVER_NOT_IN_MF 40 40 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 41 #define CAM_HAS_VIDEO_BUTTON 41 #define CAM_HAS_VIDEO_BUTTON 1 42 42 #define CAM_VIDEO_QUALITY_ONLY 1 43 43 #undef CAM_VIDEO_CONTROL 44 #define CAM_HAS_JOGDIAL 144 #define CAM_HAS_JOGDIAL 1 45 45 #undef CAM_USE_ZOOM_FOR_MF 46 #undef CAM_UNCACHED_BIT // shut up compiler47 #define CAM_UNCACHED_BIT 0x4000000046 #undef CAM_UNCACHED_BIT // shut up compiler 47 #define CAM_UNCACHED_BIT 0x40000000 48 48 49 49 #define CAM_DNG_LENS_INFO { 50,10, 700,10, 31,10, 59,10 } // See comments in camera.h 50 #define cam_CFAPattern 0x0201010050 #define cam_CFAPattern 0x02010100 51 51 52 #define CAM_COLORMATRIX1\53 54 -75055, 1000000, 440444, 1000000,11367, 1000000, \55 -5801, 1000000,71589, 1000000, 118914, 100000052 #define CAM_COLORMATRIX1 \ 53 544808, 1000000, -174047, 1000000, -80399, 1000000, \ 54 -75055, 1000000, 440444, 1000000, 11367, 1000000, \ 55 -5801, 1000000, 71589, 1000000, 118914, 1000000 56 56 57 57 #define cam_CalibrationIlluminant1 1 58 58 59 #define CAM_JPEG_WIDTH 400060 #define CAM_JPEG_HEIGHT 300061 #define CAM_ACTIVE_AREA_X1 62 #define CAM_ACTIVE_AREA_Y12463 #define CAM_ACTIVE_AREA_X2416864 #define CAM_ACTIVE_AREA_Y2306065 #define PARAM_CAMERA_NAME 4// parameter number for GetParameterData59 #define CAM_JPEG_WIDTH 4000 60 #define CAM_JPEG_HEIGHT 3000 61 #define CAM_ACTIVE_AREA_X1 96 62 #define CAM_ACTIVE_AREA_Y1 24 63 #define CAM_ACTIVE_AREA_X2 4168 64 #define CAM_ACTIVE_AREA_Y2 3060 65 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 66 66 #undef CAM_SENSOR_BITS_PER_PIXEL 67 #define CAM_SENSOR_BITS_PER_PIXEL 1268 #define CAM_EXT_TV_RANGE 169 #undef CAM_BITMAP_PALETTE70 #define CAM_BITMAP_PALETTE 71 #undef CAM_HAS_ERASE_BUTTON72 #define CAM_SHOW_OSD_IN_SHOOT_MENU167 #define CAM_SENSOR_BITS_PER_PIXEL 12 68 #define CAM_EXT_TV_RANGE 1 69 #undef CAM_BITMAP_PALETTE 70 #define CAM_BITMAP_PALETTE 9 71 #undef CAM_HAS_ERASE_BUTTON 72 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 73 73 74 #define CAM_HAS_VARIABLE_ASPECT 175 #undef CAM_USES_ASPECT_CORRECTION76 #define CAM_USES_ASPECT_CORRECTION 1 //camera uses the modified graphics primitives to map screens an viewports to buffers more sized74 #define CAM_HAS_VARIABLE_ASPECT 1 75 #undef CAM_USES_ASPECT_CORRECTION 76 #define CAM_USES_ASPECT_CORRECTION 1 //camera uses the modified graphics primitives to map screens an viewports to buffers more sized 77 77 #undef CAM_SCREEN_WIDTH 78 78 #undef CAM_BITMAP_WIDTH … … 82 82 #define CAM_BITMAP_HEIGHT 270 // Actual height of bitmap screen in rows 83 83 84 #undef EDGE_HMARGIN85 #define EDGE_HMARGIN 1084 #undef EDGE_HMARGIN 85 #define EDGE_HMARGIN 10 86 86 87 #undef ZEBRA_HMARGIN088 #define ZEBRA_HMARGIN0 3087 #undef ZEBRA_HMARGIN0 88 #define ZEBRA_HMARGIN0 30 89 89 90 #define CAM_ZEBRA_ASPECT_ADJUST 191 #define CAM_ZEBRA_NOBUF 190 #define CAM_ZEBRA_ASPECT_ADJUST 1 91 #define CAM_ZEBRA_NOBUF 1 92 92 93 #define CAM_QUALITY_OVERRIDE 1 94 95 #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 93 //#define CAM_QUALITY_OVERRIDE 1 // this feature doesn't work really, it produce not useable pictures. There is a EXMEM problem. 94 95 #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 96 97 #define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons. 96 98 97 99 #define REMOTE_SYNC_STATUS_LED 0xC0220130 // specifies an LED that turns on while camera waits for USB remote to sync -
trunk/platform/sx230hs/platform_camera.h
r1555 r1556 21 21 // don't override them again in here. 22 22 23 #define OPT_GPS123 #define OPT_GPS 1 24 24 25 #define CAM_DRYOS_2_3_R47 1 26 #define CAM_DETECT_SCREEN_ERASE 1 27 #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 28 #define DNG_VERT_RLE_BADPIXELS 1 29 #define CAM_AV_OVERRIDE_IRIS_FIX 1 30 #define CAM_KEY_CLICK_DELAY 150 31 #define CAM_ADJUSTABLE_ALT_BUTTON 1 32 #define CAM_DRIVE_MODE_FROM_TIMER_MODE 1 25 33 26 #define CAM_DRYOS_2_3_R47 1 27 #define CAM_DETECT_SCREEN_ERASE 1 28 #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1 29 #define DNG_VERT_RLE_BADPIXELS 1 30 #define CAM_AV_OVERRIDE_IRIS_FIX 1 31 #define CAM_KEY_CLICK_DELAY 150 32 #define CAM_ADJUSTABLE_ALT_BUTTON 1 33 #define CAM_DRIVE_MODE_FROM_TIMER_MODE 1 34 #define CAM_DRYOS_2_3_R39 1 35 #define CAM_PROPSET 4 36 #define CAM_DATE_FOLDER_NAMING 1 37 #define CAM_DRYOS 1 38 #define CAM_RAW_ROWPIX 4168 // Found @0xff1565dc 39 #define CAM_RAW_ROWS 3060 // Found @0xff1565e0 34 40 35 #define CAM_DRYOS_2_3_R39 1 36 #define CAM_PROPSET 4 37 #define CAM_DATE_FOLDER_NAMING 1 38 #define CAM_DRYOS 1 39 #define CAM_RAW_ROWPIX 4168 // Found @0xff1565dc 40 #define CAM_RAW_ROWS 3060 // Found @0xff1565e0 41 #define CAM_HAS_CMOS 1 42 #define CAM_HAS_ND_FILTER 1 41 43 42 #define CAM_HAS_CMOS 1 43 #define CAM_HAS_ND_FILTER 1 44 #undef CAM_CAN_SD_OVER_NOT_IN_MF 45 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 46 #define CAM_HAS_VIDEO_BUTTON 1 47 #define CAM_VIDEO_QUALITY_ONLY 1 44 48 45 #undef CAM_CAN_SD_OVER_NOT_IN_MF 46 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 47 #define CAM_HAS_VIDEO_BUTTON 1 48 #define CAM_VIDEO_QUALITY_ONLY 1 49 #undef CAM_VIDEO_CONTROL 49 50 50 #undef CAM_VIDEO_CONTROL 51 52 #define CAM_HAS_JOGDIAL 1 51 #define CAM_HAS_JOGDIAL 1 53 52 #undef CAM_USE_ZOOM_FOR_MF 54 #undef CAM_UNCACHED_BIT 55 #define CAM_UNCACHED_BIT 0x40000000 // Found @0xff02bcc053 #undef CAM_UNCACHED_BIT 54 #define CAM_UNCACHED_BIT 0x40000000 // Found @0xff02bcc0 56 55 57 56 #define CAM_DNG_LENS_INFO { 50,10, 700,10, 31,10, 59,10 } // See comments in camera.h 58 #define cam_CFAPattern 0x02010100 //Green Blue Red Green 59 60 #define CAM_COLORMATRIX1 \ 61 544808, 1000000, -174047, 1000000, -80399, 1000000, \ 62 -75055, 1000000, 440444, 1000000, 11367, 1000000, \ 63 -5801, 1000000, 71589, 1000000, 118914, 1000000 64 65 #define cam_CalibrationIlluminant1 1 66 67 #define CAM_JPEG_WIDTH 4000 68 #define CAM_JPEG_HEIGHT 3000 69 70 #define CAM_ACTIVE_AREA_X1 96 71 #define CAM_ACTIVE_AREA_Y1 24 72 #define CAM_ACTIVE_AREA_X2 4168 73 #define CAM_ACTIVE_AREA_Y2 3060 57 #define cam_CFAPattern 0x02010100 //Green Blue Red Green 74 58 75 #define PARAM_CAMERA_NAME 4 76 #undef CAM_SENSOR_BITS_PER_PIXEL 77 #define CAM_SENSOR_BITS_PER_PIXEL 12 59 #define CAM_COLORMATRIX1 \ 60 544808, 1000000, -174047, 1000000, -80399, 1000000, \ 61 -75055, 1000000, 440444, 1000000, 11367, 1000000, \ 62 -5801, 1000000, 71589, 1000000, 118914, 1000000 78 63 79 #define CAM_EXT_TV_RANGE 1 80 64 #define cam_CalibrationIlluminant1 1 65 66 #define CAM_JPEG_WIDTH 4000 67 #define CAM_JPEG_HEIGHT 3000 68 69 #define CAM_ACTIVE_AREA_X1 96 70 #define CAM_ACTIVE_AREA_Y1 24 71 #define CAM_ACTIVE_AREA_X2 4168 72 #define CAM_ACTIVE_AREA_Y2 3060 73 74 #define PARAM_CAMERA_NAME 4 75 #undef CAM_SENSOR_BITS_PER_PIXEL 76 #define CAM_SENSOR_BITS_PER_PIXEL 12 77 78 #define CAM_EXT_TV_RANGE 1 79 81 80 #undef CAM_BITMAP_PALETTE 82 #define CAM_BITMAP_PALETTE 83 #undef CAM_HAS_ERASE_BUTTON84 #define CAM_SHOW_OSD_IN_SHOOT_MENU185 86 #define CAM_HAS_VARIABLE_ASPECT187 #undef CAM_USES_ASPECT_CORRECTION88 #define CAM_USES_ASPECT_CORRECTION 181 #define CAM_BITMAP_PALETTE 9 82 #undef CAM_HAS_ERASE_BUTTON 83 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 84 85 #define CAM_HAS_VARIABLE_ASPECT 1 86 #undef CAM_USES_ASPECT_CORRECTION 87 #define CAM_USES_ASPECT_CORRECTION 1 89 88 #undef CAM_SCREEN_WIDTH 90 89 #undef CAM_BITMAP_WIDTH … … 94 93 #define CAM_BITMAP_HEIGHT 270 // Actual height of bitmap screen in rows 95 94 96 #undefEDGE_HMARGIN97 #define EDGE_HMARGIN 1095 #undef EDGE_HMARGIN 96 #define EDGE_HMARGIN 10 98 97 99 98 #undef ZEBRA_HMARGIN0 100 #define ZEBRA_HMARGIN0 3099 #define ZEBRA_HMARGIN0 30 101 100 102 #define CAM_ZEBRA_ASPECT_ADJUST 1103 #define CAM_ZEBRA_NOBUF 1101 #define CAM_ZEBRA_ASPECT_ADJUST 1 102 #define CAM_ZEBRA_NOBUF 1 104 103 105 #define CAM_QUALITY_OVERRIDE1106 104 #define CAM_QUALITY_OVERRIDE 1 105 #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 107 106 108 109 #undef CAM_CHDK_PTP 110 #define CAM_CHDK_PTP 1 //SX220 added 107 #define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons. 111 108 112 109 #define REMOTE_SYNC_STATUS_LED 0xC0220130 // specifies an LED that turns on while camera waits for USB remote to sync 113 114 //TODO #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 0115 //TODO #define CAM_MULTIPART 1116 //TODO #define CAM_BRACKETING 1117 118 //TODO REMOVE #define CAM_DRIVE_MODE_FROM_TIMER_MODE
Note: See TracChangeset
for help on using the changeset viewer.
