Replaced MinMaxCurrent by MinCurMax for CAN message compatibility

Aso foxed a compile error for Duet 2 builds

3 files changed, 14 insertions, 14 deletions

diff --git a/src/CAN/CommandProcessor.cpp b/src/CAN/CommandProcessor.cpp
index bfe761d1..5e8e8e95 100644
--- a/src/CAN/CommandProcessor.cpp
+++ b/src/CAN/CommandProcessor.cpp
@@ -309,16 +309,16 @@ static GCodeResult EutGetInfo(const CanMessageReturnInfo& msg, const StringRef&
 		reply.printf("{\"firmwareElectronics\":\"Duet 3 %.0s\"", BOARD_NAME);
 #if HAS_VOLTAGE_MONITOR
 		{
-			const MinMaxCurrent voltages = reprap.GetPlatform().GetPowerVoltages();
+			const MinCurMax voltages = reprap.GetPlatform().GetPowerVoltages();
 			reply.catf(",\"vin\":{\"min\":%.1f,\"cur\":%.1f,\"max\":%.1f}",
-					(double)voltages.min, (double)voltages.current, (double)voltages.max);
+					(double)voltages.minimum, (double)voltages.current, (double)voltages.maximum);
 		}
 #endif
 #if HAS_12V_MONITOR
 		{
-			const MinMaxCurrent voltages = reprap.GetPlatform().GetV12Voltages();
+			const MinCurMax voltages = reprap.GetPlatform().GetV12Voltages();
 			reply.catf(",\"v12\":{\"min\":%.1f,\"cur\":%.1f,\"max\":%.1f}",
-					(double)voltages.min, (double)voltages.current, (double)voltages.max);
+					(double)voltages.minimum, (double)voltages.current, (double)voltages.maximum);
 		}
 #endif
 		reply.cat('}');
@@ -366,8 +366,8 @@ static GCodeResult EutGetInfo(const CanMessageReturnInfo& msg, const StringRef&
 			reply.catf("V12: %.1fn", (double)reprap.GetPlatform().GetCurrentV12Voltage());
 #endif
 #if HAS_CPU_TEMP_SENSOR
-			const MinMaxCurrent temps = reprap.GetPlatform().GetMcuTemperatures();
-			reply.catf("MCU temperature: min %.1fC, current %.1fC, max %.1fC", (double)temps.min, (double)temps.current, (double)temps.max);
+			const MinCurMax temps = reprap.GetPlatform().GetMcuTemperatures();
+			reply.catf("MCU temperature: min %.1fC, current %.1fC, max %.1fC", (double)temps.minimum, (double)temps.current, (double)temps.maximum);
 #endif
 		}
 		break;
diff --git a/src/CAN/ExpansionManager.cpp b/src/CAN/ExpansionManager.cpp
index 53fa5acc..fa843870 100644
--- a/src/CAN/ExpansionManager.cpp
+++ b/src/CAN/ExpansionManager.cpp
@@ -16,7 +16,7 @@
 
 ExpansionBoardData::ExpansionBoardData() noexcept : typeName(nullptr), state(BoardState::unknown), numDrivers(0)
 {
-	mcuTemp.min = mcuTemp.max = mcuTemp.current = vin.max = vin.min = vin.current = v12.max = v12.min = v12.current = 0.0;
+	mcuTemp.minimum = mcuTemp.maximum = mcuTemp.current = vin.maximum = vin.minimum = vin.current = v12.maximum = v12.minimum = v12.current = 0.0;
 }
 
 #if SUPPORT_OBJECT_MODEL
@@ -43,18 +43,18 @@ constexpr ObjectModelTableEntry ExpansionManager::objectModelTable[] =
 
 	// 1. mcuTemp members
 	{ "current",			OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).mcuTemp.current, 1),							ObjectModelEntryFlags::live },
-	{ "max",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).mcuTemp.max, 1),								ObjectModelEntryFlags::none },
-	{ "min",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).mcuTemp.min, 1),								ObjectModelEntryFlags::none },
+	{ "max",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).mcuTemp.maximum, 1),							ObjectModelEntryFlags::none },
+	{ "min",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).mcuTemp.minimum, 1),							ObjectModelEntryFlags::none },
 
 	// 2. vIn members
 	{ "current",			OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).vin.current, 1),								ObjectModelEntryFlags::live },
-	{ "max",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).vin.max, 1),									ObjectModelEntryFlags::none },
-	{ "min",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).vin.min, 1),									ObjectModelEntryFlags::none },
+	{ "max",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).vin.maximum, 1),								ObjectModelEntryFlags::none },
+	{ "min",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).vin.minimum, 1),								ObjectModelEntryFlags::none },
 
 	// 3. v12 members
 	{ "current",			OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).v12.current, 1),								ObjectModelEntryFlags::live },
-	{ "max",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).v12.max, 1),									ObjectModelEntryFlags::none },
-	{ "min",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).v12.min, 1),									ObjectModelEntryFlags::none },
+	{ "max",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).v12.maximum, 1),								ObjectModelEntryFlags::none },
+	{ "min",				OBJECT_MODEL_FUNC(self->FindIndexedBoard(context.GetLastIndex()).v12.minimum, 1),								ObjectModelEntryFlags::none },
 };
 
 constexpr uint8_t ExpansionManager::objectModelTableDescriptor[] =
diff --git a/src/CAN/ExpansionManager.h b/src/CAN/ExpansionManager.h
index 8ec862ce..cd7c7a5c 100644
--- a/src/CAN/ExpansionManager.h
+++ b/src/CAN/ExpansionManager.h
@@ -24,7 +24,7 @@ struct ExpansionBoardData
 	ExpansionBoardData() noexcept;
 
 	const char *typeName;
-	MinMaxCurrent mcuTemp, vin, v12;
+	MinCurMax mcuTemp, vin, v12;
 	BoardState state;
 	uint8_t numDrivers;
 };