Changeset 512
- Timestamp:
- 12/23/10 12:10:27 (2 years ago)
- Location:
- trunk
- Files:
-
- 41 added
- 6 edited
-
Makefile (modified) (5 diffs)
-
core/gui_draw.h (modified) (1 diff)
-
core/kbd.c (modified) (1 diff)
-
include/camera.h (modified) (1 diff)
-
loader/a495 (added)
-
loader/a495/Makefile (added)
-
loader/a495/blobs.S (added)
-
loader/a495/entry.S (added)
-
loader/a495/main.c (added)
-
loader/a495/resetcode (added)
-
loader/a495/resetcode/Makefile (added)
-
loader/a495/resetcode/entry.S (added)
-
loader/a495/resetcode/main.c (added)
-
makefile.inc (modified) (1 diff)
-
platform/a495 (added)
-
platform/a495/Makefile (added)
-
platform/a495/kbd.c (added)
-
platform/a495/lib.c (added)
-
platform/a495/main.c (added)
-
platform/a495/notes.txt (added)
-
platform/a495/shooting.c (added)
-
platform/a495/sub (added)
-
platform/a495/sub/100d (added)
-
platform/a495/sub/100d/Makefile (added)
-
platform/a495/sub/100d/boot.c (added)
-
platform/a495/sub/100d/capt_seq.c (added)
-
platform/a495/sub/100d/lib.c (added)
-
platform/a495/sub/100d/makefile.inc (added)
-
platform/a495/sub/100d/movie_rec.c (added)
-
platform/a495/sub/100d/stubs_asm.h (added)
-
platform/a495/sub/100d/stubs_entry.S (added)
-
platform/a495/sub/100d/stubs_entry_2.S (added)
-
platform/a495/sub/100d/stubs_min.S (added)
-
platform/a495/sub/100f (added)
-
platform/a495/sub/100f/Makefile (added)
-
platform/a495/sub/100f/boot.c (added)
-
platform/a495/sub/100f/capt_seq.c (added)
-
platform/a495/sub/100f/lib.c (added)
-
platform/a495/sub/100f/makefile.inc (added)
-
platform/a495/sub/100f/movie_rec.c (added)
-
platform/a495/sub/100f/stubs_asm.h (added)
-
platform/a495/sub/100f/stubs_entry.S (added)
-
platform/a495/sub/100f/stubs_entry_2.S (added)
-
platform/a495/sub/100f/stubs_min.S (added)
-
platform/a495/sub/Makefile (added)
-
platform/a495/wrappers.c (added)
-
platform/generic/shooting.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r500 r512 246 246 $(MAKE) -s --no-print-directory PLATFORM=a430 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 247 247 $(MAKE) -s --no-print-directory PLATFORM=ixus900_sd900 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 248 $(MAKE) -s --no-print-directory PLATFORM=a495 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub 249 $(MAKE) -s --no-print-directory PLATFORM=a495 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsub 248 250 @echo "**** All firmwares created successfully" 249 251 @echo "**** Copying duplicate Firmwares" … … 288 290 mv $(topdir)bin/$(VER)-a430-100b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a430-100b-$(BUILD_NUMBER)_BETA.zip 289 291 mv $(topdir)bin/$(VER)-sx120is-100b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx120is-100b-$(BUILD_NUMBER)_BETA.zip 292 mv $(topdir)bin/$(VER)-a495-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a430-100d-$(BUILD_NUMBER)_ALPHA.zip 293 mv $(topdir)bin/$(VER)-a495-100f-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a430-100f-$(BUILD_NUMBER)_ALPHA.zip 290 294 @echo "**** Done Copying duplicate Firmwares" 291 295 @echo "**** Summary of memisosizes" … … 400 404 $(MAKE) -s --no-print-directory PLATFORM=a430 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 401 405 $(MAKE) -s --no-print-directory PLATFORM=ixus900_sd900 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 406 $(MAKE) -s --no-print-directory PLATFORM=a495 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete 407 $(MAKE) -s --no-print-directory PLATFORM=a495 PLATFORMSUB=100f NO_INC_BUILD=1 firzipsubcomplete 402 408 @echo "**** All zipfiles including firmwares and extra stuff created successfully" 403 409 @echo "**** Copying duplicate Firmwares" … … 482 488 mv $(topdir)bin/sx120is-100b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx120is-100b-$(BUILD_NUMBER)-full_BETA.zip 483 489 mv $(topdir)bin/sx120is-100b-$(BUILD_NUMBER).zip $(topdir)bin/sx120is-100b-$(BUILD_NUMBER)_BETA.zip 490 mv $(topdir)bin/a495-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/a495-100d-$(BUILD_NUMBER)-full_ALPHA.zip 491 mv $(topdir)bin/a495-100d-$(BUILD_NUMBER).zip $(topdir)bin/a495-100d-$(BUILD_NUMBER)_ALPHA.zip 492 mv $(topdir)bin/a495-100f-$(BUILD_NUMBER)-full.zip $(topdir)bin/a495-100f-$(BUILD_NUMBER)-full_ALPHA.zip 493 mv $(topdir)bin/a495-100f-$(BUILD_NUMBER).zip $(topdir)bin/a495-100f-$(BUILD_NUMBER)_ALPHA.zip 484 494 @echo "**** Done Copying duplicate Firmwares" 485 495 @echo "**** Summary of memisosizes" … … 592 602 $(MAKE) -s --no-print-directory PLATFORM=a430 PLATFORMSUB=100b NO_INC_BUILD=1 clean 593 603 $(MAKE) -s --no-print-directory PLATFORM=ixus900_sd900 PLATFORMSUB=100c NO_INC_BUILD=1 clean 604 $(MAKE) -s --no-print-directory PLATFORM=a495 PLATFORMSUB=100d NO_INC_BUILD=1 clean 605 $(MAKE) -s --no-print-directory PLATFORM=a495 PLATFORMSUB=100f NO_INC_BUILD=1 clean 594 606 .PHONY: fir upload -
trunk/core/gui_draw.h
r331 r512 188 188 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT 189 189 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW 190 #elif CAM_BITMAP_PALETTE==7 // a495 191 #define COLOR_TRANSPARENT 0x00 192 #define COLOR_WHITE 0x11 193 #define COLOR_RED 0x2F 194 #define COLOR_GREY 0x1F 195 #define COLOR_GREEN 0xFC 196 #define COLOR_BLUE_LT 0xEE 197 #define COLOR_BLUE 0xEF 198 #define COLOR_YELLOW 0xDD 199 #define COLOR_BLACK 0xFF 200 #define COLOR_BG 0x0F 201 #define COLOR_FG COLOR_WHITE 202 #define COLOR_SELECTED_BG COLOR_RED 203 #define COLOR_SELECTED_FG COLOR_WHITE 204 #define COLOR_ALT_BG 0x20 205 #define COLOR_SPLASH_RED 0x22 206 #define COLOR_SPLASH_PINK 0x24 207 #define COLOR_SPLASH_GREY 0x1F 208 // colors for blended histo 209 #define COLOR_HISTO_R COLOR_RED 210 #define COLOR_HISTO_R_PLAY COLOR_RED 211 #define COLOR_HISTO_B COLOR_BLUE 212 #define COLOR_HISTO_G COLOR_GREEN 213 #define COLOR_HISTO_G_PLAY COLOR_GREEN 214 #define COLOR_HISTO_BG COLOR_BLUE_LT 215 #define COLOR_HISTO_RG COLOR_YELLOW 216 #define COLOR_HISTO_RB 0x66 217 #define COLOR_HISTO_RB_PLAY 0xE2 218 #define COLOR_HISTO_B_PLAY 0xCC 219 #define COLOR_HISTO_BG_PLAY 0x99 220 #define COLOR_HISTO_RG_PLAY 0x66 190 221 #else 191 222 #error CAM_BITMAP_PALETTE not defined -
trunk/core/kbd.c
r497 r512 53 53 #endif 54 54 55 #if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900)|| defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780)|| defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) 55 #if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900)|| defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780)|| defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) || defined(CAMERA_a495) 56 56 #define ZSTEP_TABLE_SIZE 7 57 57 static int nTxtbl[]={0,1,2,3,4,5,6}; -
trunk/include/camera.h
r499 r512 321 321 #define CAM_BLACK_LEVEL 127 322 322 #define CAM_CHDK_PTP 1 // include CHDK PTP 323 //---------------------------------------------------------- 324 325 #elif defined (CAMERA_a495) 326 #define CAM_PROPSET 3 327 #define CAM_DRYOS 1 328 #define CAM_DRYOS_2_3_R39 1 329 330 #define CAM_RAW_ROWPIX 3720 331 #define CAM_RAW_ROWS 2772 332 333 #undef CAM_USE_ZOOM_FOR_MF 334 #undef CAM_HAS_ERASE_BUTTON 335 #undef CAM_HAS_IRIS_DIAPHRAGM 336 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 337 #define CAM_HAS_ND_FILTER 1 338 #undef CAM_HAS_MANUAL_FOCUS 339 #undef CAM_HAS_USER_TV_MODES 340 #undef CAM_HAS_IS 341 #define CAM_MULTIPART 1 342 #undef CAM_VIDEO_CONTROL 343 #define CAM_REAR_CURTAIN 1 344 #undef DEFAULT_RAW_EXT 345 #define DEFAULT_RAW_EXT 2 // use .CR2 346 #define CAM_EXT_TV_RANGE 1 347 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 348 #define CAM_CAN_MUTE_MICROPHONE 1 349 #define CAM_EV_IN_VIDEO 1 350 351 #undef CAM_BITMAP_PALETTE 352 #define CAM_BITMAP_PALETTE 7 353 354 #define DNG_SUPPORT 1 355 // pattern 356 #define cam_CFAPattern 0x02010100 // Red Green Green Blue 357 // color 358 359 #define CAM_COLORMATRIX1 \ 360 827547, 1000000, -290458, 1000000, -126086, 1000000, \ 361 -12829, 1000000, 530507, 1000000, 50537, 1000000, \ 362 5181, 1000000, 48183, 1000000, 245014, 1000000 363 364 #define cam_CalibrationIlluminant1 1 // Daylight 365 // cropping 366 #define CAM_JPEG_WIDTH 3648 367 #define CAM_JPEG_HEIGHT 2736 368 #define CAM_ACTIVE_AREA_X1 6 369 #define CAM_ACTIVE_AREA_Y1 12 370 #define CAM_ACTIVE_AREA_X2 3690 371 #define CAM_ACTIVE_AREA_Y2 2772 372 373 // camera name 374 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData to get camera name 375 #undef CAM_SENSOR_BITS_PER_PIXEL 376 #undef CAM_WHITE_LEVEL 377 #undef CAM_BLACK_LEVEL 378 #define CAM_SENSOR_BITS_PER_PIXEL 12 379 #define CAM_WHITE_LEVEL ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 380 #define CAM_BLACK_LEVEL 127 323 381 //---------------------------------------------------------- 324 382 -
trunk/makefile.inc
r495 r512 277 277 #PLATFORM=ixus900_sd900 278 278 #PLATFORMSUB=100c 279 280 #PLATFORM=a495 281 #PLATFORMSUB=100d 282 283 #PLATFORM=a495 284 #PLATFORMSUB=100f 279 285 280 286 MEMISOSIZE="(&_end-&_start)" -
trunk/platform/generic/shooting.c
r490 r512 805 805 defined (CAMERA_ixus100_sd780) || \ 806 806 defined (CAMERA_a480) || \ 807 defined (CAMERA_a495) || \ 807 808 defined (CAMERA_s90) || \ 808 809 defined (CAMERA_sx20) || \
Note: See TracChangeset
for help on using the changeset viewer.
