Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-09 04:56:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rolling' into update-webui

Browse Source
This commit is contained in:
jomjol
2023-05-19 22:08:05 +02:00
committed by GitHub
parent 05deecee00 8339b6788f
commit f82a6bf513
27 changed files with 89 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/components/jomjol_fileserver_ota/server_file.cpp
View File

@@ -844,11 +844,9 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
return ESP_FAIL;
}
if (stat(filepath, &file_stat) == -1) {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File does not exist: " + string(filename));
/* Respond with 400 Bad Request */
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File does not exist");
return ESP_FAIL;
if (stat(filepath, &file_stat) == -1) { // File does not exist
/* This is ok, we would delete it anyway */
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "File does not exist: " + string(filename));
}
/* Delete file */
@@ -894,6 +892,7 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
}
}
httpd_resp_set_hdr(req, "Location", directory.c_str());
httpd_resp_sendstr(req, "File successfully deleted");
return ESP_OK;

9
code/components/jomjol_flowcontroll/ClassFlowControll.cpp
View File

@@ -190,10 +190,15 @@ void ClassFlowControll::SetInitialParameter(void)
}
bool ClassFlowControll::isAutoStart(long &_interval)
bool ClassFlowControll::getIsAutoStart(void)
{
return AutoStart;
}
void ClassFlowControll::setAutoStartInterval(long &_interval)
{
_interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms
return AutoStart;
}

3
code/components/jomjol_flowcontroll/ClassFlowControll.h
View File

@@ -66,7 +66,8 @@ public:
std::string doSingleStep(std::string _stepname, std::string _host);
bool isAutoStart(long &_interval);
bool getIsAutoStart();
void setAutoStartInterval(long &_interval);
std::string* getActStatusWithTime();
std::string* getActStatus();

27
code/components/jomjol_flowcontroll/MainFlowControl.cpp
View File

@@ -41,7 +41,7 @@ bool bTaskAutoFlowCreated = false;
bool flowisrunning = false;
long auto_interval = 0;
bool auto_isrunning = false;
bool autostartIsEnabled = false;
int countRounds = 0;
bool isPlannedReboot = false;
@@ -257,7 +257,7 @@ esp_err_t handler_flow_start(httpd_req_t *req) {
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
if (auto_isrunning) {
if (autostartIsEnabled) {
xTaskAbortDelay(xHandletask_autodoFlow); // Delay will be aborted if task is in blocked (waiting) state. If task is already running, no action
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Flow start triggered by REST API /flow_start");
const char* resp_str = "The flow is going to be started immediately or is already running";
@@ -286,7 +286,7 @@ esp_err_t MQTTCtrlFlowStart(std::string _topic) {
ESP_LOGD(TAG, "MQTTCtrlFlowStart: topic %s", _topic.c_str());
if (auto_isrunning)
if (autostartIsEnabled)
{
xTaskAbortDelay(xHandletask_autodoFlow); // Delay will be aborted if task is in blocked (waiting) state. If task is already running, no action
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Flow start triggered by MQTT topic " + _topic);
@@ -679,8 +679,8 @@ esp_err_t handler_editflow(httpd_req_t *req)
zw = "CutImage Done";
}
else {
LogFile.WriteToFile(ESP_LOG_WARN, TAG, *flowctrl.getActStatus());
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!");
LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Taking image for Alignment Mark not possible while device") +
" is busy with a round (Current State: '" + state + "')!");
zw = "Device Busy";
}
@@ -956,16 +956,25 @@ void task_autodoFlow(void *pvParameter)
ESP_LOGD(TAG, "task_autodoFlow: start");
doInit();
auto_isrunning = flowctrl.isAutoStart(auto_interval);
flowctrl.setAutoStartInterval(auto_interval);
autostartIsEnabled = flowctrl.getIsAutoStart();
if (isSetupModusActive())
{
auto_isrunning = false;
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "We are in Setup Mode -> Not starting Auto Flow!");
autostartIsEnabled = false;
std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT);
flowctrl.doFlowTakeImageOnly(zw_time);
}
if (autostartIsEnabled) {
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Starting Flow...");
}
else {
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Autostart is not enabled -> Not starting Flow");
}
while (auto_isrunning)
while (autostartIsEnabled)
{
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "----------------------------------------------------------------"); // Clear separation between runs
std::string _zw = "Round #" + std::to_string(++countRounds) + " started";
@@ -1039,7 +1048,7 @@ void task_autodoFlow(void *pvParameter)
}
void StartMainFlowTask()
void InitializeFlowTask()
{
BaseType_t xReturned;

2
code/components/jomjol_flowcontroll/MainFlowControl.h
View File

@@ -18,7 +18,7 @@ void register_server_main_flow_task_uri(httpd_handle_t server);
void CheckIsPlannedReboot();
bool getIsPlannedReboot();
void StartMainFlowTask();
void InitializeFlowTask();
void DeleteMainFlowTask();
bool isSetupModusActive();

3
code/components/jomjol_helper/psram.cpp
View File

@@ -62,6 +62,7 @@ void *psram_reserve_shared_stbi_memory(size_t size) {
if ((allocatedBytesForSTBI + size) > TENSOR_ARENA_SIZE + MAX_MODEL_SIZE) { // Check if it still fits in the shared region
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Shared memory in PSRAM too small (STBI) to fit additional " +
std::to_string(size) + " bytes! Available: " + std::to_string(TENSOR_ARENA_SIZE + MAX_MODEL_SIZE - allocatedBytesForSTBI) + " bytes!");
return NULL;
}
@@ -194,7 +195,7 @@ void *calloc_psram_heap(std::string name, size_t n, size_t size, uint32_t caps)
ptr = heap_caps_calloc(n, size, caps);
if (ptr != NULL) {
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocated " + to_string(size) + " bytes in PSRAM for '" + name + "'");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Allocated " + to_string(size) + " bytes in PSRAM for '" + name + "'");
}
else {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to allocate " + to_string(size) + " bytes in PSRAM for '" + name + "'!");

8
code/components/jomjol_helper/sdcard_check.cpp
View File

@@ -147,12 +147,6 @@ bool SDCardCheckFolderFilePresence()
bRetval = false;
}
/* check if file exists: gethost.js */
if (stat("/sdcard/html/gethost.js", &sb) != 0) {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/gethost.js not found");
bRetval = false;
}
/* check if file exists: version.txt */
if (stat("/sdcard/html/version.txt", &sb) != 0) {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/version.txt not found");
@@ -163,4 +157,4 @@ bool SDCardCheckFolderFilePresence()
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Folder/file presence check successful");
return bRetval;
}
}

2
code/components/jomjol_influxdb/interface_influxdb.cpp
View File

@@ -116,7 +116,7 @@ static esp_err_t http_event_handler(esp_http_client_event_t *evt)
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client Error encountered");
break;
case HTTP_EVENT_ON_CONNECTED:
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client Error encountered");
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client connected");
ESP_LOGI(TAG, "HTTP Client Connected");
break;
case HTTP_EVENT_HEADERS_SENT:

19
code/components/jomjol_wlan/connect_wlan.cpp
View File

@@ -49,14 +49,13 @@
#define ets_delay_us(a) esp_rom_delay_us(a)
#endif
esp_netif_t *sta_netif = NULL;
static const char *TAG = "WIFI";
static bool APWithBetterRSSI = false;
static bool WIFIConnected = false;
static int WIFIReconnectCnt = 0;
esp_netif_t *my_sta;
void strinttoip4(const char *ip, int &a, int &b, int &c, int &d) {
@@ -531,7 +530,7 @@ esp_err_t wifi_init_sta(void)
return retval;
}
esp_netif_t *my_sta = esp_netif_create_default_wifi_sta();
my_sta = esp_netif_create_default_wifi_sta();
if (!wlan_config.ipaddress.empty() && !wlan_config.gateway.empty() && !wlan_config.netmask.empty())
{
@@ -674,6 +673,20 @@ int get_WIFI_RSSI()
}
/*std::string getIp() {
esp_netif_ip_info_t ip_info;
ESP_ERROR_CHECK(esp_netif_get_ip_info(my_sta, ip_info));
char ipFormated[4*3+3+1];
sprintf(ipFormated, IPSTR, IP2STR(&ip_info.ip));
return std::string(ipFormated);
}*/
std::string* getHostname() {
return &wlan_config.hostname;
}
bool getWIFIisConnected()
{
return WIFIConnected;

2
code/components/jomjol_wlan/connect_wlan.h
View File

@@ -9,6 +9,8 @@ int wifi_init_sta(void);
std::string* getIPAddress();
std::string* getSSID();
int get_WIFI_RSSI();
std::string* getHostname();
bool getWIFIisConnected();
void WIFIDestroy();