Changeset 560

Timestamp:

11/12/08 07:51:48 (5 years ago)

Author:

reyalp

Message:

ixus75_sd750: find zoom_status, enable CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO, use generic/capt_seq.c, set svn:eol-style
lua examples: clean up indentation

Location:

trunk

Files:

• CHDK/SCRIPTS/examples/lotto.lua (modified) (3 diffs)
• CHDK/SCRIPTS/examples/tv_uni_e.lua (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• platform/ixus75_sd750/Makefile (modified) (1 prop)
• platform/ixus75_sd750/kbd.c (modified) (1 prop)
• platform/ixus75_sd750/lib.c (modified) (1 prop)
• platform/ixus75_sd750/main.c (modified) (1 prop)
• platform/ixus75_sd750/notes.txt (modified) (1 prop)
• platform/ixus75_sd750/shooting.c (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/Makefile (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/boot.c (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/capt_seq.c (modified) (1 diff, 1 prop)
• platform/ixus75_sd750/sub/100b/lib.c (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/makefile.inc (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/movie_rec.c (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/stubs_asm.h (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/stubs_auto.S (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/stubs_entry.S (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/stubs_entry_2.S (modified) (1 prop)
• platform/ixus75_sd750/sub/100b/stubs_min.S (modified) (1 diff, 1 prop)
• platform/ixus75_sd750/sub/101a/Makefile (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/boot.c (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/capt_seq.c (modified) (1 diff, 1 prop)
• platform/ixus75_sd750/sub/101a/lib.c (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/makefile.inc (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/movie_rec.c (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/stubs_asm.h (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/stubs_auto.S (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/stubs_entry.S (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/stubs_entry_2.S (modified) (1 prop)
• platform/ixus75_sd750/sub/101a/stubs_min.S (modified) (1 diff, 1 prop)
• platform/ixus75_sd750/sub/102a/Makefile (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/boot.c (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/capt_seq.c (modified) (1 diff, 1 prop)
• platform/ixus75_sd750/sub/102a/lib.c (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/makefile.inc (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/movie_rec.c (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/stubs_asm.h (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/stubs_auto.S (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/stubs_entry.S (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/stubs_entry_2.S (modified) (1 prop)
• platform/ixus75_sd750/sub/102a/stubs_min.S (modified) (1 diff, 1 prop)
• platform/ixus75_sd750/sub/Makefile (modified) (1 prop)
• platform/ixus75_sd750/wrappers.c (modified) (1 prop)

trunk/CHDK/SCRIPTS/examples/lotto.lua

@@ -55 +55 @@
         print("Wrong params, dummy!;-)")
         wait_click(0)
-        else
+else
         if ((exclusive == 1) and ((max - min + 1)<count)) then
                 print("Wrong params, dummy!;-)")
                 wait_click(0)
-                else
+        else
 
 --If parameters ok start the main loop to throw the dice
 
                 repeat
-                  result= {}                                -- create a table for result
+                        result= {}                                -- create a table for result
                         if exclusive == 1 then                    -- if exclusive is set
                                 array = {}                              -- create a table for mix
@@ -89 +89 @@
                         if order == 1 then table.sort(result) end -- order result if set
                         output = table.concat(result,", ")        -- create a string of the table
-                print("dice [SET]     end [MENU]")        -- output in console
+                        print("dice [SET]     end [MENU]")        -- output in console
                         print()
                         print(output)                             -- print a string variable
@@ -95 +95 @@
                         cls()                                     -- clear the console
                 until key == "MENU"                         -- end of loop if pressed "MENU"
-end                                             -- "SET" repeat the loop
+        end                                             -- "SET" repeat the loop
 end
 

trunk/CHDK/SCRIPTS/examples/tv_uni_e.lua

@@ -28 +28 @@
         local x = 0
         repeat
-        wait_click(key_delay)
-        if is_pressed "remote" then
-          key = "SET"
-          x = 1
-        end
-        if is_pressed "set" then
-                key = "SET"
-                x = 1
-        end
-        if is_pressed "menu" then
-                key = "MENU"
-                x = 1
-        end
-        if is_pressed "display" then
-   key = "DISP"
-   x = 1
-  end
-        if is_pressed "left" then
-                key = "LEFT"
-                x = 1
-        end
-        if is_pressed "right" then
-                key = "RIGHT"
-                x = 1
-        end
-        if is_pressed "up" then
-   key = "UP"
-   x = 1
-  end
-  if is_pressed "down" then
-   key = "DOWN"
-   x = 1
-  end
+                wait_click(key_delay)
+                if is_pressed "remote" then
+                  key = "SET"
+                  x = 1
+                end
+                if is_pressed "set" then
+                        key = "SET"
+                        x = 1
+                end
+                if is_pressed "menu" then
+                        key = "MENU"
+                        x = 1
+                end
+                if is_pressed "display" then
+                        key = "DISP"
+                        x = 1
+                end
+                if is_pressed "left" then
+                        key = "LEFT"
+                        x = 1
+                end
+                if is_pressed "right" then
+                        key = "RIGHT"
+                        x = 1
+                end
+                if is_pressed "up" then
+                        key = "UP"
+                        x = 1
+                end
+                if is_pressed "down" then
+                        key = "DOWN"
+                        x = 1
+                end
         until  x == 1
         set_led (8,1)

trunk/include/camera.h

@@ -448 +448 @@
     #define CAM_HAS_USER_TV_MODES       1   // Camera has tv-priority or manual modes with ability to set tv value
     #define  CAM_SHOW_OSD_IN_SHOOT_MENU   1   // On some cameras Canon shoot menu has additional functionality and useful in this case to see CHDK OSD in this mode  
-    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO // adress for zoom_status missing, probably more
-    // #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO  1 // Camera can unlock optical zoom in video (if it is locked)
+//    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO // adress for zoom_status missing, probably more
+    #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO  1 // Camera can unlock optical zoom in video (if it is locked)
     #define  CAM_FEATURE_FEATHER        1     // Cameras with "feather" or touch wheel.
     #undef CAM_HAS_IS                     // Camera has image stabilizer

trunk/platform/ixus75_sd750/sub/100b/capt_seq.c

@@ -3 +3 @@
 #include "core.h"
 
-#define RAWDATA_AVAILABLE (1)
-#define RAWDATA_SAVED (2)
-
-#define NR_ON (2)
-#define NR_OFF (1)
-
-static long raw_save_stage;
-
-void capt_seq_hook_raw_here()
-{
-    raw_save_stage = RAWDATA_AVAILABLE;
-    core_rawdata_available();
-    while (raw_save_stage != RAWDATA_SAVED){
-        _SleepTask(10);
-    }
-}
-
-void hook_raw_save_complete()
-{
-    raw_save_stage = RAWDATA_SAVED;
-}
-
-
-void capt_seq_hook_set_nr()
-{
-    long *nrflag = (long*)0xCF74;
-
-    switch (core_get_noise_reduction_value()){
-    case NOISE_REDUCTION_AUTO_CANON:
-        // leave it alone
-        break;
-    case NOISE_REDUCTION_OFF:
-        *nrflag = 1;
-        break;
-    case NOISE_REDUCTION_ON:
-        *nrflag = 2;
-        break;
-    };
-}
+ long *nrflag = (long*)0xCF74;
+
+#include "../../../generic/capt_seq.c"
 
 void __attribute__((naked,noinline)) sub_FFB0D858_my(long p)

trunk/platform/ixus75_sd750/sub/100b/stubs_min.S

@@ -15 +15 @@
 DEF(recreview_hold, 0x25E4) // (0x25E8 - 0x4) found in "AR:Snd:0x%04x"
 DEF(movie_status,0xBBC48)
+DEF(zoom_status, 0x26B8) // found near _MoveOpticalToTele, _StopOpticalZoom etc
+

trunk/platform/ixus75_sd750/sub/101a/capt_seq.c

@@ -3 +3 @@
 #include "core.h"
 
-#define RAWDATA_AVAILABLE (1)
-#define RAWDATA_SAVED (2)
-
-#define NR_ON (2)
-#define NR_OFF (1)
-
-static long raw_save_stage;
-
-void capt_seq_hook_raw_here()
-{
-    raw_save_stage = RAWDATA_AVAILABLE;
-    core_rawdata_available();
-    while (raw_save_stage != RAWDATA_SAVED){
-        _SleepTask(10);
-    }
-}
-
-void hook_raw_save_complete()
-{
-    raw_save_stage = RAWDATA_SAVED;
-}
-
-
-void capt_seq_hook_set_nr()
-{
-    long *nrflag = (long*)0xCF74;
-
-    switch (core_get_noise_reduction_value()){
-    case NOISE_REDUCTION_AUTO_CANON:
-        // leave it alone
-        break;
-    case NOISE_REDUCTION_OFF:
-        *nrflag = 1;
-        break;
-    case NOISE_REDUCTION_ON:
-        *nrflag = 2;
-        break;
-    };
-}
+static long *nrflag = (long*)0xCF74;
+
+#include "../../../generic/capt_seq.c"
 
 void __attribute__((naked,noinline)) sub_FFB0D8CC_my(long p)

trunk/platform/ixus75_sd750/sub/101a/stubs_min.S

@@ -15 +15 @@
 DEF(recreview_hold, 0x25E4) // (0x25E8 - 0x4) found in "AR:Snd:0x%04x"
 DEF(movie_status,0xBBC48)
+DEF(zoom_status, 0x26B8) // found near _MoveOpticalToTele, _StopOpticalZoom etc
+

trunk/platform/ixus75_sd750/sub/102a/capt_seq.c

@@ -3 +3 @@
 #include "core.h"
 
-#define RAWDATA_AVAILABLE (1)
-#define RAWDATA_SAVED (2)
-
-#define NR_ON (2)
-#define NR_OFF (1)
-
-static long raw_save_stage;
-
-void capt_seq_hook_raw_here()
-{
-    raw_save_stage = RAWDATA_AVAILABLE;
-    core_rawdata_available();
-    while (raw_save_stage != RAWDATA_SAVED){
-        _SleepTask(10);
-    }
-}
-
-void hook_raw_save_complete()
-{
-    raw_save_stage = RAWDATA_SAVED;
-}
-
-
-void capt_seq_hook_set_nr()
-{
-    long *nrflag = (long*)0xCF74;
-
-    switch (core_get_noise_reduction_value()){
-    case NOISE_REDUCTION_AUTO_CANON:
-        // leave it alone
-        break;
-    case NOISE_REDUCTION_OFF:
-        *nrflag = 1;
-        break;
-    case NOISE_REDUCTION_ON:
-        *nrflag = 2;
-        break;
-    };
-}
+static long *nrflag = (long*)0xCF74;
+
+#include "../../../generic/capt_seq.c"
 
 // Checked for the SD750 v1.02A

trunk/platform/ixus75_sd750/sub/102a/stubs_min.S

@@ -15 +15 @@
 DEF(recreview_hold, 0x25E4) // (0x25E8 - 0x4) found in "AR:Snd:0x%04x"
 DEF(movie_status,0xBBC48)
+DEF(zoom_status, 0x26B8) // found near _MoveOpticalToTele, _StopOpticalZoom etc
+