Master mergerefactor

1 files changed, 6 insertions, 17 deletions

diff --git a/data.proto b/data.proto
index 1506fb0..b704d05 100644
--- a/data.proto
+++ b/data.proto
@@ -50,22 +50,11 @@ message m2s_CTS {
     required uint32 timeout = 1;
 }
 
-/* Commands when SOR code is 3 */
-message m2s_command {
-    optional uint32 source_module_id    = 1 [default=1];
-    optional uint32 source_i2c_address  = 2 [default=1];
-    
-    optional bytes  cmd_bytes = 3;
-    optional string cmd_str   = 4;    
-}
-
-/* Commands from slave */
-message s2m_command {
-    optional uint32 dest_module_id           = 1;
-    repeated uint32 dest_module_id_multicast = 2;
-    
-    optional bytes cmd_bytes                 = 3;
-    optional string cmd_str                  = 4;
+message command {
+    required uint32 source_module_id   = 1;
+    required uint32 dest_module_id     = 2;
+    optional bytes cmd_bytes           = 3;
+    optional string cmd_str            = 4;
 }
 
 message _datapoint {
@@ -80,4 +69,4 @@ message _datapoint {
 
 message s2m_data {
     repeated _datapoint datapoints = 1;
-}
\ No newline at end of file
+}