Dragino parser

src/udi/handlers/ttn/models/emuProfIILoRaCfg1/emuProfIILoRaCfg1.go

@@ -177,83 +177,81 @@ type emuMessage1 struct {
 
 
 
-func Parse(fPort int, decodedPayload []byte) (map[string]database.VariableType, error) {
+func Parse(fPort int, decodedPayload []byte, variables *map[string]database.VariableType) error {
   //log.Printf("Parse input: %d, %s", fPort, decodedPayload)
   switch fPort {
   case 1:
     var emuMessage1 emuMessage1
     err := json.Unmarshal(decodedPayload, &emuMessage1)
     if err != nil {
-      return nil, fmt.Errorf("Unable to parse payload, fPort %d, error %s", fPort, err)
+      return fmt.Errorf("Unable to parse payload, fPort %d, error %s", fPort, err)
     }
-    variables := make(map[string]database.VariableType)
-    variables["ActivePowerL1"] = database.VariableType { 
+    (*variables)["ActivePowerL1"] = database.VariableType { 
       Variable: "ActivePowerL1", 
       Unit: emuMessage1.ActivePowerL1.Unit,
       Value: emuMessage1.ActivePowerL1.Value,
     }
-    variables["ActivePowerL2"] = database.VariableType { 
+    (*variables)["ActivePowerL2"] = database.VariableType { 
       Variable: "ActivePowerL2", 
       Unit: emuMessage1.ActivePowerL2.Unit,
       Value: emuMessage1.ActivePowerL2.Value,
     }
-    variables["ActivePowerL3"] = database.VariableType { 
+    (*variables)["ActivePowerL3"] = database.VariableType { 
       Variable: "ActivePowerL3", 
       Unit: emuMessage1.ActivePowerL3.Unit,
       Value: emuMessage1.ActivePowerL3.Value,
     }
-    variables["ActivePowerL123"] = database.VariableType { 
+    (*variables)["ActivePowerL123"] = database.VariableType { 
       Variable: "ActivePowerL123", 
       Unit: emuMessage1.ActivePowerL123.Unit,
       Value: emuMessage1.ActivePowerL123.Value,
     }
-    variables["PowerfactorL1"] = database.VariableType { 
+    (*variables)["PowerfactorL1"] = database.VariableType { 
       Variable: "PowerfactorL1", 
       Unit: emuMessage1.PowerfactorL1.Unit,
       Value: emuMessage1.PowerfactorL1.Value,
     }
-    variables["PowerfactorL2"] = database.VariableType { 
+    (*variables)["PowerfactorL2"] = database.VariableType { 
       Variable: "PowerfactorL2", 
       Unit: emuMessage1.PowerfactorL2.Unit,
       Value: emuMessage1.PowerfactorL2.Value,
     }
-    variables["PowerfactorL3"] = database.VariableType { 
+    (*variables)["PowerfactorL3"] = database.VariableType { 
       Variable: "PowerfactorL3", 
       Unit: emuMessage1.PowerfactorL3.Unit,
       Value: emuMessage1.PowerfactorL3.Value,
     }
 
-    return variables, nil
+    return nil
   case 2:
     var emuMessage2 emuMessage2
     err := json.Unmarshal(decodedPayload, &emuMessage2)
     if err != nil {
-      return nil, fmt.Errorf("Unable to parse payload, fPort %d, error %s", fPort, err)
+      return fmt.Errorf("Unable to parse payload, fPort %d, error %s", fPort, err)
     }
-    variables := make(map[string]database.VariableType)
-    variables["ActiveEnergyExport"] = database.VariableType { 
+    (*variables)["ActiveEnergyExport"] = database.VariableType { 
       Variable: "ActiveEnergyExport", 
       Unit: emuMessage2.ActiveEnergyExport.Unit,
       Value: emuMessage2.ActiveEnergyExport.Value,
     }
-    variables["ActiveEnergyImport"] = database.VariableType { 
+    (*variables)["ActiveEnergyImport"] = database.VariableType { 
       Variable: "ActiveEnergyImport", 
       Unit: emuMessage2.ActiveEnergyImport.Unit,
       Value: emuMessage2.ActiveEnergyImport.Value,
     }
-    variables["ReactiveEnergyExport"] = database.VariableType { 
+    (*variables)["ReactiveEnergyExport"] = database.VariableType { 
       Variable: "ReactiveEnergyExport", 
       Unit: emuMessage2.ReactiveEnergyExport.Unit,
       Value: emuMessage2.ReactiveEnergyExport.Value,
     }
-    variables["ReactiveEnergyImport"] = database.VariableType { 
+    (*variables)["ReactiveEnergyImport"] = database.VariableType { 
       Variable: "ReactiveEnergyImport", 
       Unit: emuMessage2.ReactiveEnergyImport.Unit,
       Value: emuMessage2.ReactiveEnergyImport.Value,
     }
-    return variables, nil
+    return nil
   default:
-    return nil, fmt.Errorf("Unexpected fPort %d", fPort)
+    return fmt.Errorf("Unexpected fPort %d", fPort)
   }
 }