diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp index 227dee8c..cfdf2982 100644 --- a/Software/src/devboard/webserver/webserver.cpp +++ b/Software/src/devboard/webserver/webserver.cpp @@ -685,7 +685,7 @@ String processor(const String& var) { content += "

Power status: " + String(get_emulator_pause_status().c_str()) + "

"; #ifdef CONTACTOR_CONTROL - content += "

Contactors controlled by Battery-Emulator: "; + content += "

Contactors controlled by emulator, state: "; if (datalayer.system.status.contactors_engaged) { content += "ON"; } else { @@ -693,13 +693,21 @@ String processor(const String& var) { } content += "

"; - content += "

Pre Charge: "; - if (digitalRead(PRECHARGE_PIN) == HIGH) { - content += ""; + content += "

Precharge: ("; + content += PRECHARGE_TIME_MS; + content += " ms) Cont. Neg.: "; +#ifdef PWM_CONTACTOR_CONTROL + if (datalayer.system.status.contactors_engaged) { + content += "Economized"; + content += " Cont. Pos.: "; + content += "Economized"; } else { content += ""; + content += " Cont. Pos.: "; + content += ""; } - content += " Cont. Neg.: "; + +#else // No PWM_CONTACTOR_CONTROL , we can read the pin and see feedback. Helpful if channel overloaded if (digitalRead(NEGATIVE_CONTACTOR_PIN) == HIGH) { content += ""; } else { @@ -712,6 +720,7 @@ String processor(const String& var) { } else { content += ""; } +#endif //no PWM_CONTACTOR_CONTROL content += "

"; #endif @@ -816,7 +825,7 @@ String processor(const String& var) { content += "

Power status: " + String(get_emulator_pause_status().c_str()) + "

"; #ifdef CONTACTOR_CONTROL - content += "

Contactors controlled by Battery-Emulator: "; + content += "

Contactors controlled by emulator, state: "; if (datalayer.system.status.contactors_battery2_engaged) { content += "ON"; } else { @@ -824,13 +833,19 @@ String processor(const String& var) { } content += "

"; #ifdef CONTACTOR_CONTROL_DOUBLE_BATTERY - content += "

Pre Charge: "; - if (digitalRead(SECOND_PRECHARGE_PIN) == HIGH) { - content += ""; + content += "

Cont. Neg.: "; +#ifdef PWM_CONTACTOR_CONTROL + if (datalayer.system.status.contactors_battery2_engaged) { + content += "Economized"; + content += " Cont. Pos.: "; + content += "Economized"; } else { content += ""; + content += " Cont. Pos.: "; + content += ""; } - content += " Cont. Neg.: "; + +#else // No PWM_CONTACTOR_CONTROL , we can read the pin and see feedback. Helpful if channel overloaded if (digitalRead(SECOND_NEGATIVE_CONTACTOR_PIN) == HIGH) { content += ""; } else { @@ -843,6 +858,7 @@ String processor(const String& var) { } else { content += ""; } +#endif //no PWM_CONTACTOR_CONTROL content += "

"; #endif // CONTACTOR_CONTROL_DOUBLE_BATTERY #endif // CONTACTOR_CONTROL