added ability to add data to JSON output

irekzielinski · Jul 28, 2016 · 10016bf · 10016bf
1 parent 6ce2463
commit 10016bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Libraries/PMax/pmax.cpp b/Libraries/PMax/pmax.cpp
@@ -1790,6 +1790,8 @@ void PowerMaxAlarm::dumpToJson(IOutput* outputStream)
 {
     outputStream->write("{");
     {
+        OnDumpToJsonStarted(outputStream);
+
         outputStream->writeJsonTag("stat", stat);
         outputStream->writeJsonTag("stat_str", GetStrPmaxSystemStatus(stat));
         outputStream->writeJsonTag("lastCom", (int)getSecondsFromLastComm());

diff --git a/Libraries/PMax/pmax.h b/Libraries/PMax/pmax.h
@@ -328,6 +328,9 @@ class PowerMaxAlarm
     //parameters     : see setDateTime function
     virtual void OnPanelDateTime(unsigned char year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minutes, unsigned char seconds){};
 
+    //Allows to add extra fields to json output
+    virtual void OnDumpToJsonStarted(IOutput* outputStream){};
+
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //those functions provide string representation of various types in alarm, you can override to provide your own text
     virtual const char* GetStrPmaxSystemStatus(int index);
@@ -338,6 +341,7 @@ class PowerMaxAlarm
     virtual const char* GetStrPmaxZoneTypes(int index);
     virtual const char* GetStrPmaxEventSource(int index);
 
+    SystemStatus GetSystemStatus() const { return stat;} 
 protected:
     void addPin(unsigned char* bufferToSend, int pos = 4, bool useMasterCode = false);