Format all status output by field

2026-06-07 13:27:29 +09:00
parent 9ebe8656fb
commit bef37b792f
3 changed files with 25 additions and 38 deletions
@@ -583,45 +583,26 @@ void printStatus(const __FlashStringHelper *tag) {
  Serial.print(tag);
  Serial.println(F("]"));
  printUptime();
-  Serial.print(F("raw="));
-  Serial.print(parkingRawValue);
-  Serial.print(F(" ig="));
-  Serial.print(ignitionState == HIGH ? 1 : 0);
-  Serial.print(F(" p="));
-  Serial.print(parkingState == HIGH ? 1 : 0);
-  Serial.print(F(" rawDrive="));
-  Serial.print(getRawDriveMode() == HIGH ? 1 : 0);
-  Serial.print(F(" confirmedDrive="));
-  Serial.println(confirmedDriveMode == HIGH ? 1 : 0);
-
-  Serial.print(F("currentMs="));
-  Serial.print(currentPosMs);
-  Serial.print(F(" targetMs="));
-  Serial.print(targetPosMs);
-  Serial.print(F(" savedPositionMs="));
-  Serial.print(storedSeatPositionMs);
-  Serial.print(F(" hardLimitMs="));
-  Serial.println(SEAT_HARD_LIMIT_UP_MS);
-
-  Serial.print(F("requestedRelay="));
-  Serial.print(requestedSeatAction);
-  Serial.print(F(" actualRelay="));
-  Serial.print(currentSeatAction);
-  Serial.print(F(" manualMode="));
-  Serial.print(manualMode ? 1 : 0);
-  Serial.print(F(" stabilizing="));
-  Serial.println(isStabilizing ? 1 : 0);
-
+  printNamedInt(F("raw"), parkingRawValue);
+  printNamedBool(F("ig"), ignitionState == HIGH);
+  printNamedBool(F("p"), parkingState == HIGH);
+  printNamedBool(F("rawDrive"), getRawDriveMode() == HIGH);
+  printNamedBool(F("confirmedDrive"), confirmedDriveMode == HIGH);
+  printNamedLong(F("currentMs"), currentPosMs);
+  printNamedLong(F("targetMs"), targetPosMs);
+  printNamedInt(F("savedPositionMs"), storedSeatPositionMs);
+  printNamedInt(F("hardLimitMs"), SEAT_HARD_LIMIT_UP_MS);
+  printNamedInt(F("requestedRelay"), requestedSeatAction);
+  printNamedInt(F("actualRelay"), currentSeatAction);
+  printNamedBool(F("manualMode"), manualMode);
+  printNamedBool(F("stabilizing"), isStabilizing);
  Serial.print(F("useCount="));
  Serial.print(useCount);
  Serial.print(F("/"));
-  Serial.print(USES_BEFORE_AUTO_CALIBRATION);
-  Serial.print(F(" autoPending="));
-  Serial.print(autoCalibrationPending ? 1 : 0);
-  Serial.print(F(" forceCal="));
-  Serial.print(forceCalibration ? 1 : 0);
-  Serial.print(F(" autoCalState="));
-  Serial.println(autoCalibrationState);
+  Serial.println(USES_BEFORE_AUTO_CALIBRATION);
+  printNamedBool(F("autoPending"), autoCalibrationPending);
+  printNamedBool(F("forceCal"), forceCalibration);
+  printNamedInt(F("autoCalState"), autoCalibrationState);
  printAutoCalibrationDelayStatus();
 }