Changeset 1005

Timestamp:

12/19/10 21:35:37 (2 years ago)

Author:

reyalP

Message:

add PTP ScriptStatus? and ScriptSupport? commands, based on patch from ultimA in ​http://chdk.setepontos.com/index.php?topic=5793.msg57788#msg57788 with some modifications
updated CHDK ptp protocol minor to 0.2
ScriptStatus? returns a bitmask of status values. Bit 0 of param 1 is set if script is running, otherwise cleared
ScriptSupport? returns a bitmask of supported scripting interfaces. Bit 0 of param 1 is set if Lua is supported, otherwise cleared
Values of other bits or params can be added as a minor protocol change.

Location:

trunk/core

Files:

• ptp.c (modified) (1 diff)
• ptp.h (modified) (3 diffs)

trunk/core/ptp.c

@@ -117 +117 @@
       ptp.param2 = PTP_CHDK_VERSION_MINOR;
       break;
-
+    case PTP_CHDK_ScriptSupport:
+      ptp.num_param = 1;
+      ptp.param1 = PTP_CHDK_SCRIPT_SUPPORT_LUA;
+      break;
+    case PTP_CHDK_ScriptStatus:
+      ptp.num_param = 1;
+      ptp.param1 = script_is_running()?PTP_CHDK_SCRIPT_STATUS_RUN:0;
+      break;
     case PTP_CHDK_GetMemory:
       if ( param2 == 0 || param3 < 1 ) // null pointer or invalid size?

trunk/core/ptp.h

@@ -6 +6 @@
 
 #define PTP_CHDK_VERSION_MAJOR 0  // increase only with backwards incompatible changes (and reset minor)
-#define PTP_CHDK_VERSION_MINOR 1  // increase with extensions of functionality
+#define PTP_CHDK_VERSION_MINOR 2  // increase with extensions of functionality
+/*
+protocol version history
+0.1 - initial proposal from mweerden, + luar
+0.2 - Added ScriptStatus and ScriptSupport, based on work by ultimA
+*/
 
 #define PTP_OC_CHDK 0x9999
@@ -34 +39 @@
                             // param2 is language of script
                             // param3 is for the ES flags below
+  PTP_CHDK_ScriptStatus,        // Script execution status
+                            // param1 CHDK_PTP_SCRIPT_STATUS_RUN is set if a script running, cleared if not
+                                                        // all other bits and params are reserved for future use
+  PTP_CHDK_ScriptSupport,   // Which scripting interfaces are supported in this build
+                            // param1 CHDK_PTP_SUPPORT_LUA is set if lua is supported, cleared if not
+                                                        // all other bits and params are reserved for future use
 } ptp_chdk_command;
 
@@ -62 +73 @@
                                    // and integers) or length (strings)
 
-// Script Languages
+// Script Languages - for execution
 #define PTP_CHDK_SL_LUA    0
 #define PTP_CHDK_SL_UBASIC 1
 
+// bit flags for script status
+#define PTP_CHDK_SCRIPT_STATUS_RUN   0x1
+// bit flags for scripting support
+#define PTP_CHDK_SCRIPT_SUPPORT_LUA  0x1
+
 #endif // __PTP_H