Correctly print file sizes in file manager

nseidle · nseidle · commit 321a369751b4 · 2023-01-18T14:21:03.000-07:00
diff --git a/Firmware/RTK_Surveyor/Form.ino b/Firmware/RTK_Surveyor/Form.ino
@@ -380,6 +380,7 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest * request, String fil
 void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)
 {
   if (type == WS_EVT_CONNECT) {
+    log_d("Websocket client connected");
     client->text(settingsCSV);
     lastCoordinateUpdate = millis();
   }
@@ -1268,7 +1269,7 @@ String stringHumanReadableSize(uint64_t bytes)
   else if (strcmp(suffix, "MB") == 0)
     sprintf(readableSize, "%0.1f %s", cardSize, suffix); //Print decimal portion
   else
-    sprintf(readableSize, "%lld %s", cardSize, suffix); //Don't print decimal portion
+    sprintf(readableSize, "%0.0f %s", cardSize, suffix); //Don't print decimal portion
 
   return String(readableSize);
 }

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,7 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest * request, String fil`
`380`	`380`	`void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)`
`381`	`381`	`{`
`382`	`382`	`if (type == WS_EVT_CONNECT) {`
	`383`	`+ log_d("Websocket client connected");`
`383`	`384`	`client->text(settingsCSV);`
`384`	`385`	`lastCoordinateUpdate = millis();`
`385`	`386`	`}`
`@@ -1268,7 +1269,7 @@ String stringHumanReadableSize(uint64_t bytes)`
`1268`	`1269`	`else if (strcmp(suffix, "MB") == 0)`
`1269`	`1270`	`sprintf(readableSize, "%0.1f %s", cardSize, suffix); //Print decimal portion`
`1270`	`1271`	`else`
`1271`		`- sprintf(readableSize, "%lld %s", cardSize, suffix); //Don't print decimal portion`
	`1272`	`+ sprintf(readableSize, "%0.0f %s", cardSize, suffix); //Don't print decimal portion`
`1272`	`1273`
`1273`	`1274`	`return String(readableSize);`
`1274`	`1275`	`}`