Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2026-01-30 06:10:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update README.md

Browse Source 
improve case if gpio is disabled
remove /test html route
This commit is contained in:
Zwer2k
2021-07-11 13:56:37 +02:00
parent 45a1e137d1
commit a7ced407f8
7 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/components/jomjol_controlGPIO/server_GPIO.cpp
View File

@@ -217,7 +217,12 @@ void GpioHandler::init()
}
ESP_LOGI(TAG_SERVERGPIO, "read GPIO config and init GPIO");
readConfig();
if (!readConfig()) {
clear();
delete gpioMap;
gpioMap = NULL;
return;
}
for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) {
it->second->init();
@@ -289,8 +294,12 @@ bool GpioHandler::readConfig()
while ((!configFile.GetNextParagraph(line, disabledLine, eof) || (line.compare("[GPIO]") != 0)) && !disabledLine && !eof) {}
if (eof)
return false;
_isEnabled = !disabledLine;
if (!_isEnabled)
return false;
_isEnabled = true;
std::string mainTopicMQTT = "";
bool registerISR = false;
while (configFile.getNextLine(&line, disabledLine, eof) && !configFile.isNewParagraph(line))

6
code/components/jomjol_fileserver_ota/server_ota.cpp
View File

@@ -62,14 +62,14 @@ static void infinite_loop(void)
static bool ota_example_task(std::string fn)
static bool ota_update_task(std::string fn)
{
esp_err_t err;
/* update handle : set by esp_ota_begin(), must be freed via esp_ota_end() */
esp_ota_handle_t update_handle = 0 ;
const esp_partition_t *update_partition = NULL;
ESP_LOGI(TAGPARTOTA, "Starting OTA example");
ESP_LOGI(TAGPARTOTA, "Starting OTA update");
const esp_partition_t *configured = esp_ota_get_boot_partition();
const esp_partition_t *running = esp_ota_get_running_partition();
@@ -378,7 +378,7 @@ esp_err_t handler_ota_update(httpd_req_t *req)
KillTFliteTasks();
gpio_handler_deinit();
if (ota_example_task(fn))
if (ota_update_task(fn))
{
resp_str = "Firmware Update Successfull!<br><br>You can restart now.";
}