Skip to content

Commit 15827d6

Browse files
committed
Remove hhd and hhu format specifiers because they are not supported by newlib-nano
1 parent 1c193cf commit 15827d6

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

libraries/Preferences/src/Preferences.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Preferences::~Preferences() {
2828
bool Preferences::begin(const char * name, bool readOnly, const char* partition_label){
2929
string res = "";
3030
modem.begin();
31+
modem.debug(Serial,2);
3132
if (name != nullptr && strlen(name) > 0) {
3233
if (modem.write(string(PROMPT(_PREF_BEGIN)), res, "%s%s,%d,%s\r\n", CMD_WRITE(_PREF_BEGIN), name, readOnly, partition_label != NULL ? partition_label : "")) {
3334
return (atoi(res.c_str()) != 0) ? true : false;
@@ -74,7 +75,7 @@ bool Preferences::remove(const char * key) {
7475
size_t Preferences::putChar(const char* key, int8_t value) {
7576
string res = "";
7677
if (key != nullptr && strlen(key) > 0) {
77-
if (modem.write(string(PROMPT(_PREF_PUT)), res, "%s%s,%d,%hhd\r\n", CMD_WRITE(_PREF_PUT), key, PT_I8, value)) {
78+
if (modem.write(string(PROMPT(_PREF_PUT)), res, "%s%s,%d,%hd\r\n", CMD_WRITE(_PREF_PUT), key, PT_I8, value)) {
7879
return atoi(res.c_str());
7980
}
8081
}
@@ -84,7 +85,7 @@ size_t Preferences::putChar(const char* key, int8_t value) {
8485
size_t Preferences::putUChar(const char* key, uint8_t value) {
8586
string res = "";
8687
if (key != nullptr && strlen(key) > 0) {
87-
if (modem.write(string(PROMPT(_PREF_PUT)), res, "%s%s,%d,%hhu\r\n", CMD_WRITE(_PREF_PUT), key, PT_U8, value)) {
88+
if (modem.write(string(PROMPT(_PREF_PUT)), res, "%s%s,%d,%hu\r\n", CMD_WRITE(_PREF_PUT), key, PT_U8, value)) {
8889
return atoi(res.c_str());
8990
}
9091
}
@@ -215,22 +216,22 @@ bool Preferences::isKey(const char* key) {
215216
* */
216217

217218
int8_t Preferences::getChar(const char* key, const int8_t defaultValue) {
218-
int8_t value = defaultValue;
219+
int16_t value = defaultValue;
219220
string res = "";
220221
if (key != nullptr && strlen(key) > 0) {
221-
if (modem.write(string(PROMPT(_PREF_GET)), res, "%s%s,%d,%hhd\r\n", CMD_WRITE(_PREF_GET), key, PT_I8, defaultValue)) {
222-
sscanf(res.c_str(), "%hhd", &value);
222+
if (modem.write(string(PROMPT(_PREF_GET)), res, "%s%s,%d,%hd\r\n", CMD_WRITE(_PREF_GET), key, PT_I8, defaultValue)) {
223+
sscanf(res.c_str(), "%hd", &value);
223224
}
224225
}
225226
return value;
226227
}
227228

228229
uint8_t Preferences::getUChar(const char* key, const uint8_t defaultValue) {
229-
uint8_t value = defaultValue;
230+
uint16_t value = defaultValue;
230231
string res = "";
231232
if (key != nullptr && strlen(key) > 0) {
232-
if (modem.write(string(PROMPT(_PREF_GET)), res, "%s%s,%d,%hhu\r\n", CMD_WRITE(_PREF_GET), key, PT_U8, defaultValue)) {
233-
sscanf(res.c_str(), "%hhu", &value);
233+
if (modem.write(string(PROMPT(_PREF_GET)), res, "%s%s,%d,%hu\r\n", CMD_WRITE(_PREF_GET), key, PT_U8, defaultValue)) {
234+
sscanf(res.c_str(), "%hu", &value);
234235
}
235236
}
236237
return value;

0 commit comments

Comments
 (0)