Changeset 282 for trunk

Timestamp:

03/17/10 07:39:45 (3 years ago)

Author:

CHDKLover

Message:

Danke rudi, ​http://www.wirklemms.de/chdk/forum/viewtopic.php?t=1768

• PROPCASE_REAL_FOCUS_MODE hinzugefügt, entspricht WIKI|Propcase focus_mode
• PROPCASE_FOKUS_STATE hinzugefügt

PROPCASE_FOCUS_MODE wird beibehalten, entspricht
WIKI|Propcase manual_focus

Zur Zeit keine Systemweite korrekte Bezeichnung

lua/ubasic

+ Funktionen get_focus_mode

0=Normal
1=Manuell
3=Unendlich
4=Makro
5=Super-Makro
0 und 1 bleiben aus Kompatibilitätsgründen bestehen. Dafür wird MAKRO auf 4 gelegt alle anderen/zukünftigen Werte werden aus WIKI|Propcase focus_mode direkt abgebildet.

• Funktion get_focus_state

  0 Fokus erfolgreich
  

  =0 Fokus nicht erfolgreich <0 manueller Fokus

• Funktion get_focus_ok 0 nicht fokussiert 1 fokussiert (bei (FOKUS_STATUS<>0) und (SHOOTING=1))

Location:

trunk

Files:

• core/luascript.c (modified) (2 diffs)
• include/platform.h (modified) (1 diff)
• include/propset1.h (modified) (2 diffs)
• include/propset2.h (modified) (1 diff)
• include/propset3.h (modified) (1 diff)
• lib/ubasic/camera_functions.c (modified) (1 diff)
• lib/ubasic/tokenizer.c (modified) (1 diff)
• lib/ubasic/tokenizer.h (modified) (1 diff)
• lib/ubasic/ubasic.c (modified) (1 diff)
• platform/generic/shooting.c (modified) (1 diff)

trunk/core/luascript.c

@@ -634 +634 @@
 static int luaCB_get_focus_mode( lua_State* L )
 {
-  lua_pushnumber( L, shooting_get_prop(PROPCASE_FOCUS_MODE) );
+  lua_pushnumber( L, shooting_get_real_focus_mode() );
+  return 1;
+}
+
+static int luaCB_get_focus_state( lua_State* L )
+{
+  lua_pushnumber( L, shooting_get_focus_state() );
+  return 1;
+}
+
+static int luaCB_get_focus_ok( lua_State* L )
+{
+  lua_pushnumber( L, shooting_get_focus_ok() );
   return 1;
 }
@@ -1421 +1433 @@
 
   FUNC(get_focus_mode);
+  FUNC(get_focus_state);
+  FUNC(get_focus_ok);
   FUNC(get_propset);
   FUNC(get_zoom_steps);

trunk/include/platform.h

@@ -317 +317 @@
 void shooting_set_focus(int v, short is_now);
 short shooting_get_focus_mode();
+short shooting_get_real_focus_mode();
+short shooting_get_focus_state();
+short shooting_get_focus_ok();
 int shooting_get_hyperfocal_distance();
 int shooting_get_hyperfocal_distance_f(int av, int fl);

trunk/include/propset1.h

@@ -7 +7 @@
 */
 #define PROPCASE_DRIVE_MODE                             6
-#define PROPCASE_FOCUS_MODE                             12
+#define PROPCASE_FOCUS_MODE                             12  //WIKI|Propcase manual_focus
+#define PROPCASE_REAL_FOCUS_MODE      11  //WIKI|Propcase focus_mode
+#define PROPCASE_FOCUS_STATE          67
 #define PROPCASE_FLASH_MODE                                     16
 #define PROPCASE_FLASH_FIRE                             79
@@ -14 +16 @@
 // #define PROPCASE_FLASH_CORRECTION               28      
 #define PROPCASE_FLASH_MANUAL_OUTPUT    29
-//  #define PROPCASE_FOCUS_OK           67
 #define PROPCASE_USER_TV                                40
 #define PROPCASE_TV                                             69

trunk/include/propset2.h

@@ -7 +7 @@
 */
 #define PROPCASE_DRIVE_MODE                                     102
-#define PROPCASE_FOCUS_MODE                                     133
+#define PROPCASE_FOCUS_MODE                                     133  //WIKI|Propcase manual_focus
+#define PROPCASE_REAL_FOCUS_MODE      6  //WIKI|Propcase focus_mode
+#define PROPCASE_FOCUS_STATE         18
 #define PROPCASE_FLASH_MODE                     143
 #define PROPCASE_FLASH_FIRE                             122

trunk/include/propset3.h

@@ -7 +7 @@
 */
 #define PROPCASE_DRIVE_MODE                                     102
-#define PROPCASE_FOCUS_MODE                                     133
+#define PROPCASE_FOCUS_MODE                                     133  //WIKI|Propcase manual_focus
+#define PROPCASE_REAL_FOCUS_MODE      6  //WIKI|Propcase focus_mode
+#define PROPCASE_FOCUS_STATE         18
 #define PROPCASE_FLASH_MODE                     143
 #define PROPCASE_FLASH_FIRE                             122

trunk/lib/ubasic/camera_functions.c

@@ -349 +349 @@
     return 0;
 }
+ 
+short shooting_get_focus_state()
+{
+    printf("*** shooting_get_focus_state ***\n");
+    return 0;
+}
+
+short shooting_get_focus_ok()
+{
+    printf("*** shooting_get_focus_ok ***\n");
+    return 0;
+}
 
 short shooting_get_iso_market()

trunk/lib/ubasic/tokenizer.c

@@ -116 +116 @@
   {"get_focal_length",        TOKENIZER_GET_FOCAL_LENGTH},
   {"get_focus_mode",          TOKENIZER_GET_FOCUS_MODE},
+  {"get_focus_ok",            TOKENIZER_GET_FOCUS_OK},
+  {"get_focus_state",         TOKENIZER_GET_FOCUS_STATE},
   {"get_focus",               TOKENIZER_GET_FOCUS},
   {"get_hyp_dist",            TOKENIZER_GET_HYPERFOCAL_DIST},

trunk/lib/ubasic/tokenizer.h

@@ -197 +197 @@
   TOKENIZER_IS_CAPTURE_MODE_VALID,
   TOKENIZER_GET_FOCAL_LENGTH,
+  TOKENIZER_GET_FOCUS_STATE,
+  TOKENIZER_GET_FOCUS_OK,
   
 } ubasic_token;

trunk/lib/ubasic/ubasic.c

@@ -298 +298 @@
     r = shooting_get_drive_mode();
    break;
-  case TOKENIZER_GET_FOCUS_MODE:
+   case TOKENIZER_GET_FOCUS_MODE:
     accept(TOKENIZER_GET_FOCUS_MODE);
-    r = shooting_get_prop(PROPCASE_FOCUS_MODE);
+    r = shooting_get_real_focus_mode();
+   break;
+  case TOKENIZER_GET_FOCUS_STATE:
+    accept(TOKENIZER_GET_FOCUS_STATE);
+    r = shooting_get_focus_state();
+   break;
+  case TOKENIZER_GET_FOCUS_OK:
+    accept(TOKENIZER_GET_FOCUS_OK);
+    r = shooting_get_focus_ok();
    break;
         case TOKENIZER_GET_DISPLAY_MODE:

trunk/platform/generic/shooting.c

@@ -796 +796 @@
 }
 
+short shooting_get_real_focus_mode()
+{
+  short f=shooting_get_focus_mode();
+  short m;
+  _GetPropertyCase(PROPCASE_REAL_FOCUS_MODE, &m, sizeof(m));
+  if (f==0 && m!=0) f=(m==1)?4:m;
+  return f;
+}
+
+short shooting_get_focus_state()
+{
+  if (shooting_get_focus_mode()==1) return -1;
+  int m;
+  _GetPropertyCase(PROPCASE_FOCUS_STATE, &m, sizeof(m));
+  return (short) m;
+}
+ 
+short shooting_get_focus_ok()
+{
+  return ((shooting_get_focus_state()!=0) && shooting_in_progress());
+}
 
 /*