Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1721

Timestamp:

03/11/12 07:20:03 (16 months ago)

Author:

philmoz

Message:

Minor changes:

merge CHDK-DE revision 967 into CHDK
add SD30 1.00f as a copy of 1.00g (http://chdk.setepontos.com/index.php?topic=2724.msg81879#msg81879)
add SX230 1.01e as a copy of 1.01b (http://chdk.setepontos.com/index.php?topic=6397.msg81391#msg81391)
fix default script so that english is the default language for CHDK (was set to german after merging CHDK-DE code)

Location:

branches/release-1_0

Files:

: 17 edited

camera_list.csv (modified) (3 diffs)
core/conf.c (modified) (2 diffs)
core/histogram.c (modified) (1 diff)
core/script.c (modified) (1 diff)
include/conf.h (modified) (1 diff)
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/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/release-1_0/camera_list.csv

-                      r1638
+                      r1721
 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/release-1_0/core/conf.c

-                      r1712
+                      r1721
     CONF_INFO(238, conf.debug_lua_restart_on_error, CONF_DEF_VALUE,     i:0, NULL),
 #if defined(VER_CHDK)
         CONF_INFO(239, conf.debug_propcase_page,     CONF_DEF_VALUE, i:0, NULL),
         CONF_INFO(240, conf.debug_misc_vals_show,     CONF_DEF_VALUE, i:0, NULL),
         CONF_INFO(241, conf.edge_overlay_filter,     CONF_DEF_VALUE, i:0, NULL),
         CONF_INFO(242, conf.edge_overlay_show,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(239, conf.debug_propcase_page,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(240, conf.debug_misc_vals_show,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(241, conf.edge_overlay_filter,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(242, conf.edge_overlay_show,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(243, conf.edge_overlay_pano_overlap,   CONF_DEF_VALUE, i:30, NULL),
 …
     CONF_INFO(245, conf.touchscreen_disable_shortcut_controls, CONF_DEF_VALUE, i:0, NULL),
         // USB Icon enable & position
+    // USB Icon enable & position
     CONF_INFO(246, conf.usb_info_enable, CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(247, conf.usb_info_pos,    CONF_OSD_POS_PTR,  ptr:&def_usb_info_pos, NULL),

branches/release-1_0/core/histogram.c

r1712	r1721
95	95	case 2:
96	96	case 3:
97		~~x = 0;~~ // count how many blocks we have done on the current row (to skip unused buffer space at end of each row)
	97	x = 0; // count how many blocks we have done on the current row (to skip unused buffer space at end of each row)
98	98	for (i=(histogram_stage-1)6; i<viewport_size; i+=HISTO_STEP_SIZE6) {
99	99	y = img[i+1];

branches/release-1_0/core/script.c

-                      r1712
+                      r1721
     "@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/release-1_0/include/conf.h

-                      r1712
+                      r1721
     int touchscreen_disable_shortcut_controls;
         // Enable USB icon
     int usb_info_enable;
     int ext_video_time;
+    // Enable USB icon
+    int usb_info_enable;
+    int ext_video_time;     // save gps_track_time
 #ifdef CAM_HAS_GPS
     int gps_record;

branches/release-1_0/platform/a1000/sub/100a/stubs_entry_2.S

r1716	r1721
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/release-1_0/platform/a1000/sub/100a/stubs_min.S

-                      r1716
+                      r1721
 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/release-1_0/platform/a1000/sub/100b/stubs_entry_2.S

r1716	r1721
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/release-1_0/platform/a1000/sub/100b/stubs_min.S

-                      r1716
+                      r1721
 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/release-1_0/platform/ixus220_elph300hs/sub/100c/stubs_entry.S

r1717	r1721
36	36	DEF(zoom_busy ,0x00006cf4) // Found @0xff97fd74
37	37	DEF(focus_busy ,0x00006b68) // Found @0xff97af60
38		//DEF(recreview_hold ,0x00003828) // Found @0xff8a6510, stubs_min = 0x00003828 (0x00003828)
	38	DEF(recreview_hold ,0x00003828) // Found @0xff8a6510
39	39
40	40	// Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/100c/stubs_min.S

r1717	r1721
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/release-1_0/platform/ixus220_elph300hs/sub/101a/stubs_entry.S

r1717	r1721
36	36	DEF(zoom_busy ,0x00006cf4) // Found @0xff97fd74
37	37	DEF(focus_busy ,0x00006b68) // Found @0xff97af60
38		//DEF(recreview_hold ,0x00003828) // Found @0xff8a6510, stubs_min = 0x00003828 (0x00003828)
	38	DEF(recreview_hold ,0x00003828) // Found @0xff8a6510
39	39
40	40	// Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/101a/stubs_min.S

r1717	r1721
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/release-1_0/platform/ixus220_elph300hs/sub/101c/stubs_entry.S

r1717	r1721
36	36	DEF(zoom_busy ,0x00006cf4) // Found @0xff97fd74
37	37	DEF(focus_busy ,0x00006b68) // Found @0xff97af60
38		//DEF(recreview_hold ,0x00003828) // Found @0xff8a6510, stubs_min = 0x00003828 (0x00003828)
	38	DEF(recreview_hold ,0x00003828) // Found @0xff8a6510
39	39
40	40	// Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/101c/stubs_min.S

r1717	r1721
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/release-1_0/platform/ixus220_elph300hs/sub/101g/stubs_entry.S

r1717	r1721
36	36	DEF(zoom_busy ,0x00006cf4) // Found @0xff97fd74
37	37	DEF(focus_busy ,0x00006b68) // Found @0xff97af60
38		//DEF(recreview_hold ,0x00003828) // Found @0xff8a6510, stubs_min = 0x00003828 (0x00003828)
	38	DEF(recreview_hold ,0x00003828) // Found @0xff8a6510
39	39
40	40	// Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/101g/stubs_min.S

r1717	r1721
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.

Context Navigation

Changeset 1721

Legend:

Download in other formats: