Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1737

Timestamp:

03/16/12 04:51:39 (15 months ago)

Author:

reyalp

Message:

update with r1722-r1736 from trunk

Location:

branches/reyalp-ptp-live

Files:

: 21 edited
: 6 copied

. (modified) (1 prop)
camera_list.csv (modified) (7 diffs)
core/conf.c (modified) (1 diff)
core/gui.c (modified) (1 diff)
core/histogram.c (modified) (1 diff)
core/script.c (modified) (1 diff)
include/modelist.h (modified) (1 diff)
loader/a2100 (copied) (copied from trunk/loader/a2100)
loader/a420 (copied) (copied from trunk/loader/a420)
loader/a800 (copied) (copied from trunk/loader/a800)
platform/a1000/sub/100a/stubs_entry_2.S (modified) (1 diff)
platform/a1000/sub/100a/stubs_min.S (modified) (1 diff)
platform/a1000/sub/100b/stubs_entry_2.S (modified) (1 diff)
platform/a1000/sub/100b/stubs_min.S (modified) (1 diff)
platform/a2100 (copied) (copied from trunk/platform/a2100)
platform/a420 (copied) (copied from trunk/platform/a420)
platform/a800 (copied) (copied from trunk/platform/a800)
platform/generic/kbd.c (modified) (2 diffs)
platform/ixus220_elph300hs/platform_camera.h (modified) (2 diffs)
platform/ixus220_elph300hs/sub/100c/stubs_entry.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/100c/stubs_min.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/101a/stubs_entry.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/101a/stubs_min.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/101c/stubs_entry.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/101c/stubs_min.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/101g/stubs_entry.S (modified) (1 diff)
platform/ixus220_elph300hs/sub/101g/stubs_min.S (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/reyalp-ptp-live
- Property svn:mergeinfo changed
  /branches/release-1_0 merged: 1721,1730,1732
  /trunk merged: 1722-1724,1727,1731,1733,1736

branches/reyalp-ptp-live/camera_list.csv

-                      r1641
+                      r1737
 a1100,100c,BETA,,
 a2000,100c,BETA,100a:100b,
+a2100,100a,ALPHA,,SKIP_AUTOBUILD
 a3000,100b,BETA,,
 a3000,100c,BETA,,
 …
 a3300,100d,BETA,,
 a410,100f,BETA,100e,
+a420,100b,ALPHA,,
 a430,100b,BETA,,
 a450,100d,,,
 …
 a710,100a,,,
 a720,100c,,,
+a800,100c,BETA,,
 d10,100a,BETA,100b,
 g10,102a,,,
 …
 ixus100_sd780,100b,BETA,,
 ixus100_sd780,100c,BETA,,
 ixus120_sd940,100e,BETA,,
 ixus120_sd940,101a,BETA,,
 ixus120_sd940,102c,BETA,,
 ixus120_sd940,103b,BETA,,
 ixus120_sd940,103c,BETA,,
+ixus120_sd940,100e,,,
+ixus120_sd940,101a,,,
+ixus120_sd940,102c,,,
+ixus120_sd940,103b,,,
+ixus120_sd940,103c,,,
 ixus200_sd980,101c,BETA,,
 ixus200_sd980,101d,BETA,,
 …
 ixus980_sd990,100e,,,
 ixus980_sd990,101b,,,
 ixusizoom_sd30,100g,,,
+ixusizoom_sd30,100g,,100f,
 ixusW_sd430,110a,,,SKIP_AUTOBUILD
 s2is,100e,,,
 …
 sx130is,101f,BETA,,
 sx150is,100a,ALPHA,,
 sx20,100f,BETA,,
+sx20,100f,,,
 sx20,102b,,,
 sx20,102d,,102c,
 …
 sx230hs,100c,BETA,,
 sx230hs,101a,BETA,,
 sx230hs,101b,BETA,101c,
+sx230hs,101b,BETA,101c:101e,
 sx30,100e,,,
 sx30,100h,,,

branches/reyalp-ptp-live/core/conf.c

r1720	r1737
398	398	CONF_INFO(245, conf.touchscreen_disable_shortcut_controls, CONF_DEF_VALUE, i:0, NULL),
399	399
400		// USB Icon enable & position
	400	// USB Icon enable & position
401	401	CONF_INFO(246, conf.usb_info_enable, CONF_DEF_VALUE, i:0, NULL),
402	402	CONF_INFO2(247, conf.usb_info_pos, CONF_OSD_POS, 95,0),

branches/reyalp-ptp-live/core/gui.c

-                      r1720
+                      r1737
         if (conf.unlock_optical_zoom_for_video && (movie_status==VIDEO_RECORD_IN_PROGRESS) &&  kbd_is_key_clicked(key)){
             short x;
             get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x));
             if (x) {
                 get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x));
     #if defined (CAMERA_s90) || defined (CAMERA_s95) || defined (CAMERA_g12) || defined (CAMERA_a3000)
         if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium
     #else
         if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM;
+     get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x));
+     if (x) {
+      get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x));
+#if defined (CAMERA_s90) || defined (CAMERA_s95) || defined (CAMERA_g12) || defined (CAMERA_a3000) || defined (CAMERA_a800)
+          if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium
+#else
+          if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM;
     #endif

branches/reyalp-ptp-live/core/histogram.c

r1720	r1737
141	141	case 2:
142	142	case 3:
143		x = 0; // count how many blocks we have done on the current row (to skip unused buffer space at end of each row)
	143	x = 0; // count how many blocks we have done on the current row (to skip unused buffer space at end of each row)
144	144	for (i=(histogram_stage-1)6; i<viewport_size; i+=HISTO_STEP_SIZE6) {
145	145	y = img[i+1];

branches/reyalp-ptp-live/core/script.c

-                      r1720
+                      r1737
     "@title Default Script\n"
     "]]\n"
+#if defined(VER_CHDK)
+    "chdk_def_lang=1\n"
+#else
     "chdk_def_lang=2\n"
+#endif
     "langs     = {}\n"
     "langs[1]  = {[\"name\"]=\"ENGLISH\",  [\"font_cp\"]=0,  [\"hint\"]=\"CHDK language changed to english\"}\n"

branches/reyalp-ptp-live/include/modelist.h

-                      r1663
+                      r1737
     MODE_FIREWORK           , // ixus1000 end
     MODE_LIVE               , // A3300is
+    MODE_DISCREET           , // A3300is
+    MODE_DISCREET                        , // A3300is
+    MODE_BLUR_REDUCTION     , // a800
 };

branches/reyalp-ptp-live/platform/a1000/sub/100a/stubs_entry_2.S

r1720	r1737
3	3
4	4	// Override stubs_entry.S
5		~~//NHSTUB(ExpCtrlTool_StopContiAE, 0xffc1fabc)~~
6		~~//NHSTUB(Lseek, 0xffc1354c)~~
7	5	NHSTUB(PT_PlaySound, 0xffc48fbc)
8	6	NHSTUB(SetAE_ShutterSpeed, 0xffe3de6c)

branches/reyalp-ptp-live/platform/a1000/sub/100a/stubs_min.S

-                      r1720
+                      r1737
 DEF(led_table,                          0x2290) // 0x270C + 4
-// found in sub_FF957174 (called from MoveZoomLensWithPoint (sub_FF957B34))
-// ROM:FF957178   LDR     R4, =0xB37C
-// ..
-// ROM:FF9571BC   LDR     R0, [R4,#0x34]
-// ROM:FF9571C0   CMP     R0, #0
-// ROM:FF9571C4   MOVNE   R1, #0xE0
-// ROM:FF9571C8   ADRNE   R0, aZoomlenscontro @ "ZoomLensController.c"
-// ROM:FF9571CC   BLNE    assert
-//DEF(zoom_busy,                          0xB4A4) //0xB37C + 0x34
-// Found in sub_FF950718 (<- sub_FFA0D148 <- sub_FFA0D394 <- sub_FFA0D408
-//                                    <- MoveFocusLensToDistance (sub_FFA0D41C))
-// ROM:FF95071C   LDR     R4, =0xB274
-// ..
-// ROM:FF950770   LDR     R0, [R4,#8]
-// ROM:FF950774   CMP     R0, #0
-// ROM:FF950778   MOVNE   R1, #0x90
-// ROM:FF95077C   ADRNE   R0, aFocuslenscontr @ "FocusLensController.c"
-// ROM:FF950780   BLNE    assert
-//DEF(focus_busy, 0x7EE8) //0xB274 + 8 or 7fd4
-// Same as previous variable, unusable. Originally found it by peeking through
-// memory and it looked suitable at first. This address along with 0xBE64
-// (suitable as canon_shoot_menu_active, code agrees) looked suitable but I got
-// the basic idea wrong. Listed for completeness.
-// Found in sub_FF982310 (deactivates shoot menu?). Ewavr found it but didn't
-// clearly specify where, so this is a guess.
-// ROM:FF982310   LDR     R1, =0xC05C
-// ROM:FF982314   MOV     R0, #0
-// ROM:FF982318   STRB    R0, [R1]
-// ROM:FF98231C   STRB    R0, [R1,#1]
-//DEF(canon_shoot_menu_active,            0xC05D) // 0xC05C + 1
-// Found in sub_FF9754AC. Again, ewavr found this one, he did supply one pointer
-// 'search for LDR R12, =0x3007'. I guess this is the right one then :)
-// ROM:FF9754AC 000                 STMFD   SP!, {R4,LR}
-// ROM:FF9754B0 008                 LDR     R1, =0xBD60
-// ROM:FF9754B4 008                 LDR     R12, =0x3007
-// ROM:FF9754B8 008                 LDR     R2, [R1,#0xCC]
-//DEF(recreview_hold,                     0x94C8) // 0xBD60 + 0xCC
-//DEF(movie_status,                       0x5868 + 0x38)
 DEF(mode_magic,                         0x58D4)
 DEF(enabled_refresh_physical_screen,    0xA460 + 0x30)  // Found in sub_ffd7a36c

branches/reyalp-ptp-live/platform/a1000/sub/100b/stubs_entry_2.S

r1720	r1737
3	3
4	4	// Override stubs_entry.S
5		~~//NHSTUB(ExpCtrlTool_StopContiAE, 0xFFC1FABC)~~
6		~~//NHSTUB(Lseek, 0xffc1354c)~~
7	5	NHSTUB(PT_PlaySound, 0xFFC48FBC)
8	6	NHSTUB(SetAE_ShutterSpeed, 0xFFE3DE6C)

branches/reyalp-ptp-live/platform/a1000/sub/100b/stubs_min.S

-                      r1720
+                      r1737
 DEF(led_table,                          0x2290) // 0x270C + 4
-// found in sub_FF957174 (called from MoveZoomLensWithPoint (sub_FF957B34))
-// ROM:FF957178   LDR     R4, =0xB37C
-// ..
-// ROM:FF9571BC   LDR     R0, [R4,#0x34]
-// ROM:FF9571C0   CMP     R0, #0
-// ROM:FF9571C4   MOVNE   R1, #0xE0
-// ROM:FF9571C8   ADRNE   R0, aZoomlenscontro @ "ZoomLensController.c"
-// ROM:FF9571CC   BLNE    assert
-//DEF(zoom_busy,                          0xB4A4) //0xB37C + 0x34
-// Found in sub_FF950718 (<- sub_FFA0D148 <- sub_FFA0D394 <- sub_FFA0D408
-//                                    <- MoveFocusLensToDistance (sub_FFA0D41C))
-// ROM:FF95071C   LDR     R4, =0xB274
-// ..
-// ROM:FF950770   LDR     R0, [R4,#8]
-// ROM:FF950774   CMP     R0, #0
-// ROM:FF950778   MOVNE   R1, #0x90
-// ROM:FF95077C   ADRNE   R0, aFocuslenscontr @ "FocusLensController.c"
-// ROM:FF950780   BLNE    assert
-//DEF(focus_busy,                         0x7EE8) //0xB274 + 8 or 7fd4
-// Same as previous variable, unusable. Originally found it by peeking through
-// memory and it looked suitable at first. This address along with 0xBE64
-// (suitable as canon_shoot_menu_active, code agrees) looked suitable but I got
-// the basic idea wrong. Listed for completeness.
-// Found in sub_FF982310 (deactivates shoot menu?). Ewavr found it but didn't
-// clearly specify where, so this is a guess.
-// ROM:FF982310   LDR     R1, =0xC05C
-// ROM:FF982314   MOV     R0, #0
-// ROM:FF982318   STRB    R0, [R1]
-// ROM:FF98231C   STRB    R0, [R1,#1]
-//DEF(canon_shoot_menu_active,            0xC05D) // 0xC05C + 1
-// Found in sub_FF9754AC. Again, ewavr found this one, he did supply one pointer
-// 'search for LDR R12, =0x3007'. I guess this is the right one then :)
-// ROM:FF9754AC 000                 STMFD   SP!, {R4,LR}
-// ROM:FF9754B0 008                 LDR     R1, =0xBD60
-// ROM:FF9754B4 008                 LDR     R12, =0x3007
-// ROM:FF9754B8 008                 LDR     R2, [R1,#0xCC]
-//DEF(recreview_hold,                     0x94C8) // 0xBD60 + 0xCC
-//DEF(movie_status,                       0x5868 + 0x38)
 DEF(mode_magic,                         0x58D4)
 DEF(enabled_refresh_physical_screen,    0xa460 + 0x30) // found in sub_ffd7a308

branches/reyalp-ptp-live/platform/generic/kbd.c

-                      r1628
+                      r1737
 #if     defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610)\
         || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a410)\
     || defined(CAMERA_a430)
+    || defined(CAMERA_a420) || defined(CAMERA_a430)
 #define USB_MASK 0x8000000
 #define USB_IDX 1
 …
         #elif           defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_a630)\
                         || defined(CAMERA_a640) ||      defined(CAMERA_ixus800_sd700) || defined(CAMERA_a410)\
             || defined(CAMERA_a430)
+            || defined(CAMERA_a420) || defined(CAMERA_a430)
                 x = (long)*mmio1;
         #elif defined(CAMERA_a710) || defined(CAMERA_a700)

branches/reyalp-ptp-live/platform/ixus220_elph300hs/platform_camera.h

-                      r1711
+                      r1737
     #define DNG_BADPIXEL_VALUE_LIMIT        16      // Camera sensor apparently has bad pixels with value > 0 & <=16
     #define CAM_DNG_LENS_INFO               { 50,10, 700,10, 31,10, 59,10 } // See comments in camera.h
+    #define CAM_DNG_LENS_INFO               { 43,10, 215,10, 27,10, 59,10 } // See comments in camera.h
     #define cam_CFAPattern  0x02010100
 …
     #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_ACTIVE_AREA_X1              120
+    #define CAM_ACTIVE_AREA_Y1              36
+    #define CAM_ACTIVE_AREA_X2              4136
+    #define CAM_ACTIVE_AREA_Y2              3040
     #define PARAM_CAMERA_NAME               4       // parameter number for GetParameterData
     #undef  CAM_SENSOR_BITS_PER_PIXEL

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/100c/stubs_entry.S

-                      r1720
+                      r1737
 DEF(zoom_status                             ,0x0000ded8) // Found @0xffb078a0
 DEF(some_flag_for_af_scan                   ,0x000071cc) // Found @0xff989240
+// focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c).
+// each entry contains 3 int value(s), the first is the zoom focus length.
+// there are 64 entries in the table - set NUM_FL to 64
+//DEF(focus_len_table                         ,0xfffea288) // Found @0xfffea288,          stubs_min = 0xfffea288 (0xfffea288)
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
+DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/100c/stubs_min.S

r1720	r1737
1	1	#include "stubs_asm.h"
2	2
3		~~DEF(recreview_hold, 0x00003828)~~
4	3	DEF(led_table, 0x258C + 0x04) // FF0557C4
5	4	DEF(focus_len_table, 0xfffea288) // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101a/stubs_entry.S

-                      r1720
+                      r1737
 DEF(zoom_status                             ,0x0000ded8) // Found @0xffb078b8
 DEF(some_flag_for_af_scan                   ,0x000071cc) // Found @0xff989240
+// focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c).
+// each entry contains 3 int value(s), the first is the zoom focus length.
+// there are 64 entries in the table - set NUM_FL to 64
+//DEF(focus_len_table                         ,0xfffea288) // Found @0xfffea288,          stubs_min = 0xfffea288 (0xfffea288)
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
+DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101a/stubs_min.S

r1720	r1737
1	1	#include "stubs_asm.h"
2	2
3		~~DEF(recreview_hold, 0x00003828)~~
4	3	DEF(led_table, 0x258C + 0x04) // FF0557C4
5	4	DEF(focus_len_table, 0xfffea288) // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101c/stubs_entry.S

-                      r1720
+                      r1737
 DEF(zoom_status                             ,0x0000ded8) // Found @0xffb078cc
 DEF(some_flag_for_af_scan                   ,0x000071cc) // Found @0xff989240
+// focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c).
+// each entry contains 3 int value(s), the first is the zoom focus length.
+// there are 64 entries in the table - set NUM_FL to 64
+//DEF(focus_len_table                         ,0xfffea288) // Found @0xfffea288,          stubs_min = 0xfffea288 (0xfffea288)
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
+DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101c/stubs_min.S

r1720	r1737
1	1	#include "stubs_asm.h"
2	2
3		~~DEF(recreview_hold, 0x00003828)~~
4	3	DEF(led_table, 0x258C + 0x04) // FF0557C4
5	4	DEF(focus_len_table, 0xfffea288) // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101g/stubs_entry.S

-                      r1720
+                      r1737
 DEF(zoom_status                             ,0x0000ded8) // Found @0xffb07900
 DEF(some_flag_for_af_scan                   ,0x000071cc) // Found @0xff989240
+// focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c).
+// each entry contains 3 int value(s), the first is the zoom focus length.
+// there are 64 entries in the table - set NUM_FL to 64
+//DEF(focus_len_table                         ,0xfffea288) // Found @0xfffea288,          stubs_min = 0xfffea288 (0xfffea288)
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
+DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101g/stubs_min.S

r1720	r1737
7	7	DEF(focus_len_table, 0xfffea288) // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)
8	8
9		~~DEF(recreview_hold, 0x00003828)~~
10
11	9	//not touched
12	10	DEF(led_table, 0x258C + 0x04) // FF0557C4

Note: See TracChangeset for help on using the changeset viewer.

/branches/release-1_0	merged: 1721,1730,1732
/trunk	merged: 1722-1724,1727,1731,1733,1736

Context Navigation

Changeset 1737

Legend:

Download in other formats: