fix signed values, add missing values

Author: premultiply

meters/rs485/ds100.go

@@ -16,19 +16,14 @@ func NewDS100Producer() Producer {
 	 * See https://data.xn--stromzhler-v5a.eu/manuals/bg_ds100serie_de.pdf
 	 */
 	ops := Opcodes{
-		VoltageL1: 0x0400,
-		VoltageL2: 0x0402,
-		VoltageL3: 0x0404,
-		//VoltageL1_L2:   						0x0406, //mbmd doenst know this yet?
-		//VoltageL2_L3:     					0x0408, //mbmd doenst know this yet?
-		//VoltageL3_L1:     					0x040A, //mbmd doenst know this yet?
-		//VoltageL_N_avg:     					0x040C, //mbmd doenst know this yet?
-		//VoltageL_L_avg:     					0x040E, //mbmd doenst know this yet?
-		CurrentL1: 0x0410,
-		CurrentL2: 0x0412,
-		CurrentL3: 0x0414,
-		Current:   0x0416,
-		//ThreePhase_Vec_A: 	    	0x0418, //mbmd doenst know this
+		VoltageL1:       0x0400,
+		VoltageL2:       0x0402,
+		VoltageL3:       0x0404,
+		Voltage:         0x040C,
+		CurrentL1:       0x0410,
+		CurrentL2:       0x0412,
+		CurrentL3:       0x0414,
+		Current:         0x0418,
 		PowerL1:         0x041A,
 		PowerL2:         0x041C,
 		PowerL3:         0x041E,
@@ -41,36 +36,23 @@ func NewDS100Producer() Producer {
 		ReactivePowerL2: 0x042C,
 		ReactivePowerL3: 0x042E,
 		ReactivePower:   0x0430,
-		//FrequencyL1:						0x0432, //mbmd doenst know this yet?
-		//FrequencyL2:						0x0433, //mbmd doenst know this yet?
-		//FrequencyL3:						0x0434, //mbmd doenst know this yet?
-		Frequency: 0x0435,
-		CosphiL1:  0x0436,
-		CosphiL2:  0x0437,
-		CosphiL3:  0x0438,
-		Cosphi:    0x0439, //implemented from beginning till 0x0439 - 60 Registers so far
-		ImportL1:  0x050A, //A phase forward active energy
-		ImportL2:  0x056E, //B phase forward active energy
-		ImportL3:  0x05D2, //C phase forward active energy
-		Import:    0x010E, //  total forward active energy
-		ExportL1:  0x0514, //A phase reverse active energy
-		ExportL2:  0x0578, //B phase reverse active energy
-		ExportL3:  0x05DC, //C phase reverse active energy
-		Export:    0x118A, //  total reverse active energy
-		SumL1:     0x0500, //A phase total active energy
-		SumL2:     0x0564, //B phase total active energy
-		SumL3:     0x05C8, //C phase total active energy
-		Sum:       0x0122, //  total total active energy
-
-		//THDL1:         0x00ea, // voltage to be checked
-		//THDL2:         0x00ec, // voltage
-		//THDL3:         0x00ee, // voltage
-		//THD:           0x00F8, // voltage
-		//L1THDCurrent: 0x00F0, // current
-		//L2THDCurrent: 0x00F2, // current
-		//L3THDCurrent: 0x00F4, // current
-		//AvgTHDCurrent: 0x00Fa, // current
-		//ApparentImportPower: 0x0064,
+		Frequency:       0x0435,
+		CosphiL1:        0x0436,
+		CosphiL2:        0x0437,
+		CosphiL3:        0x0438,
+		Cosphi:          0x0439,
+		ImportL1:        0x050A, //A phase forward active energy
+		ImportL2:        0x056E, //B phase forward active energy
+		ImportL3:        0x05D2, //C phase forward active energy
+		Import:          0x010E, //  total forward active energy
+		ExportL1:        0x0514, //A phase reverse active energy
+		ExportL2:        0x0578, //B phase reverse active energy
+		ExportL3:        0x05DC, //C phase reverse active energy
+		Export:          0x118A, //  total reverse active energy
+		SumL1:           0x0500, //A phase total active energy
+		SumL2:           0x0564, //B phase total active energy
+		SumL3:           0x05C8, //C phase total active energy
+		Sum:             0x0122, //  total total active energy
 	}
 	return &DS100Producer{Opcodes: ops}
 }
@@ -105,25 +87,50 @@ func (p *DS100Producer) snip32u(iec Measurement, scaler ...float64) Operation {
 	return p.snip(iec, 2, unsigned, RTUUint32ToFloat64, scaler...)
 }
 
+// snip16s creates modbus operation for single register (signed)
+func (p *DS100Producer) snip16s(iec Measurement, scaler ...float64) Operation {
+	return p.snip(iec, 1, signed, RTUInt16ToFloat64, scaler...)
+}
+
+// snip32s creates modbus operation for double register (signed)
+func (p *DS100Producer) snip32s(iec Measurement, scaler ...float64) Operation {
+	return p.snip(iec, 2, signed, RTUInt32ToFloat64, scaler...)
+}
+
 func (p *DS100Producer) Probe() Operation {
 	return p.snip32u(Voltage, 1000)
 }
 
 func (p *DS100Producer) Produce() (res []Operation) {
 	for _, op := range []Measurement{
-		Voltage, Current,
+		VoltageL1, VoltageL2, VoltageL3, Voltage,
 	} {
 		res = append(res, p.snip32u(op, 1000))
 	}
 
 	for _, op := range []Measurement{
-		Power, ApparentPower, ReactivePower,
+		CurrentL1, CurrentL2, CurrentL3, Current,
+	} {
+		res = append(res, p.snip32s(op, 1000))
+	}
+
+	for _, op := range []Measurement{
+		PowerL1, PowerL2, PowerL3, Power,
+		ReactivePowerL1, ReactivePowerL2, ReactivePowerL3, ReactivePower,
+	} {
+		res = append(res, p.snip32s(op, 1))
+	}
+
+	for _, op := range []Measurement{
+		ApparentPowerL1, ApparentPowerL2, ApparentPowerL3, ApparentPower,
 	} {
 		res = append(res, p.snip32u(op, 1))
 	}
 
 	for _, op := range []Measurement{
-		Import, Export, Sum,
+		ImportL1, ImportL2, ImportL3, Import,
+		ExportL1, ExportL2, ExportL3, Export,
+		SumL1, SumL2, SumL3, Sum,
 	} {
 		res = append(res, p.snip32u(op, 100))
 	}
@@ -135,9 +142,9 @@ func (p *DS100Producer) Produce() (res []Operation) {
 	}
 
 	for _, op := range []Measurement{
-		Cosphi,
+		CosphiL1, CosphiL2, CosphiL3, Cosphi,
 	} {
-		res = append(res, p.snip16u(op, 1000))
+		res = append(res, p.snip16s(op, 1000))
 	}
 
 	return res