Skip to content

Commit aefbe0f

Browse files
authored
Merge pull request #29 from pennam/preferences_fixes
Preferences fixes
2 parents 14fe3fe + 6f5e89c commit aefbe0f

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

UNOR4USBBridge/cmds_preferences.h

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
Preferences pref;
88

99
void CAtHandler::add_cmds_preferences() {
10-
log_e("add_cmds_preferences");
1110
/* ....................................................................... */
1211
command_table[_PREF_BEGIN] = [this](auto & srv, auto & parser) {
1312
/* ....................................................................... */
14-
log_e("_PREF_BEGIN");
1513
switch (parser.cmd_mode) {
1614
case chAT::CommandMode::Write: {
1715
if (parser.args.size() != 3) {
@@ -28,10 +26,8 @@ void CAtHandler::add_cmds_preferences() {
2826
String error = String();
2927
if (partition.empty()) {
3028
error = String(pref.begin(name.c_str(), readOnly)) + "\r\n";
31-
log_e("pref.begin: %s", error.c_str());
3229
} else {
3330
error = String(pref.begin(name.c_str(), readOnly, partition.c_str())) + "\r\n";
34-
log_e("pref.begin: %s", error.c_str());
3531
}
3632

3733
srv.write_response_prompt();
@@ -106,7 +102,6 @@ void CAtHandler::add_cmds_preferences() {
106102
/* ....................................................................... */
107103
command_table[_PREF_PUT] = [this](auto & srv, auto & parser) {
108104
/* ....................................................................... */
109-
log_e("_PREF_PUT: %d", parser.args.size());
110105
switch (parser.cmd_mode) {
111106
case chAT::CommandMode::Write: {
112107
if (parser.args.size() != 3) {
@@ -155,8 +150,6 @@ void CAtHandler::add_cmds_preferences() {
155150
uint32_t value;
156151
sscanf(parser.args[2].c_str(), "%u", &value);
157152
error = String(pref.putUInt(key.c_str(), value)) + "\r\n";
158-
log_v("pref.putUInt v : %u", value);
159-
log_v("pref.putUInt e : %s", error.c_str());
160153
}
161154
break;
162155
case PreferenceType::PT_I64: {
@@ -174,8 +167,6 @@ void CAtHandler::add_cmds_preferences() {
174167
case PreferenceType::PT_STR: {
175168
auto value = parser.args[2];
176169
error = String(pref.putString(key.c_str(), value.c_str())) + "\r\n";
177-
log_v("pref.putUInt v : %s", value.c_str());
178-
log_v("pref.putUInt e : %s", error.c_str());
179170
}
180171
break;
181172
case PreferenceType::PT_BLOB: {
@@ -189,9 +180,7 @@ void CAtHandler::add_cmds_preferences() {
189180
} while (offset < value);
190181
}
191182
srv.continue_read();
192-
log_v("pref.putBytes start");
193183
error = String(pref.putBytes(key.c_str(), cert_buf.data(), value)) + "\r\n";
194-
log_v("pref.putBytes end");
195184
}
196185
break;
197186
default:
@@ -214,10 +203,8 @@ void CAtHandler::add_cmds_preferences() {
214203
/* ....................................................................... */
215204
command_table[_PREF_GET] = [this](auto & srv, auto & parser) {
216205
/* ....................................................................... */
217-
log_e("_PREF_GET: %d", parser.args.size());
218206
switch (parser.cmd_mode) {
219207
case chAT::CommandMode::Write: {
220-
log_e("_PREF_GET Write: %d", parser.args.size());
221208
if (parser.args.size() < 2) {
222209
return chAT::CommandStatus::ERROR;
223210
}
@@ -271,6 +258,7 @@ void CAtHandler::add_cmds_preferences() {
271258
sscanf(parser.args[2].c_str(), "%lld", &value);
272259
error = String(pref.getLong64(key.c_str(), value)) + "\r\n";
273260
}
261+
break;
274262
case PreferenceType::PT_U64: {
275263
uint64_t value;
276264
sscanf(parser.args[2].c_str(), "%llu", &value);
@@ -280,20 +268,13 @@ void CAtHandler::add_cmds_preferences() {
280268
case PreferenceType::PT_STR: {
281269
auto value = parser.args[2];
282270
error = String(pref.getString(key.c_str(), value.c_str())) + "\r\n";
283-
log_v("pref.getString v : %s", value.c_str());
284-
log_v("pref.getString e : %s", error.c_str());
285271
}
286272
break;
287273
case PreferenceType::PT_BLOB: {
288274
std::vector<uint8_t> data;
289275
int len = pref.getBytesLength(key.c_str());
290276
data.resize(len);
291-
log_v("pref.getBytes start");
292277
pref.getBytes(key.c_str(), data.data(), len) + "\r\n";
293-
log_v("pref.getBytes end");
294-
295-
for (int x=0; x<len; x++) log_v("%d",data.data()[x]);
296-
297278
srv.write_response_prompt();
298279
srv.write_str(String(len).c_str());
299280
srv.write_str("|");
@@ -325,10 +306,8 @@ void CAtHandler::add_cmds_preferences() {
325306
/* ....................................................................... */
326307
command_table[_PREF_LEN] = [this](auto & srv, auto & parser) {
327308
/* ....................................................................... */
328-
log_e("_PREF_LEN: %d", parser.args.size());
329309
switch (parser.cmd_mode) {
330310
case chAT::CommandMode::Write: {
331-
log_e("_PREF_LEN Write: %d", parser.args.size());
332311
if (parser.args.size() != 1) {
333312
return chAT::CommandStatus::ERROR;
334313
}
@@ -337,9 +316,7 @@ void CAtHandler::add_cmds_preferences() {
337316
if (key.empty()) {
338317
return chAT::CommandStatus::ERROR;
339318
}
340-
log_v("pref.getBytesLength start");
341319
String error = String(pref.getBytesLength(key.c_str())) + "\r\n";
342-
log_v("pref.getBytesLength end");
343320
srv.write_response_prompt();
344321
srv.write_str((const char *)(error.c_str()));
345322
srv.write_line_end();

0 commit comments

Comments
 (0)