Skip to content
Snippets Groups Projects
Commit 2c9f4ac1 authored by fxk8y's avatar fxk8y :spider:
Browse files

Remove getLongString()-API because somehow it won't work and is mostly useless

parent 84785edb
No related branches found
No related tags found
No related merge requests found
...@@ -571,7 +571,6 @@ namespace SiliconTorch { ...@@ -571,7 +571,6 @@ namespace SiliconTorch {
} )); } ));
qthing::add_binary_message_callback(requestTopic("get_str/+/+"), wrapMessageHandler( qthing::add_binary_message_callback(requestTopic("get_str/+/+"), wrapMessageHandler(
[&](std::vector<std::string>& topic, qthing::multipart_message_t msg) { [&](std::vector<std::string>& topic, qthing::multipart_message_t msg) {
...@@ -590,37 +589,6 @@ namespace SiliconTorch { ...@@ -590,37 +589,6 @@ namespace SiliconTorch {
} )); } ));
// #######################################
// ### TODO: remove after testing!! ###
// #######################################
qthing::add_binary_message_callback(requestTopic("get_LONGstr/+/+"), wrapMessageHandler(
[&](std::vector<std::string>& topic, qthing::multipart_message_t msg) {
size_t testValue = 1337000; // way too big for NVS
if ( getStringLength(topic[1], topic[2], testValue) < testValue ) { // key exists and is of type string
char buffer[256];
std::memset(&buffer[0], 0x00, 256);
getLongString(topic[1], topic[2], &buffer[0]);
std::string value(&buffer[0]);
qthing::publish_message(responseTopic("get_LONGstr", topic[1], topic[2]), value);
} else {
// publish error…?
ESP_LOGW(TAG, "Retrieving str[] from namespace[ %s ] key[ %s ] FAILED", topic[1].c_str(), topic[2].c_str());
}
} ));
// #######################################
// #######################################
qthing::add_binary_message_callback(requestTopic("set_str/+/+"), wrapMessageHandler( qthing::add_binary_message_callback(requestTopic("set_str/+/+"), wrapMessageHandler(
[&](std::vector<std::string>& topic, qthing::multipart_message_t msg) { [&](std::vector<std::string>& topic, qthing::multipart_message_t msg) {
...@@ -957,6 +925,7 @@ namespace SiliconTorch { ...@@ -957,6 +925,7 @@ namespace SiliconTorch {
std::memset(&buffer[0], 0x00, size + 1); std::memset(&buffer[0], 0x00, size + 1);
nvs_get_str(nvs, key.c_str(), &buffer[0], &size); nvs_get_str(nvs, key.c_str(), &buffer[0], &size);
nvs_close(nvs); nvs_close(nvs);
std::string out(&buffer[0]); std::string out(&buffer[0]);
...@@ -968,18 +937,18 @@ namespace SiliconTorch { ...@@ -968,18 +937,18 @@ namespace SiliconTorch {
} }
size_t NVSExplorer::getLongString(const std::string& nameSpace, const std::string& key, char* const buffer) { // size_t NVSExplorer::getLongString(const std::string& nameSpace, const std::string& key, char* const buffer) {
//
size_t size = 0; // size_t size = 0;
//
nvs_handle_t nvs; // nvs_handle_t nvs;
if ( nvs_open(nameSpace.c_str(), NVS_READONLY, &nvs) == ESP_OK ) { // if ( nvs_open(nameSpace.c_str(), NVS_READONLY, &nvs) == ESP_OK ) {
nvs_get_str(nvs, key.c_str(), buffer, &size); // nvs_get_str(nvs, key.c_str(), buffer, &size);
nvs_close(nvs); // nvs_close(nvs);
} // }
//
return size; // return size;
} // }
bool NVSExplorer::setString(const std::string& nameSpace, const std::string& key, const std::string& value) { bool NVSExplorer::setString(const std::string& nameSpace, const std::string& key, const std::string& value) {
......
...@@ -83,7 +83,7 @@ namespace SiliconTorch { ...@@ -83,7 +83,7 @@ namespace SiliconTorch {
size_t getStringLength(const std::string& nameSpace, const std::string& key, size_t defaultValue = 0); size_t getStringLength(const std::string& nameSpace, const std::string& key, size_t defaultValue = 0);
std::string getString(const std::string& nameSpace, const std::string& key, const std::string& defaultValue = ""); std::string getString(const std::string& nameSpace, const std::string& key, const std::string& defaultValue = "");
size_t getLongString(const std::string& nameSpace, const std::string& key, char* const buffer); // size_t getLongString(const std::string& nameSpace, const std::string& key, char* const buffer);
bool setString(const std::string& nameSpace, const std::string& key, const std::string& value); bool setString(const std::string& nameSpace, const std::string& key, const std::string& value);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment