Cleanup error messages

4ms · Sep 26, 2024 · 79729f7 · 79729f7
1 parent 975d3c5
commit 79729f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/firmware/src/core_intercom/intercore_message.hh b/firmware/src/core_intercom/intercore_message.hh
@@ -44,7 +44,6 @@ struct IntercoreStorageMessage {
 
 		RequestReadFlash,
 		ReadFlashOk,
-		ReadFlashFailed,
 
 		RequestWriteFile,
 		WriteFileFail,

diff --git a/firmware/src/fw_update/firmware_writer.cc b/firmware/src/fw_update/firmware_writer.cc
@@ -128,7 +128,7 @@ IntercoreStorageMessage FirmwareWriter::flashWifi(std::span<uint8_t> buffer,
 			}
 
 			if (not error_during_writes) {
-				pr_dbg("-> Flashing completed\n");
+				pr_trace("-> Flashing completed\n");
 				returnValue = {.message_type = FlashingOk};
 			} else {
 				pr_trace("-> Flashing failed\n");

diff --git a/firmware/src/fw_update/updater_proxy.cc b/firmware/src/fw_update/updater_proxy.cc
@@ -195,10 +195,18 @@ FirmwareUpdaterProxy::Status FirmwareUpdaterProxy::process() {
 						abortWithMessage("Error when comparing checksums");
 						break;
 
-					case FileStorageProxy::WifiExpanderNotConnected:
-						error_message = "No Wifi Expander: skipping " + manifest.files[current_file_idx].filename;
+					case FileStorageProxy::WifiExpanderNotConnected: {
+						error_message = "No Wifi Expander: skipping ";
+
+						auto full_path = manifest.files[current_file_idx].filename;
+						auto slash_pos = full_path.find_first_of("/");
+						if (slash_pos != std::string::npos)
+							error_message += full_path.substr(slash_pos + 1);
+						else
+							error_message += full_path;
+
 						proceedWithNextFile();
-						break;
+					} break;
 
 					default:
 						break;