diff options
author | David Crocker <dcrocker@eschertech.com> | 2022-04-25 11:59:48 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2022-04-25 11:59:48 +0300 |
commit | 02ccc11fe819493d335d50d6500b40d68ebec213 (patch) | |
tree | 968f6c5a7c13dc1e7a1bf36f8d1ac201d9785567 /src | |
parent | c929e2fde6cbdf102c17339ab3f374ed39190186 (diff) |
Corrected swap of CAN address and device number in some events
When constructing heater-fault and filament-error events, the CAN
address and device number were swapped
Diffstat (limited to 'src')
-rw-r--r-- | src/FilamentMonitors/FilamentMonitor.cpp | 2 | ||||
-rw-r--r-- | src/Heating/LocalHeater.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/FilamentMonitors/FilamentMonitor.cpp b/src/FilamentMonitors/FilamentMonitor.cpp index f50a84c4..3f76bc62 100644 --- a/src/FilamentMonitors/FilamentMonitor.cpp +++ b/src/FilamentMonitors/FilamentMonitor.cpp @@ -335,7 +335,7 @@ bool FilamentMonitor::IsValid(size_t extruderNumber) const noexcept } else { - Event::AddEvent(EventType::filament_error, (uint16_t)fst.ToBaseType(), extruder, CanInterface::GetCanAddress(), ""); + Event::AddEvent(EventType::filament_error, (uint16_t)fst.ToBaseType(), CanInterface::GetCanAddress(), extruder, ""); } } } diff --git a/src/Heating/LocalHeater.cpp b/src/Heating/LocalHeater.cpp index 45c73d1a..6b077304 100644 --- a/src/Heating/LocalHeater.cpp +++ b/src/Heating/LocalHeater.cpp @@ -936,7 +936,7 @@ void LocalHeater::RaiseHeaterFault(HeaterFaultType type, const char *_ecv_array else #endif { - Event::AddEventV(EventType::heater_fault, (uint16_t)type, GetHeaterNumber(), CanInterface::GetCanAddress(), format, vargs); + Event::AddEventV(EventType::heater_fault, (uint16_t)type, CanInterface::GetCanAddress(), GetHeaterNumber(), format, vargs); } va_end(vargs); } |