mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 12:36:52 +03:00
304b9e0c32
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com>
94 lines
2.2 KiB
C++
94 lines
2.2 KiB
C++
|
|
|
|
#ifndef __FLOWCONTROLL__
|
|
#define __FLOWCONTROLL__
|
|
|
|
#include <string>
|
|
|
|
#include "ClassFlow.h"
|
|
#include "ClassFlowMakeImage.h"
|
|
#include "ClassFlowAlignment.h"
|
|
#include "ClassFlowCNNGeneral.h"
|
|
#include "ClassFlowPostProcessing.h"
|
|
#ifdef ENABLE_MQTT
|
|
#include "ClassFlowMQTT.h"
|
|
#endif //ENABLE_MQTT
|
|
#ifdef ENABLE_INFLUXDB
|
|
#include "ClassFlowInfluxDB.h"
|
|
#endif //ENABLE_INFLUXDB
|
|
#include "ClassFlowCNNGeneral.h"
|
|
#include "ClassFlowWriteList.h"
|
|
|
|
|
|
#define READOUT_TYPE_VALUE 0
|
|
#define READOUT_TYPE_PREVALUE 1
|
|
#define READOUT_TYPE_RAWVALUE 2
|
|
#define READOUT_TYPE_ERROR 3
|
|
|
|
|
|
class ClassFlowControll :
|
|
public ClassFlow
|
|
{
|
|
protected:
|
|
std::vector<ClassFlow*> FlowControll;
|
|
ClassFlowPostProcessing* flowpostprocessing;
|
|
ClassFlowAlignment* flowalignment;
|
|
ClassFlowCNNGeneral* flowanalog;
|
|
ClassFlowCNNGeneral* flowdigit;
|
|
// ClassFlowDigit* flowdigit;
|
|
ClassFlowMakeImage* flowmakeimage;
|
|
ClassFlow* CreateClassFlow(std::string _type);
|
|
|
|
bool AutoStart;
|
|
float AutoIntervall;
|
|
bool SetupModeActive;
|
|
void SetInitialParameter(void);
|
|
std::string aktstatus;
|
|
int aktRunNr;
|
|
|
|
public:
|
|
void InitFlow(std::string config);
|
|
bool doFlow(string time);
|
|
void doFlowMakeImageOnly(string time);
|
|
bool getStatusSetupModus(){return SetupModeActive;};
|
|
string getReadout(bool _rawvalue, bool _noerror);
|
|
string getReadoutAll(int _type);
|
|
string UpdatePrevalue(std::string _newvalue, std::string _numbers, bool _extern);
|
|
string GetPrevalue(std::string _number = "");
|
|
bool ReadParameter(FILE* pfile, string& aktparamgraph);
|
|
string getJSON();
|
|
string getNumbersName();
|
|
|
|
string TranslateAktstatus(std::string _input);
|
|
#ifdef ENABLE_MQTT
|
|
string GetMQTTMainTopic();
|
|
#endif //ENABLE_MQTT
|
|
|
|
esp_err_t GetJPGStream(std::string _fn, httpd_req_t *req);
|
|
esp_err_t SendRawJPG(httpd_req_t *req);
|
|
|
|
std::string doSingleStep(std::string _stepname, std::string _host);
|
|
|
|
bool isAutoStart(long &_intervall);
|
|
|
|
std::string* getActStatus();
|
|
|
|
std::vector<HTMLInfo*> GetAllDigital();
|
|
std::vector<HTMLInfo*> GetAllAnalog();
|
|
|
|
t_CNNType GetTypeDigital();
|
|
t_CNNType GetTypeAnalog();
|
|
#ifdef ENABLE_MQTT
|
|
bool StartMQTTService();
|
|
#endif //ENABLE_MQTT
|
|
|
|
int CleanTempFolder();
|
|
|
|
string name(){return "ClassFlowControll";};
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|