- Timestamp:
- 04/05/11 04:50:36 (2 years ago)
- Location:
- trunk
- Files:
-
- 31 added
- 6 edited
-
Makefile (modified) (3 diffs)
-
core/gui_menu.c (modified) (1 diff)
-
core/kbd.c (modified) (1 diff)
-
include/camera.h (modified) (1 diff)
-
loader/sx130is (added)
-
loader/sx130is/Makefile (added)
-
loader/sx130is/blobs.S (added)
-
loader/sx130is/entry.S (added)
-
loader/sx130is/main.c (added)
-
loader/sx130is/resetcode (added)
-
loader/sx130is/resetcode/Makefile (added)
-
loader/sx130is/resetcode/entry.S (added)
-
loader/sx130is/resetcode/main.c (added)
-
makefile.inc (modified) (1 diff)
-
platform/generic/shooting.c (modified) (1 diff)
-
platform/sx130is (added)
-
platform/sx130is/Makefile (added)
-
platform/sx130is/kbd.c (added)
-
platform/sx130is/lib.c (added)
-
platform/sx130is/main.c (added)
-
platform/sx130is/notes.txt (added)
-
platform/sx130is/shooting.c (added)
-
platform/sx130is/sub (added)
-
platform/sx130is/sub/101c (added)
-
platform/sx130is/sub/101c/Makefile (added)
-
platform/sx130is/sub/101c/boot.c (added)
-
platform/sx130is/sub/101c/capt_seq.c (added)
-
platform/sx130is/sub/101c/lib.c (added)
-
platform/sx130is/sub/101c/makefile.inc (added)
-
platform/sx130is/sub/101c/movie_rec.c (added)
-
platform/sx130is/sub/101c/stubs_asm.h (added)
-
platform/sx130is/sub/101c/stubs_auto.S (added)
-
platform/sx130is/sub/101c/stubs_entry.S (added)
-
platform/sx130is/sub/101c/stubs_entry_2.S (added)
-
platform/sx130is/sub/101c/stubs_min.S (added)
-
platform/sx130is/sub/Makefile (added)
-
platform/sx130is/wrappers.c (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r1071 r1128 232 232 $(MAKE) -s --no-print-directory PLATFORM=a470 PLATFORMSUB=102c NO_INC_BUILD=1 firzipsub 233 233 $(MAKE) -s --no-print-directory PLATFORM=sx110is PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 234 # $(MAKE) -s --no-print-directory PLATFORM=sx130is PLATFORMSUB=101c NO_INC_BUILD=1 firzipsub 234 235 $(MAKE) -s --no-print-directory PLATFORM=sx200is PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 235 236 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub … … 398 399 $(MAKE) -s --no-print-directory PLATFORM=a470 PLATFORMSUB=102c NO_INC_BUILD=1 firzipsubcomplete 399 400 $(MAKE) -s --no-print-directory PLATFORM=sx110is PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 401 # $(MAKE) -s --no-print-directory PLATFORM=sx130is PLATFORMSUB=101c NO_INC_BUILD=1 firzipsubcomplete 400 402 $(MAKE) -s --no-print-directory PLATFORM=sx200is PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 401 403 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete … … 601 603 $(MAKE) -s --no-print-directory PLATFORM=a470 PLATFORMSUB=102c NO_INC_BUILD=1 clean 602 604 $(MAKE) -s --no-print-directory PLATFORM=sx110is PLATFORMSUB=100b NO_INC_BUILD=1 clean 605 # $(MAKE) -s --no-print-directory PLATFORM=sx130is PLATFORMSUB=101c NO_INC_BUILD=1 clean 603 606 $(MAKE) -s --no-print-directory PLATFORM=sx200is PLATFORMSUB=100c NO_INC_BUILD=1 clean 604 607 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100c NO_INC_BUILD=1 clean -
trunk/core/gui_menu.c
r1034 r1128 668 668 if (lang_str(curr_menu->menu[imenu].text)[0]) { 669 669 j = rbf_str_width(lang_str(curr_menu->menu[imenu].text)); 670 #if defined (CAMERA_g11) || defined (CAMERA_s90) 670 #if defined (CAMERA_g11) || defined (CAMERA_s90) || defined (CAMERA_sx130is) 671 671 xx+=((int)w-j-len_space*2)>>1; 672 672 #else -
trunk/core/kbd.c
r1074 r1128 92 92 #endif 93 93 94 #if defined(CAMERA_sx200is) 94 #if defined(CAMERA_sx200is) || defined(CAMERA_sx130is) 95 95 #define ZSTEP_TABLE_SIZE 7 96 96 static int nTxtbl[]={0,16,32,62,78,102,125}; -
trunk/include/camera.h
r1124 r1128 2644 2644 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 2645 2645 #define cam_CFAPattern 0x02010100 // Red Green Green Blue 2646 #define cam_CalibrationIlluminant1 1 // Daylight 2647 #define CAM_JPEG_WIDTH 3456 2648 #define CAM_JPEG_HEIGHT 2592 2646 #define cam_CalibrationIlluminant1 1 // Daylight 2647 #define CAM_JPEG_WIDTH 3456 2648 #define CAM_JPEG_HEIGHT 2592 2649 2650 2651 //---------------------------------------------------------- 2652 2653 #elif defined (CAMERA_sx130is) 2654 #define CAM_PROPSET 4 2655 #define CAM_DRYOS 1 2656 #define CAM_DRYOS_2_3_R39 1 2657 2658 #define CAM_RAW_ROWPIX 4080 2659 #define CAM_RAW_ROWS 3048 2660 2661 #undef CAM_CAN_SD_OVER_NOT_IN_MF 2662 #undef CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 2663 //#define CAM_HAS_VIDEO_BUTTON 0 2664 #define CAM_VIDEO_QUALITY_ONLY 1 2665 #define CAM_BRACKETING 1 2666 #undef CAM_VIDEO_CONTROL 2667 #define CAM_MULTIPART 1 2668 #define CAM_HAS_JOGDIAL 1 2669 #undef CAM_USE_ZOOM_FOR_MF 2670 #undef CAM_UNCACHED_BIT 2671 #define CAM_UNCACHED_BIT 0x40000000 2672 2673 #define DNG_SUPPORT 1 2674 // pattern 2675 #define cam_CFAPattern 0x02010100 // Red Green Green Blue 2676 // color 2677 #define CAM_COLORMATRIX1 \ 2678 827547, 1000000, -290458, 1000000, -126086, 1000000, \ 2679 -12829, 1000000, 530507, 1000000, 50537, 1000000, \ 2680 5181, 1000000, 48183, 1000000, 245014, 1000000 2681 #define cam_CalibrationIlluminant1 1 // Daylight 2682 2683 // cropping 2684 #define CAM_JPEG_WIDTH 4000 2685 #define CAM_JPEG_HEIGHT 3000 2686 #define CAM_ACTIVE_AREA_X1 36 2687 #define CAM_ACTIVE_AREA_Y1 20 2688 #define CAM_ACTIVE_AREA_X2 4036 2689 #define CAM_ACTIVE_AREA_Y2 3020 2690 // camera name 2691 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 2692 #undef CAM_SENSOR_BITS_PER_PIXEL 2693 #define CAM_SENSOR_BITS_PER_PIXEL 12 2694 #undef CAM_WHITE_LEVEL 2695 #define CAM_WHITE_LEVEL ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 2696 #undef CAM_BLACK_LEVEL 2697 #define CAM_BLACK_LEVEL 127 2698 2699 #define CAM_EXT_TV_RANGE 1 2700 #define CAM_QUALITY_OVERRIDE 1 2701 2702 // copied from the SX200 which has the same video buffer size 2703 #undef CAM_USES_ASPECT_CORRECTION 2704 #undef CAM_USES_ASPECT_YCORRECTION 2705 #define CAM_USES_ASPECT_CORRECTION 1 //camera uses the modified graphics primitives to map screens an viewports to buffers more sized 2706 #define CAM_USES_ASPECT_YCORRECTION 0 //only uses mappings on x coordinate 2707 2708 #undef ASPECT_XCORRECTION 2709 #define ASPECT_XCORRECTION(x) ((((x)<<3)+(x))>>2) //correction x*screen_buffer_width/screen_width = x*720/320 = x*9/4 = (x<<3 + x)>>2 2710 2711 #undef ASPECT_GRID_XCORRECTION 2712 #define ASPECT_GRID_XCORRECTION(x) ((((x)<<3)/9)) //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9 2713 #undef ASPECT_GRID_YCORRECTION 2714 #define ASPECT_GRID_YCORRECTION(y) ((y)) //y correction for grids made on a 360x240 As the buffer is 720x240 we have no correction here. 2715 2716 #undef ASPECT_VIEWPORT_XCORRECTION 2717 #define ASPECT_VIEWPORT_XCORRECTION(x) ASPECT_GRID_XCORRECTION(x) 2718 #undef ASPECT_VIEWPORT_YCORRECTION 2719 #define ASPECT_VIEWPORT_YCORRECTION(y) ((y)) 2720 2721 //games mappings 2722 #undef GAMES_SCREEN_WIDTH 2723 #define GAMES_SCREEN_WIDTH 360 2724 #undef GAMES_SCREEN_HEIGHT 2725 #define GAMES_SCREEN_HEIGHT 240 2726 #undef ASPECT_GAMES_XCORRECTION 2727 // 720/360=2 same aspect than grids and viewport but another approach: there is a lot of corrections to do in game's code, and we decide to paint directly on display buffer wirh another resolution 2728 // used by gui.c that configures the draw environment (trhough new draw_gui function) depending on gui_mode: we have then 360x240 for games (but deformed output:circles are not circles) and 320x240 for 2729 // other modes in perfect aspect ratio 4/3: slightly better visualization: file menus more readable, ... 2730 #define ASPECT_GAMES_XCORRECTION(x) (((x)<<1)) 2731 #undef ASPECT_GAMES_YCORRECTION 2732 #define ASPECT_GAMES_YCORRECTION(y) ((y)) //none 2733 2734 #define CAM_ZEBRA_ASPECT_ADJUST 1 2735 #define CAM_ZEBRA_NOBUF 1 2736 2737 #undef CAM_BITMAP_PALETTE 2738 #define CAM_BITMAP_PALETTE 7 2739 2740 //zebra letterbox for saving memory 2741 #undef ZEBRA_HMARGIN0 2742 #define ZEBRA_HMARGIN0 30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower). 2743 2744 //#undef EDGE_HMARGIN 2745 //#define EDGE_HMARGIN 28 2746 #define CAM_CHDK_PTP 1 2747 #define CAM_DATE_FOLDER_NAMING 1 2748 2749 // Menu width like in g11 and s90 2750 #undef CAM_MENU_BORDERWIDTH 2751 #define CAM_MENU_BORDERWIDTH 10 2752 // CR2 accesible through USB 2753 #undef DEFAULT_RAW_EXT 2754 #define DEFAULT_RAW_EXT 2 2649 2755 2650 2756 #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // enable fix for camera crash at startup when opening the conf / font files 2651 2757 // see http://chdk.setepontos.com/index.php?topic=6179.0 2652 2653 //----------------------------------------------------------2654 2655 //********2656 /////SX2002657 //********2758 2759 //---------------------------------------------------------- 2760 2761 //******** 2762 /////SX200 2763 //******** 2658 2764 #elif defined (CAMERA_sx200is) 2659 2765 // copied from SX10 and modified -
trunk/makefile.inc
r1124 r1128 30 30 #PLATFORM=sx110is 31 31 #PLATFORMSUB=100b 32 33 #PLATFORM=sx130is 34 #PLATFORMSUB=101c 32 35 33 36 #PLATFORM=sx200is -
trunk/platform/generic/shooting.c
r1086 r1128 739 739 defined (CAMERA_d10) || \ 740 740 defined (CAMERA_s95) || \ 741 defined (CAMERA_g12) || defined (CAMERA_sx30) 741 defined (CAMERA_g12) || defined (CAMERA_sx30) || \ 742 defined (CAMERA_sx130is) 742 743 short n; 743 744 // unlike other cameras, sx200 does set PROPCASE_DRIVE_MODE when in custom timer mode
Note: See TracChangeset
for help on using the changeset viewer.
