From 86ed953a2d5000cbab463c98dec99f5fadfe6e79 Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Fri, 22 Nov 2024 16:14:27 +0100 Subject: [PATCH] Fixed display of firmware code when different --- src/vscp/common/vscp-bootdevice-vscp.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/vscp/common/vscp-bootdevice-vscp.cpp b/src/vscp/common/vscp-bootdevice-vscp.cpp index 52d0aa82f..05b4b417e 100644 --- a/src/vscp/common/vscp-bootdevice-vscp.cpp +++ b/src/vscp/common/vscp-bootdevice-vscp.cpp @@ -239,11 +239,14 @@ CBootDevice_VSCP::deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFi Must be the same as the firmware we try to load is intended for */ if (m_firmwaredeviceCode != m_stdRegs.getFirmwareDeviceCode()) { - spdlog::warn("Firware device code is not equal the one on the device local: {0} device: {1}", + spdlog::warn("Firmware device code is not equal the one on the device local: {0} device: {1}", m_firmwaredeviceCode, m_stdRegs.getFirmwareDeviceCode()); if (nullptr != m_statusCallback) { - m_statusCallback(-1, "Firware device code is not equal the one on the device local: {0} device: {1}"); + m_statusCallback(-1, + "Firmware device code is not equal! Firmware: {0} Device: {1}", + m_firmwaredeviceCode, + m_stdRegs.getFirmwareDeviceCode()); } if (bAbortOnFirmwareCodeFail) { return VSCP_ERROR_PARAMETER; @@ -511,8 +514,8 @@ CBootDevice_VSCP::deviceLoad(std::function statusCallba int rv; // vscpEventEx ex; - //uint32_t progress = 0; - // uint32_t addr; + // uint32_t progress = 0; + // uint32_t addr; std::string strStatus; m_checksum = 0;