Skip to content

Commit b282fe1

Browse files
committed
Change to snprintf
1 parent 6352a73 commit b282fe1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Firmware/RTK_Surveyor/Form.ino

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -696,21 +696,21 @@ void createSettingsString(char* newSettings)
696696
char batteryIconFileName[sizeof("src/Battery2_Charging.png")]; //sizeof() includes 1 for \0 termination
697697

698698
if (externalPowerConnected)
699-
sprintf(batteryIconFileName, "src/Battery%d_Charging.png", iconLevel);
699+
snprintf(batteryIconFileName, sizeof(batteryIconFileName), "src/Battery%d_Charging.png", iconLevel);
700700
else
701-
sprintf(batteryIconFileName, "src/Battery%d.png", iconLevel);
701+
snprintf(batteryIconFileName, sizeof(batteryIconFileName), "src/Battery%d.png", iconLevel);
702702

703703
stringRecord(newSettings, "batteryIconFileName", batteryIconFileName);
704704

705705
//Determine battery percent
706706
char batteryPercent[sizeof("+100%")];
707707
int tempLevel = battLevel;
708708
if(tempLevel > 100) tempLevel = 100;
709-
\
709+
710710
if (externalPowerConnected)
711-
sprintf(batteryPercent, "+%d%%", tempLevel);
711+
snprintf(batteryPercent, sizeof(batteryPercent), "+%d%%", tempLevel);
712712
else
713-
sprintf(batteryPercent, "%d%%", tempLevel);
713+
snprintf(batteryPercent, sizeof(batteryPercent), "%d%%", tempLevel);
714714
stringRecord(newSettings, "batteryPercent", batteryPercent);
715715

716716
//Add ECEF and Geodetic station data
@@ -835,18 +835,18 @@ void createDynamicDataString(char* settingsCSV)
835835
char batteryIconFileName[sizeof("src/Battery2_Charging.png")]; //sizeof() includes 1 for \0 termination
836836

837837
if (externalPowerConnected)
838-
sprintf(batteryIconFileName, "src/Battery%d_Charging.png", iconLevel);
838+
snprintf(batteryIconFileName, sizeof(batteryIconFileName), "src/Battery%d_Charging.png", iconLevel);
839839
else
840-
sprintf(batteryIconFileName, "src/Battery%d.png", iconLevel);
840+
snprintf(batteryIconFileName, sizeof(batteryIconFileName), "src/Battery%d.png", iconLevel);
841841

842842
stringRecord(settingsCSV, "batteryIconFileName", batteryIconFileName);
843843

844844
//Determine battery percent
845845
char batteryPercent[sizeof("+100%")];
846846
if (externalPowerConnected)
847-
sprintf(batteryPercent, "+%d%%", battLevel);
847+
snprintf(batteryPercent, sizeof(batteryPercent), "+%d%%", battLevel);
848848
else
849-
sprintf(batteryPercent, "%d%%", battLevel);
849+
snprintf(batteryPercent, sizeof(batteryPercent), "%d%%", battLevel);
850850
stringRecord(settingsCSV, "batteryPercent", batteryPercent);
851851

852852
strcat(settingsCSV, "\0");

0 commit comments

Comments
 (0)