Skip to content
Snippets Groups Projects
Commit e172202d authored by Cyril Danilevski's avatar Cyril Danilevski :scooter:
Browse files

Clarify channel ramp status

parent dd33d35c
No related branches found
No related tags found
No related merge requests found
Pipeline #162615 passed
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
MPOD::MPOD() { MPOD::MPOD() {
bool _on = false; bool _on = false;
bool _up = false; bool _rampingUp = false;
bool _down = false; bool _rampingDown = false;
float _measurementSenseVoltage = 0; float _measurementSenseVoltage = 0;
float _measurementCurrent = 0; float _measurementCurrent = 0;
float _voltage = 0; float _voltage = 0;
...@@ -63,8 +63,8 @@ bool MPOD::message(const SNMP::Message *message) { ...@@ -63,8 +63,8 @@ bool MPOD::message(const SNMP::Message *message) {
// OUTPUTSTATUS is defined in MIB as BITS but encoded as OCTETSTRING by MPOD // OUTPUTSTATUS is defined in MIB as BITS but encoded as OCTETSTRING by MPOD
OctetStringBER *status = static_cast<OctetStringBER *>(varbind->getValue()); OctetStringBER *status = static_cast<OctetStringBER *>(varbind->getValue());
_on = status->getBit(0); _on = status->getBit(0);
_up = status->getBit(11); _rampingUp = status->getBit(11);
_down = status->getBit(12); _rampingDown = status->getBit(12);
} }
found++; found++;
break; break;
...@@ -108,9 +108,9 @@ bool MPOD::message(const SNMP::Message *message) { ...@@ -108,9 +108,9 @@ bool MPOD::message(const SNMP::Message *message) {
bool MPOD::isOn() const { return _on; } bool MPOD::isOn() const { return _on; }
bool MPOD::isUp() const { return _up; } bool MPOD::isRampingUp() const { return _rampingUp; }
bool MPOD::isDown() const { return _down; } bool MPOD::isRampingDown() const { return _rampingDown; }
float MPOD::getMeasurementSenseVoltage() const { return _measurementSenseVoltage; } float MPOD::getMeasurementSenseVoltage() const { return _measurementSenseVoltage; }
...@@ -139,8 +139,8 @@ String MPOD::toJSON() { ...@@ -139,8 +139,8 @@ String MPOD::toJSON() {
String json = "\"status\":{\n"; String json = "\"status\":{\n";
json += "\"channel\":" + String(getChannel()) + ","; json += "\"channel\":" + String(getChannel()) + ",";
json += "\"is_on\":" + String(isOn()) + ","; json += "\"is_on\":" + String(isOn()) + ",";
json += "\"is_up\":" + String(isUp()) + ","; json += "\"ramping_up\":" + String(isRampingUp()) + ",";
json += "\"is_down\":" + String(isDown()) + ","; json += "\"ramping_down\":" + String(isRampingDown()) + ",";
json += "\"sense_voltage\":" + String(getMeasurementSenseVoltage()) + ","; json += "\"sense_voltage\":" + String(getMeasurementSenseVoltage()) + ",";
json += "\"set_voltage\":" + String(getVoltage()) + ","; json += "\"set_voltage\":" + String(getVoltage()) + ",";
json += "\"sense_current\":" + String(getMeasurementCurrent()) + ","; json += "\"sense_current\":" + String(getMeasurementCurrent()) + ",";
...@@ -162,11 +162,11 @@ void onMessage(const SNMP::Message *message, const IPAddress remote, const uint1 ...@@ -162,11 +162,11 @@ void onMessage(const SNMP::Message *message, const IPAddress remote, const uint1
Serial.print("MPOD status: "); Serial.print("MPOD status: ");
Serial.print(mpod.getChannel()); Serial.print(mpod.getChannel());
Serial.print(mpod.isOn() ? " on" : " off"); Serial.print(mpod.isOn() ? " on" : " off");
if (mpod.isUp()) { if (mpod.isRampingUp()) {
Serial.print(" up"); Serial.print(" ramping up");
} }
if (mpod.isDown()) { if (mpod.isRampingDown()) {
Serial.print(" down"); Serial.print(" ramping down");
} }
Serial.println(); Serial.println();
Serial.print("HV voltage "); Serial.print("HV voltage ");
......
...@@ -56,8 +56,8 @@ class MPOD { ...@@ -56,8 +56,8 @@ class MPOD {
SNMP::Message* output(const uint16_t, const bool); SNMP::Message* output(const uint16_t, const bool);
bool message(const SNMP::Message*); bool message(const SNMP::Message*);
bool isOn() const; bool isOn() const;
bool isUp() const; bool isRampingUp() const;
bool isDown() const; bool isRampingDown() const;
float getMeasurementSenseVoltage() const; float getMeasurementSenseVoltage() const;
float getMeasurementCurrent() const; float getMeasurementCurrent() const;
float getVoltage() const; float getVoltage() const;
...@@ -71,8 +71,8 @@ class MPOD { ...@@ -71,8 +71,8 @@ class MPOD {
float getFloatFromVarBind(const VarBind*); float getFloatFromVarBind(const VarBind*);
uint16_t _channel; uint16_t _channel;
bool _on; bool _on;
bool _up; bool _rampingUp;
bool _down; bool _rampingDown;
float _measurementSenseVoltage; float _measurementSenseVoltage;
float _measurementCurrent; float _measurementCurrent;
float _voltage; float _voltage;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment