Added SD_MOUNT_STATUS command

diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index d0fb4fe..90099e8 100644 (file)
Binary files a/gen/cpp/openxc.pb and b/gen/cpp/openxc.pb differ

diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 45ae65b..1507a90 100644 (file)
--- a/gen/cpp/openxc.pb.c
+++ b/gen/cpp/openxc.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.1 at Thu Nov 19 16:37:50 2015. */
+/* Generated by nanopb-0.3.1 at Thu Nov 26 21:21:48 2015. */
 
 #include "openxc.pb.h"
 

diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index cee3345..c15a32b 100644 (file)
--- a/gen/cpp/openxc.pb.h
+++ b/gen/cpp/openxc.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.1 at Thu Nov 19 16:37:50 2015. */
+/* Generated by nanopb-0.3.1 at Thu Nov 26 21:21:48 2015. */
 
 #ifndef PB_OPENXC_PB_H_INCLUDED
 #define PB_OPENXC_PB_H_INCLUDED
@@ -36,7 +36,8 @@ typedef enum _openxc_ControlCommand_Type {
     openxc_ControlCommand_Type_PAYLOAD_FORMAT = 6,
     openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7,
     openxc_ControlCommand_Type_MODEM_CONFIGURATION = 8,
-    openxc_ControlCommand_Type_RTC_CONFIGURATION = 9
+    openxc_ControlCommand_Type_RTC_CONFIGURATION = 9,
+    openxc_ControlCommand_Type_SD_MOUNT_STATUS = 10
 } openxc_ControlCommand_Type;
 
 typedef enum _openxc_DiagnosticControlCommand_Action {

diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index c1851f7..c94cf4a 100644 (file)
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -1876,6 +1876,7 @@ public final class BinaryMessages {
       PREDEFINED_OBD2_REQUESTS(6, 7),
       MODEM_CONFIGURATION(7, 8),
       RTC_CONFIGURATION(8, 9),
+      SD_MOUNT_STATUS(9, 10),
       ;
       
       public static final int VERSION_VALUE = 1;
@@ -1887,6 +1888,7 @@ public final class BinaryMessages {
       public static final int PREDEFINED_OBD2_REQUESTS_VALUE = 7;
       public static final int MODEM_CONFIGURATION_VALUE = 8;
       public static final int RTC_CONFIGURATION_VALUE = 9;
+      public static final int SD_MOUNT_STATUS_VALUE = 10;
       
       
       public final int getNumber() { return value; }
@@ -1902,6 +1904,7 @@ public final class BinaryMessages {
           case 7: return PREDEFINED_OBD2_REQUESTS;
           case 8: return MODEM_CONFIGURATION;
           case 9: return RTC_CONFIGURATION;
+          case 10: return SD_MOUNT_STATUS;
           default: return null;
         }
       }
@@ -1932,7 +1935,7 @@ public final class BinaryMessages {
       }
       
       private static final Type[] VALUES = {
-        VERSION, DEVICE_ID, DIAGNOSTIC, PASSTHROUGH, ACCEPTANCE_FILTER_BYPASS, PAYLOAD_FORMAT, PREDEFINED_OBD2_REQUESTS, MODEM_CONFIGURATION, RTC_CONFIGURATION, 
+        VERSION, DEVICE_ID, DIAGNOSTIC, PASSTHROUGH, ACCEPTANCE_FILTER_BYPASS, PAYLOAD_FORMAT, PREDEFINED_OBD2_REQUESTS, MODEM_CONFIGURATION, RTC_CONFIGURATION, SD_MOUNT_STATUS, 
       };
       
       public static Type valueOf(
@@ -11848,7 +11851,7 @@ public final class BinaryMessages {
       "nMessage\022\013\n\003bus\030\001 \001(\005\022\n\n\002id\030\002 \001(\r\022\014\n\004dat" +
       "a\030\003 \001(\014\0224\n\014frame_format\030\004 \001(\0162\036.openxc.C" +
       "anMessage.FrameFormat\")\n\013FrameFormat\022\014\n\010" +
-      "STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\364\005\n\016ControlComm" +
+      "STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\211\006\n\016ControlComm" +
       "and\022)\n\004type\030\001 \001(\0162\033.openxc.ControlComman" +
       "d.Type\022<\n\022diagnostic_request\030\002 \001(\0132 .ope" +
       "nxc.DiagnosticControlCommand\022G\n\030passthro" +
@@ -11862,65 +11865,65 @@ public final class BinaryMessages {
       "mmand\022F\n\033modem_configuration_command\030\007 \001" +
       "(\0132!.openxc.ModemConfigurationCommand\022B\n" +
       "\031rtc_configuration_command\030\010 \001(\0132\037.openx" +
-      "c.RTCConfigurationCommand\"\303\001\n\004Type\022\013\n\007VE" +
+      "c.RTCConfigurationCommand\"\330\001\n\004Type\022\013\n\007VE" +
       "RSION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020\003\022\017",
       "\n\013PASSTHROUGH\020\004\022\034\n\030ACCEPTANCE_FILTER_BYP" +
       "ASS\020\005\022\022\n\016PAYLOAD_FORMAT\020\006\022\034\n\030PREDEFINED_" +
       "OBD2_REQUESTS\020\007\022\027\n\023MODEM_CONFIGURATION\020\010" +
-      "\022\025\n\021RTC_CONFIGURATION\020\t\"\236\001\n\030DiagnosticCo" +
-      "ntrolCommand\022*\n\007request\030\001 \001(\0132\031.openxc.D" +
-      "iagnosticRequest\0227\n\006action\030\002 \001(\0162\'.openx" +
-      "c.DiagnosticControlCommand.Action\"\035\n\006Act" +
-      "ion\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002\"=\n\035PassthroughM" +
-      "odeControlCommand\022\013\n\003bus\030\001 \001(\005\022\017\n\007enable" +
-      "d\030\002 \001(\010\"<\n\035AcceptanceFilterBypassCommand",
-      "\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"\214\001\n\024Payloa" +
-      "dFormatCommand\022:\n\006format\030\001 \001(\0162*.openxc." +
-      "PayloadFormatCommand.PayloadFormat\"8\n\rPa" +
-      "yloadFormat\022\010\n\004JSON\020\001\022\014\n\010PROTOBUF\020\002\022\017\n\013M" +
-      "ESSAGEPACK\020\003\"0\n\035PredefinedObd2RequestsCo" +
-      "mmand\022\017\n\007enabled\030\001 \001(\010\"\321\003\n\027NetworkOperat" +
-      "orSettings\022\030\n\020allowDataRoaming\030\001 \001(\010\022N\n\022" +
-      "operatorSelectMode\030\002 \001(\01622.openxc.Networ" +
-      "kOperatorSettings.OperatorSelectMode\022L\n\021" +
-      "networkDescriptor\030\003 \001(\01321.openxc.Network",
-      "OperatorSettings.NetworkDescriptor\032\230\001\n\021N" +
-      "etworkDescriptor\022\014\n\004PLMN\030\001 \001(\r\022R\n\013networ" +
-      "kType\030\002 \001(\0162=.openxc.NetworkOperatorSett" +
-      "ings.NetworkDescriptor.NetworkType\"!\n\013Ne" +
-      "tworkType\022\007\n\003GSM\020\000\022\t\n\005UTRAN\020\002\"c\n\022Operato" +
-      "rSelectMode\022\r\n\tAUTOMATIC\020\000\022\n\n\006MANUAL\020\001\022\016" +
-      "\n\nDEREGISTER\020\002\022\014\n\010SET_ONLY\020\003\022\024\n\020MANUAL_A" +
-      "UTOMATIC\020\004\"\"\n\023NetworkDataSettings\022\013\n\003APN" +
-      "\030\001 \001(\t\"3\n\025ServerConnectSettings\022\014\n\004host\030" +
-      "\001 \001(\t\022\014\n\004port\030\002 \001(\r\"\325\001\n\031ModemConfigurati",
-      "onCommand\022@\n\027networkOperatorSettings\030\001 \001" +
-      "(\0132\037.openxc.NetworkOperatorSettings\0228\n\023n" +
-      "etworkDataSettings\030\002 \001(\0132\033.openxc.Networ" +
-      "kDataSettings\022<\n\025serverConnectSettings\030\003" +
-      " \001(\0132\035.openxc.ServerConnectSettings\",\n\027R" +
-      "TCConfigurationCommand\022\021\n\tunix_time\030\001 \001(" +
-      "\r\"]\n\017CommandResponse\022)\n\004type\030\001 \001(\0162\033.ope" +
-      "nxc.ControlCommand.Type\022\017\n\007message\030\002 \001(\t" +
-      "\022\016\n\006status\030\003 \001(\010\"\375\001\n\021DiagnosticRequest\022\013" +
-      "\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mode\030",
-      "\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007payload\030\005 \001(\014\022\032\n\022m" +
-      "ultiple_responses\030\006 \001(\010\022\021\n\tfrequency\030\007 \001" +
-      "(\001\022\014\n\004name\030\010 \001(\t\022;\n\014decoded_type\030\t \001(\0162%" +
-      ".openxc.DiagnosticRequest.DecodedType\"!\n" +
-      "\013DecodedType\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022Dia" +
-      "gnosticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_" +
-      "id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007s" +
-      "uccess\030\005 \001(\010\022\036\n\026negative_response_code\030\006" +
-      " \001(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n" +
-      "\014DynamicField\022\'\n\004type\030\001 \001(\0162\031.openxc.Dyn",
-      "amicField.Type\022\024\n\014string_value\030\002 \001(\t\022\025\n\r" +
-      "numeric_value\030\003 \001(\001\022\025\n\rboolean_value\030\004 \001" +
-      "(\010\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020" +
-      "\003\"g\n\rSimpleMessage\022\014\n\004name\030\001 \001(\t\022#\n\005valu" +
-      "e\030\002 \001(\0132\024.openxc.DynamicField\022#\n\005event\030\003" +
-      " \001(\0132\024.openxc.DynamicFieldB\034\n\ncom.openxc" +
-      "B\016BinaryMessages"
+      "\022\025\n\021RTC_CONFIGURATION\020\t\022\023\n\017SD_MOUNT_STAT" +
+      "US\020\n\"\236\001\n\030DiagnosticControlCommand\022*\n\007req" +
+      "uest\030\001 \001(\0132\031.openxc.DiagnosticRequest\0227\n" +
+      "\006action\030\002 \001(\0162\'.openxc.DiagnosticControl" +
+      "Command.Action\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CAN" +
+      "CEL\020\002\"=\n\035PassthroughModeControlCommand\022\013" +
+      "\n\003bus\030\001 \001(\005\022\017\n\007enabled\030\002 \001(\010\"<\n\035Acceptan",
+      "ceFilterBypassCommand\022\013\n\003bus\030\001 \001(\005\022\016\n\006by" +
+      "pass\030\002 \001(\010\"\214\001\n\024PayloadFormatCommand\022:\n\006f" +
+      "ormat\030\001 \001(\0162*.openxc.PayloadFormatComman" +
+      "d.PayloadFormat\"8\n\rPayloadFormat\022\010\n\004JSON" +
+      "\020\001\022\014\n\010PROTOBUF\020\002\022\017\n\013MESSAGEPACK\020\003\"0\n\035Pre" +
+      "definedObd2RequestsCommand\022\017\n\007enabled\030\001 " +
+      "\001(\010\"\321\003\n\027NetworkOperatorSettings\022\030\n\020allow" +
+      "DataRoaming\030\001 \001(\010\022N\n\022operatorSelectMode\030" +
+      "\002 \001(\01622.openxc.NetworkOperatorSettings.O" +
+      "peratorSelectMode\022L\n\021networkDescriptor\030\003",
+      " \001(\01321.openxc.NetworkOperatorSettings.Ne" +
+      "tworkDescriptor\032\230\001\n\021NetworkDescriptor\022\014\n" +
+      "\004PLMN\030\001 \001(\r\022R\n\013networkType\030\002 \001(\0162=.openx" +
+      "c.NetworkOperatorSettings.NetworkDescrip" +
+      "tor.NetworkType\"!\n\013NetworkType\022\007\n\003GSM\020\000\022" +
+      "\t\n\005UTRAN\020\002\"c\n\022OperatorSelectMode\022\r\n\tAUTO" +
+      "MATIC\020\000\022\n\n\006MANUAL\020\001\022\016\n\nDEREGISTER\020\002\022\014\n\010S" +
+      "ET_ONLY\020\003\022\024\n\020MANUAL_AUTOMATIC\020\004\"\"\n\023Netwo" +
+      "rkDataSettings\022\013\n\003APN\030\001 \001(\t\"3\n\025ServerCon" +
+      "nectSettings\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 \001(\r",
+      "\"\325\001\n\031ModemConfigurationCommand\022@\n\027networ" +
+      "kOperatorSettings\030\001 \001(\0132\037.openxc.Network" +
+      "OperatorSettings\0228\n\023networkDataSettings\030" +
+      "\002 \001(\0132\033.openxc.NetworkDataSettings\022<\n\025se" +
+      "rverConnectSettings\030\003 \001(\0132\035.openxc.Serve" +
+      "rConnectSettings\",\n\027RTCConfigurationComm" +
+      "and\022\021\n\tunix_time\030\001 \001(\r\"]\n\017CommandRespons" +
+      "e\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCommand." +
+      "Type\022\017\n\007message\030\002 \001(\t\022\016\n\006status\030\003 \001(\010\"\375\001" +
+      "\n\021DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nmess",
+      "age_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022" +
+      "\017\n\007payload\030\005 \001(\014\022\032\n\022multiple_responses\030\006" +
+      " \001(\010\022\021\n\tfrequency\030\007 \001(\001\022\014\n\004name\030\010 \001(\t\022;\n" +
+      "\014decoded_type\030\t \001(\0162%.openxc.DiagnosticR" +
+      "equest.DecodedType\"!\n\013DecodedType\022\010\n\004NON" +
+      "E\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022DiagnosticResponse\022\013\n\003" +
+      "bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mode\030\003 " +
+      "\001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005 \001(\010\022\036\n\026neg" +
+      "ative_response_code\030\006 \001(\r\022\017\n\007payload\030\007 \001" +
+      "(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n\004ty",
+      "pe\030\001 \001(\0162\031.openxc.DynamicField.Type\022\024\n\014s" +
+      "tring_value\030\002 \001(\t\022\025\n\rnumeric_value\030\003 \001(\001" +
+      "\022\025\n\rboolean_value\030\004 \001(\010\"%\n\004Type\022\n\n\006STRIN" +
+      "G\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"g\n\rSimpleMessage\022" +
+      "\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.openxc.Dy" +
+      "namicField\022#\n\005event\030\003 \001(\0132\024.openxc.Dynam" +
+      "icFieldB\034\n\ncom.openxcB\016BinaryMessages"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index 218e1ab..ceacf25 100644 (file)
--- a/gen/python/openxc_pb2.py
+++ b/gen/python/openxc_pb2.py
@@ -11,7 +11,7 @@ from google.protobuf import descriptor_pb2
 DESCRIPTOR = descriptor.FileDescriptor(
   name='openxc.proto',
   package='openxc',
-  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x98\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x0e\n\x06uptime\x18\x07 \x01(\r\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\xf4\x05\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\x12\x42\n\x19rtc_configuration_command\x18\x08 \x01(\x0b\x32\x1f.openxc.RTCConfigurationCommand\"\xc3\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\x12\x15\n\x11RTC_CONFIGURATION\x10\t\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"\x8c\x01\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"8\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\x12\x0f\n\x0bMESSAGEPACK\x10\x03\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\",\n\x17RTCConfigurationCommand\x12\x11\n\tunix_time\x18\x01 \x01(\r\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
+  serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x98\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x0e\n\x06uptime\x18\x07 \x01(\r\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\x89\x06\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\x12\x42\n\x19rtc_configuration_command\x18\x08 \x01(\x0b\x32\x1f.openxc.RTCConfigurationCommand\"\xd8\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\x12\x15\n\x11RTC_CONFIGURATION\x10\t\x12\x13\n\x0fSD_MOUNT_STATUS\x10\n\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"\x8c\x01\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"8\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\x12\x0f\n\x0bMESSAGEPACK\x10\x03\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\",\n\x17RTCConfigurationCommand\x12\x11\n\tunix_time\x18\x01 \x01(\r\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
 
 
 
@@ -111,11 +111,15 @@ _CONTROLCOMMAND_TYPE = descriptor.EnumDescriptor(
       name='RTC_CONFIGURATION', index=8, number=9,
       options=None,
       type=None),
+    descriptor.EnumValueDescriptor(
+      name='SD_MOUNT_STATUS', index=9, number=10,
+      options=None,
+      type=None),
   ],
   containing_type=None,
   options=None,
   serialized_start=1148,
-  serialized_end=1343,
+  serialized_end=1364,
 )
 
 _DIAGNOSTICCONTROLCOMMAND_ACTION = descriptor.EnumDescriptor(
@@ -135,8 +139,8 @@ _DIAGNOSTICCONTROLCOMMAND_ACTION = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1475,
-  serialized_end=1504,
+  serialized_start=1496,
+  serialized_end=1525,
 )
 
 _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = descriptor.EnumDescriptor(
@@ -160,8 +164,8 @@ _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=1716,
-  serialized_end=1772,
+  serialized_start=1737,
+  serialized_end=1793,
 )
 
 _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = descriptor.EnumDescriptor(
@@ -181,8 +185,8 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = descriptor.EnumDescript
   ],
   containing_type=None,
   options=None,
-  serialized_start=2156,
-  serialized_end=2189,
+  serialized_start=2177,
+  serialized_end=2210,
 )
 
 _NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = descriptor.EnumDescriptor(
@@ -214,8 +218,8 @@ _NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=2191,
-  serialized_end=2290,
+  serialized_start=2212,
+  serialized_end=2311,
 )
 
 _DIAGNOSTICREQUEST_DECODEDTYPE = descriptor.EnumDescriptor(
@@ -235,8 +239,8 @@ _DIAGNOSTICREQUEST_DECODEDTYPE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=2959,
-  serialized_end=2992,
+  serialized_start=2980,
+  serialized_end=3013,
 )
 
 _DYNAMICFIELD_TYPE = descriptor.EnumDescriptor(
@@ -260,8 +264,8 @@ _DYNAMICFIELD_TYPE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=3284,
-  serialized_end=3321,
+  serialized_start=3305,
+  serialized_end=3342,
 )
 
 
@@ -460,7 +464,7 @@ _CONTROLCOMMAND = descriptor.Descriptor(
   is_extendable=False,
   extension_ranges=[],
   serialized_start=587,
-  serialized_end=1343,
+  serialized_end=1364,
 )
 
 
@@ -495,8 +499,8 @@ _DIAGNOSTICCONTROLCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1346,
-  serialized_end=1504,
+  serialized_start=1367,
+  serialized_end=1525,
 )
 
 
@@ -530,8 +534,8 @@ _PASSTHROUGHMODECONTROLCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1506,
-  serialized_end=1567,
+  serialized_start=1527,
+  serialized_end=1588,
 )
 
 
@@ -565,8 +569,8 @@ _ACCEPTANCEFILTERBYPASSCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1569,
-  serialized_end=1629,
+  serialized_start=1590,
+  serialized_end=1650,
 )
 
 
@@ -594,8 +598,8 @@ _PAYLOADFORMATCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1632,
-  serialized_end=1772,
+  serialized_start=1653,
+  serialized_end=1793,
 )
 
 
@@ -622,8 +626,8 @@ _PREDEFINEDOBD2REQUESTSCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1774,
-  serialized_end=1822,
+  serialized_start=1795,
+  serialized_end=1843,
 )
 
 
@@ -658,8 +662,8 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2037,
-  serialized_end=2189,
+  serialized_start=2058,
+  serialized_end=2210,
 )
 
 _NETWORKOPERATORSETTINGS = descriptor.Descriptor(
@@ -700,8 +704,8 @@ _NETWORKOPERATORSETTINGS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=1825,
-  serialized_end=2290,
+  serialized_start=1846,
+  serialized_end=2311,
 )
 
 
@@ -728,8 +732,8 @@ _NETWORKDATASETTINGS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2292,
-  serialized_end=2326,
+  serialized_start=2313,
+  serialized_end=2347,
 )
 
 
@@ -763,8 +767,8 @@ _SERVERCONNECTSETTINGS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2328,
-  serialized_end=2379,
+  serialized_start=2349,
+  serialized_end=2400,
 )
 
 
@@ -805,8 +809,8 @@ _MODEMCONFIGURATIONCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2382,
-  serialized_end=2595,
+  serialized_start=2403,
+  serialized_end=2616,
 )
 
 
@@ -833,8 +837,8 @@ _RTCCONFIGURATIONCOMMAND = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2597,
-  serialized_end=2641,
+  serialized_start=2618,
+  serialized_end=2662,
 )
 
 
@@ -875,8 +879,8 @@ _COMMANDRESPONSE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2643,
-  serialized_end=2736,
+  serialized_start=2664,
+  serialized_end=2757,
 )
 
 
@@ -960,8 +964,8 @@ _DIAGNOSTICREQUEST = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2739,
-  serialized_end=2992,
+  serialized_start=2760,
+  serialized_end=3013,
 )
 
 
@@ -1037,8 +1041,8 @@ _DIAGNOSTICRESPONSE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=2995,
-  serialized_end=3156,
+  serialized_start=3016,
+  serialized_end=3177,
 )
 
 
@@ -1087,8 +1091,8 @@ _DYNAMICFIELD = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=3159,
-  serialized_end=3321,
+  serialized_start=3180,
+  serialized_end=3342,
 )
 
 
@@ -1129,8 +1133,8 @@ _SIMPLEMESSAGE = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=3323,
-  serialized_end=3426,
+  serialized_start=3344,
+  serialized_end=3447,
 )
 
 _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE

diff --git a/openxc.proto b/openxc.proto
index ec355e9..7653212 100644 (file)
--- a/openxc.proto
+++ b/openxc.proto
@@ -38,6 +38,7 @@ message ControlCommand {
         PREDEFINED_OBD2_REQUESTS = 7;
                MODEM_CONFIGURATION = 8;
                RTC_CONFIGURATION = 9;
+               SD_MOUNT_STATUS = 10;
     }
 
     optional Type type = 1;