updated primary protobuf messages to 100% reflect setapp

nmakel · Mar 31, 2020 · cec1431 · cec1431
1 parent ff87c1a
commit cec1431
Show file tree

Hide file tree

Showing 6 changed files with 5,013 additions and 1,120 deletions.
diff --git a/messages/information.proto b/messages/information.proto
@@ -1,40 +1,56 @@
 syntax = "proto3";
 
+
 message Information {
 
-    message Version {
-        int32 major = 1;
-        int32 minor = 2;
-        int32 build = 3;
+    message UInt32KeyVal {
+        uint32 key = 1;
+        uint32 value = 2;    
     }
 
-    message Errors {
-        message Error {
-            message Date {
-                int32 year = 1;
-                int32 month = 2;
-                int32 day = 3;
-                int32 hour = 4;
-                int32 minute = 5;
-                int32 second = 6;
-            }
+    message StringKeyVal {
+        string key = 1;
+        string value = 2;
+    }
 
-            int32 errorCode = 1;
-            Date startTime = 2;
-        }
+    message Date {
+        uint32 year = 1;
+        uint32 month = 2;
+        uint32 day = 3;
+        uint32 hour = 4;
+        uint32 minute = 5;
+        uint32 second = 6;
+    }
 
-        message Logger {
-            int32 controllerid = 1;
-            int32 subsystem = 2;
-            repeated Error errorsList = 3;
+    message Version {
+        uint32 major = 1;
+        uint32 minor = 2;
+        uint32 build = 3;
+        uint32 ci_build = 4;
+    }
+
+    message ControllersErrors {
+        message ErrorsLogger {
+            message Error {
+                uint32 error_code = 1;
+                Date start_time = 2;
+            }
+
+            uint32 controllerID = 1;
+            uint32 subsystem = 2;
+            repeated Error errors = 3;
         }
 
-        repeated Logger loggerList = 1;
+        repeated ErrorsLogger loggers = 1;
     }
 
     string sn = 1;
     Version cpu = 2;
     Version dsp1 = 3;
     Version dsp2 = 4;
-    Errors errors = 8;
+    StringKeyVal hw_ids = 5;
+    UInt32KeyVal error_log = 6;
+    UInt32KeyVal warning_log = 7;
+    ControllersErrors errors = 8;
+    Version bui_version = 9;
 }
diff --git a/messages/maintenance.proto b/messages/maintenance.proto
@@ -1,97 +1,238 @@
 syntax = "proto3";
 
-message Maintenance {
 
-    message Int32ValueScaling {
+message Maintenance {
+
+    message Float32 {
         int32 value = 1;
         int32 scaling = 2;
     }
 
-    message Time {
-        message CurrentTime {
-            int32 year = 1;
-            int32 month = 2;
-            int32 day = 3;
-            int32 hour = 4;
-            int32 minute = 5;
-            int32 second = 6;
+    message BoolVal {
+        bool value = 1;
+        bool ro = 2;
+    }
+
+    message StringVal {
+        string value = 1;
+        bool ro = 2;
+    }
+
+    message DateAndTime {
+        message Date {
+            uint32 year = 1;
+            uint32 month = 2;
+            uint32 day = 3;
+            uint32 hour = 4;
+            uint32 minute = 5;
+            uint32 second = 6;
         }
-        
-        CurrentTime date = 1;
+
+        Date date = 1;
         string ntp = 2;
-        int32 gmtOffset = 3;
+        int32 gmt_offset = 3;
     }
 
-    message AFCI {
+    message Temperature {
+        message Units {
+            bool celsius = 1;
+            bool fahrenheit = 2;
+        }
+
+        uint32 value = 1;
+        Units units = 2;
+    }
+
+    message Afci {
         message Test {
-            int32 result = 1;
+            enum AfciTestResult {
+                AFCI_TEST_FAIL = 0;
+                AFCI_TEST_ERROR = -1;
+                AFCI_TEST_PASS = 1;
+            }
+
+            AfciTestResult result = 1;
+            uint32 timeout = 2;
         }
 
         bool enable = 1;
-        bool manualReconnect = 2;
+        bool manual_reconnect = 2;
         Test test = 3;
+        bool dsp_error = 4;
     }
 
-    message Header {
-        string id = 1;
-        int32 timestamp = 2;
-    }
-
-    message Standby {
-        bool activated = 1;
-    }
+    message FwUpgrade {}
+    message Backup {}
 
     message Diagnostics {
         message Inverters {
-            message Inverter {
+            message Unit {
+                message Optimizer {
+                    string sn = 1;
+                    bool reports = 2;
+                    DateAndTime.Date date = 3;
+                    Float32 energy = 4;
+                    uint32 output_v = 5;
+                    uint32 input_v = 6;
+                    uint32 input_c = 7;
+                    Temperature temperature = 8;
+                }
+
                 message Isolation {
-                    Int32ValueScaling alpha = 1;
-                    Int32ValueScaling rIso = 2;
-                    int32 faultLocation = 3;
+                    Float32 alpha = 1;
+                    Float32 r_iso = 2;
+                    int32 fault_location = 3;
                 }
 
                 message OptimizersStatus {
-                    int32 enabled = 1;
-                    int32 connected = 2;
+                    uint32 enabled = 1;
+                    uint32 connected = 2; 
                 }
 
-                message Temperature {
-                    message Units {
-                        bool celsius = 1;
-                        bool fahrenheit = 2;
+                message SelfTest {
+                    enum TestCondition {
+                        TEST_COND_OK = 0;
+                        TEST_COND_NOT_READY_GRM = 1;
+                        TEST_COND_NOT_READY_PROD = 2;
+                        TEST_COND_NOT_READY_INV_OFF = 3;
                     }
 
-                    int32 value = 1;
-                    Units units = 2;
+                    message Test {
+                        message SettingsValues {
+                            Float32 vgmax = 1;
+                            Float32 vgmin = 2;
+                            Float32 fgmax = 3;
+                            Float32 fgmin = 4;
+                            uint32 holdtime = 5;
+                        }
+
+                        message ResultsValues {
+                            Float32 trip_value = 1;
+                            uint32 trip_time = 2;
+                        }
+
+                        enum TestStatus {
+                            TEST_STATUS_NOT_TESTED = 0;
+                            TEST_STATUS_PASSED = 1;
+                            TEST_STATUS_FAILED = 2;
+                        }
+
+                        uint32 idx = 1;
+                        string name = 2;
+                        SettingsValues settings = 3;
+                        ResultsValues result = 4;
+                        TestStatus status = 5;
+                    }
+
+                    TestCondition test_condition = 1;
+                    repeated Test tests = 2;
                 }
 
-                message Optimizer {
-                    string sn = 1;
-                    bool reports = 2;
-                    Time.CurrentTime date = 3;
-                    int32 outputV = 5;
-                    int32 inputV = 6;
-                    int32 inputC = 7;
-                    Temperature temperature = 8;
+                message QuadOptimizer {
+                    StringVal sn = 1;
+                    BoolVal reports = 2;
+                    Optimizer optimizer_1 = 3;
+                    Optimizer optimizer_2 = 4;
+                    Optimizer optimizer_3 = 5;
+                    Optimizer optimizer_4 = 6;
                 }
 
-                string invSn = 1;
-                repeated Optimizer optimizerList = 2;
+                string inv_sn = 1;
+                repeated Optimizer optimizer = 2;
                 Isolation isolation = 3;
-                OptimizersStatus optimizersStatus = 4;
+                OptimizersStatus optimizers_status = 4;
+                SelfTest self_test = 5;
+                repeated QuadOptimizer quad_optimizer = 6;
+            }
+
+            Unit left = 1;
+            Unit primary = 2;
+            Unit right = 3;
+        }
+
+        message BatterySelfTest {
+            enum PreCondition {
+                TEST_PRE_COND_OK = 0;
+                TEST_PRE_COND_NOT_READY_INV_OFF = 1;
+                TEST_PRE_COND_NOT_READY_INV_COMM_ERROR = 2;
+                TEST_PRE_COND_NOT_READY_INV_BATT_ERROR = 3;
+                TEST_PRE_COND_NOT_READY_MIN_SOE = 4;
             }
 
-            Inverter left = 1;
-            Inverter primary = 2;
-            Inverter right = 3;
+            enum BatteryTestStatus {
+                NOT_TESTED = 0;
+                IN_PROGRESS = 1;
+                PASSED = 2;
+                FAILED = 3;
+            }
+
+            message BatteryTest {
+                uint32 idx = 1;
+                string battery_sn = 2;
+                int32 battery_power = 3;
+                BatteryTestStatus communication = 4;
+                BatteryTestStatus charge = 5;
+                BatteryTestStatus discharge = 6;
+            }
+
+            message BatteryPackTest {
+                BatteryTestStatus package_test_status = 1;
+                DateAndTime.Date date = 2;
+                BatteryTest battery_test = 3;
+            }
+
+            PreCondition pre_condition = 1;
+            BatteryTest current_test = 2;
+            BatteryTest test_results = 3;
+            BoolVal start_test = 4;
+            BoolVal stop_test = 5;
         }
 
         Inverters inverters = 1;
+        BatterySelfTest battery_self_test = 2;
+    }
+
+    message Standby {
+        bool activated = 1;
+    }
+
+    message GridProtection {
+        message Trip {
+            Float32 value = 1;
+            uint32 holdtime = 2;
+        }
+
+        Trip vg_max = 1;
+        Trip vg_min = 2;
+        Trip fg_max = 3;
+        Trip fg_min = 4;
+        uint32 grm_time = 5;
+        Trip v_line_max = 6;
+        Trip v_line_min = 7;
+    }
+
+    message BoardReplacement {}
+
+    message GridProtectionLogin {
+        string password = 1;
+    }
+
+    message Header {
+        string id = 1;
+        uint32 timestamp = 2;
     }
 
-    Time dateAndTime = 1;
-    AFCI afci = 3;
+    DateAndTime date_and_time = 1;
+    Temperature temperature = 2;
+    Afci afci = 3;
+    FwUpgrade fw_upgrade = 4;
+    Backup backup = 5;
     Diagnostics diagnostics = 6;
     Standby standby = 7;
+    GridProtection grid_protection = 8;
+    BoardReplacement board_replacement = 9;
+    bool factory_reset = 10;
+    bool reset_counters = 11;
+    GridProtectionLogin grid_protection_login = 12;
     Header header = 13;
 }