mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 03:56:57 +03:00
v15.2.1 (#2361)
* Testcase for #2145 and debug-log (#2151) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Fix timezone config parser (#2169) * make sure to parse the whole config line * fix crash on empty timezone parameter --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Enhance ROI pages (#2161) * Check if the ROIs are equidistant. Only if not, untick the checkbox * renaming * Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox * only allow editing space when box is checked * fix sync check * show inner frame on all ROIs * cleanup * Check if the ROIs have same dy and dx. If so, tick the sync checkbox * checkbox position * renaming * renaming * show inner frame and cross hairs on all ROIs * update ROIs on ticking checkboxes * show timezone hint * fix deleting last ROI * cleanup --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * restart timeout on progress, catch error (#2170) * restart timeout on progress, catch error * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * BugFix #2167 * Release 15.1 preparations (#2171) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update changelog * Fix links to PR * Formating * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md --------- Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * fix typo * Replace relative documentation links with absolute ones pointing to the external documentation (#2180) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Sort model files in configuration combobox (#2189) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Sort model files in combobox * reboot task - increase stack size (#2201) Avoid stack overflow * Update interface_influxdb.cpp * Update Changelog.md * Show PSRAM usage (#2206) * centralize PSRAM usage (application code only) * update logging * update logging * fix use after free * initialize buffer * free rgb_image before ussing it for new allocation * use wrapper function * switch log level to debug * . * undo adding free() calls * . * add names to all CImage instances * . * . * . * revert changes of stbi_image_free() with free_psram_heap() on the places where is is not in PSRAM * . * typos * typo * Added MQTT Outbox explanation/warning * added CONFIG_SPIRAM_USE_MEMMAP explanation --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Disable custom MQTT Outbox. This also moves the MQTT Publishing memory usage back to the internal RAM! * log MQTT connection refused reasons (#2216) * Revert PSRAM usage as it lead to memory fragmentation. See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details * fix missing value data * Revert PSRAM usage as it lead to memory fragmentation. (#2224) See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix missing value data in graph (#2230) * fix missing value data --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2231) * Update interface_influxdb.cpp (#2233) * update copyright year * Cleanup * Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT) (#2252) * Use double instead of float * Error handling + set to RAW if newvalue < 0 * REST SetPrevalue: Set to RAW if newvalue < 0 * set prevalue with MQTT * removed the stb_image files and re-add them as a submodule. (#2223) - stb_image.h: Version update 2.25 -> 2.28 - stb_resize.h: Version update 0.96 -> 0.97 - stb_write.h: Version update 1.14 -> 1.16 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Remove obsolete ClassFlowWriteList (#2264) * Renaming & cleanup of some modules / functions in source code (#2265) * Rename module tag name * Rename server_tflite.cpp -> MainFlowControl.cpp * Remove redundandant MQTTMainTopic function * Update * Remove obsolete GetMQTTMainTopic * Fix last element missing in digit model drop down (#2282) * Debug influxdb (#2283) * Fix time offset issues in InfluxDB component. (#2278) Closes #2273 Closes #2150 * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Improve Logging * Implement TimeSync at beginning * Update time_sntp.cpp * Update time_sntp.cpp * Set Time After WLAN Init --------- Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu> * Implement a camera livestream handler (#2286) * fix leading NaN (#2310) * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend InfluxDBv1 with individual topic names (#2319) * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2344) * Update Changelog.md * Update Changelog.md * merge conflicts * merge conflicts * update changelog * Update Changelog.md * Fix alignment mark PSRAM issue (#2357) * Add lock for shared PSRAM memory, use it for the relevant round steps and the Alignment Mark Task * only allow taking a new image for the Alignment Mark while round got completed * show success/denial of Alignment Mark Update Request * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2360) --------- Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
This commit is contained in:
CaCO3
19
Changelog.md
19
Changelog.md
@@ -1,9 +1,11 @@
|
|||||||
|
## [15.2.1] - 2023-04-27
|
||||||
|
|
||||||
|
#### Fixed
|
||||||
|
- [#2357](https://github.com/jomjol/AI-on-the-edge-device/pull/2357) Fix Alignment Mark issue
|
||||||
|
|
||||||
|
|
||||||
## [15.2.0] - 2023-04-23
|
## [15.2.0] - 2023-04-23
|
||||||
|
|
||||||
### Update Procedure
|
|
||||||
|
|
||||||
Update Procedure see [online documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#update-ota-over-the-air)
|
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
|
||||||
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0)
|
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0)
|
||||||
@@ -13,8 +15,6 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
|
|||||||
- [#2286](https://github.com/jomjol/AI-on-the-edge-device/pull/2286) Implement a camera livestream handler
|
- [#2286](https://github.com/jomjol/AI-on-the-edge-device/pull/2286) Implement a camera livestream handler
|
||||||
- [#2252](https://github.com/jomjol/AI-on-the-edge-device/pull/2252) Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT)
|
- [#2252](https://github.com/jomjol/AI-on-the-edge-device/pull/2252) Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT)
|
||||||
- [#2319](https://github.com/jomjol/AI-on-the-edge-device/pull/2319) Extend InfluxDBv1 with individual topic names
|
- [#2319](https://github.com/jomjol/AI-on-the-edge-device/pull/2319) Extend InfluxDBv1 with individual topic names
|
||||||
- [#](https://github.com/jomjol/AI-on-the-edge-device/pull/)
|
|
||||||
- [#](https://github.com/jomjol/AI-on-the-edge-device/pull/)
|
|
||||||
|
|
||||||
#### Changed
|
#### Changed
|
||||||
|
|
||||||
@@ -37,10 +37,6 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
|
|||||||
|
|
||||||
## [15.1.1] - 2023-03-23
|
## [15.1.1] - 2023-03-23
|
||||||
|
|
||||||
### Update Procedure
|
|
||||||
|
|
||||||
Update Procedure see [online documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#update-ota-over-the-air)
|
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
|
||||||
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1)
|
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1)
|
||||||
@@ -970,7 +966,8 @@ External Illumination
|
|||||||
- Initial Version
|
- Initial Version
|
||||||
|
|
||||||
|
|
||||||
[15.2.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.1.2
|
[15.2.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.0...v15.2.1
|
||||||
|
[15.2.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0
|
||||||
[15.1.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1
|
[15.1.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1
|
||||||
[15.1.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.0.3...v15.1.0
|
[15.1.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.0.3...v15.1.0
|
||||||
[15.0.3]: https://github.com/jomjol/AI-on-the-edge-device/compare/v14.0.3...v15.0.3
|
[15.0.3]: https://github.com/jomjol/AI-on-the-edge-device/compare/v14.0.3...v15.0.3
|
||||||
|
|||||||
@@ -218,6 +218,8 @@ bool ClassFlowTakeImage::doFlow(string zwtime)
|
|||||||
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
psram_deinit_shared_memory_for_take_image_step();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -657,20 +657,32 @@ esp_err_t handler_editflow(httpd_req_t *req)
|
|||||||
|
|
||||||
string out2 = out.substr(0, out.length() - 4) + "_org.jpg";
|
string out2 = out.substr(0, out.length() - 4) + "_org.jpg";
|
||||||
|
|
||||||
CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in);
|
if ((*flowctrl.getActStatus() == "Flow finished") && psram_init_shared_memory_for_take_image_step()) {
|
||||||
caic->CutAndSave(out2, x, y, dx, dy);
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Taking image for Alignment Mark Update...");
|
||||||
delete caic;
|
|
||||||
|
|
||||||
CImageBasis *cim = new CImageBasis("cutref", out2);
|
CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in);
|
||||||
if (enhance)
|
caic->CutAndSave(out2, x, y, dx, dy);
|
||||||
{
|
delete caic;
|
||||||
cim->Contrast(90);
|
|
||||||
|
CImageBasis *cim = new CImageBasis("cutref", out2);
|
||||||
|
if (enhance)
|
||||||
|
{
|
||||||
|
cim->Contrast(90);
|
||||||
|
}
|
||||||
|
|
||||||
|
cim->SaveToFile(out);
|
||||||
|
delete cim;
|
||||||
|
|
||||||
|
psram_deinit_shared_memory_for_take_image_step();
|
||||||
|
|
||||||
|
|
||||||
|
zw = "CutImage Done";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!");
|
||||||
|
zw = "Device Busy";
|
||||||
}
|
}
|
||||||
|
|
||||||
cim->SaveToFile(out);
|
|
||||||
delete cim;
|
|
||||||
|
|
||||||
zw = "CutImage Done";
|
|
||||||
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
|
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
|
||||||
httpd_resp_send(req, zw.c_str(), zw.length());
|
httpd_resp_send(req, zw.c_str(), zw.length());
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ using namespace std;
|
|||||||
|
|
||||||
void *shared_region = NULL;
|
void *shared_region = NULL;
|
||||||
uint32_t allocatedBytesForSTBI = 0;
|
uint32_t allocatedBytesForSTBI = 0;
|
||||||
|
std::string sharedMemoryInUseFor = "";
|
||||||
|
|
||||||
|
|
||||||
/** Reserve a large block in the PSRAM which will be shared between the different steps.
|
/** Reserve a large block in the PSRAM which will be shared between the different steps.
|
||||||
@@ -33,9 +34,24 @@ bool reserve_psram_shared_region(void) {
|
|||||||
/*******************************************************************
|
/*******************************************************************
|
||||||
* Memory used in Take Image (STBI)
|
* Memory used in Take Image (STBI)
|
||||||
*******************************************************************/
|
*******************************************************************/
|
||||||
void psram_init_shared_memory_for_take_image_step(void) {
|
bool psram_init_shared_memory_for_take_image_step(void) {
|
||||||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init shared memory for step 'Take Image' (STBI buffers)");
|
if (sharedMemoryInUseFor != "") {
|
||||||
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Shared memory in PSRAM already in use for " + sharedMemoryInUseFor + "!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init shared memory for step 'Take Image' (STBI buffers)");
|
||||||
allocatedBytesForSTBI = 0;
|
allocatedBytesForSTBI = 0;
|
||||||
|
sharedMemoryInUseFor = "TakeImage";
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void psram_deinit_shared_memory_for_take_image_step(void) {
|
||||||
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Deinit shared memory for step 'Take Image' (STBI buffers)");
|
||||||
|
allocatedBytesForSTBI = 0;
|
||||||
|
sharedMemoryInUseFor = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -45,7 +61,8 @@ void *psram_reserve_shared_stbi_memory(size_t size) {
|
|||||||
if (size >= 100000) {
|
if (size >= 100000) {
|
||||||
if ((allocatedBytesForSTBI + size) > TENSOR_ARENA_SIZE + MAX_MODEL_SIZE) { // Check if it still fits in the shared region
|
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 " +
|
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!");
|
std::to_string(size) + " bytes! Available: " + std::to_string(TENSOR_ARENA_SIZE + MAX_MODEL_SIZE - allocatedBytesForSTBI) + " bytes!");
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,14 +100,21 @@ void psram_free_shared_stbi_memory(void *p) {
|
|||||||
* During this step we only use the shared part of the PSRAM
|
* During this step we only use the shared part of the PSRAM
|
||||||
* for the tmpImage.
|
* for the tmpImage.
|
||||||
*******************************************************************/
|
*******************************************************************/
|
||||||
void *psram_reserve_shared_tmp_image_memory(void) {
|
void *psram_reserve_shared_tmp_image_memory(void) {
|
||||||
|
if (sharedMemoryInUseFor != "") {
|
||||||
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Shared memory in PSRAM already in use for " + sharedMemoryInUseFor + "!");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating tmpImage (" + std::to_string(IMAGE_SIZE) + " bytes, use shared memory in PSRAM)...");
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating tmpImage (" + std::to_string(IMAGE_SIZE) + " bytes, use shared memory in PSRAM)...");
|
||||||
|
sharedMemoryInUseFor = "Aligning";
|
||||||
return shared_region; // Use 1th part of the shared memory for the tmpImage (only user)
|
return shared_region; // Use 1th part of the shared memory for the tmpImage (only user)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void psram_free_shared_temp_image_memory(void) {
|
void psram_free_shared_temp_image_memory(void) {
|
||||||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Shared memory used for tmpImage (PSRAM, part of shared memory) is free again");
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Shared memory used for tmpImage (PSRAM, part of shared memory) is free again");
|
||||||
|
sharedMemoryInUseFor = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -103,18 +127,33 @@ void psram_free_shared_temp_image_memory(void) {
|
|||||||
* Tensor Arena. Therefore we do not need to monitor the usage.
|
* Tensor Arena. Therefore we do not need to monitor the usage.
|
||||||
*******************************************************************/
|
*******************************************************************/
|
||||||
void *psram_get_shared_tensor_arena_memory(void) {
|
void *psram_get_shared_tensor_arena_memory(void) {
|
||||||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating Tensor Arena (" + std::to_string(TENSOR_ARENA_SIZE) + " bytes, use shared memory in PSRAM)...");
|
if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitalization_Model")) {
|
||||||
return shared_region; // Use 1th part of the shared memory for Tensor
|
sharedMemoryInUseFor = "Digitalization_Tensor";
|
||||||
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating Tensor Arena (" + std::to_string(TENSOR_ARENA_SIZE) + " bytes, use shared memory in PSRAM)...");
|
||||||
|
return shared_region; // Use 1th part of the shared memory for Tensor
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Shared memory in PSRAM already in use for " + sharedMemoryInUseFor + "!");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *psram_get_shared_model_memory(void) {
|
void *psram_get_shared_model_memory(void) {
|
||||||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating Model memory (" + std::to_string(MAX_MODEL_SIZE) + " bytes, use shared memory in PSRAM)...");
|
if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitalization_Tensor")) {
|
||||||
return (uint8_t *)shared_region + TENSOR_ARENA_SIZE; // Use 2nd part of the shared memory (after Tensor Arena) for the model
|
sharedMemoryInUseFor = "Digitalization_Model";
|
||||||
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating Model memory (" + std::to_string(MAX_MODEL_SIZE) + " bytes, use shared memory in PSRAM)...");
|
||||||
|
return (uint8_t *)shared_region + TENSOR_ARENA_SIZE; // Use 2nd part of the shared memory (after Tensor Arena) for the model
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Shared memory in PSRAM already in use for " + sharedMemoryInUseFor + "!");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void psram_free_shared_tensor_arena_and_model_memory(void) {
|
void psram_free_shared_tensor_arena_and_model_memory(void) {
|
||||||
|
sharedMemoryInUseFor = "";
|
||||||
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Shared memory used for Tensor Arena and model (PSRAM, part of shared memory) is free again");
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Shared memory used for Tensor Arena and model (PSRAM, part of shared memory) is free again");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ bool reserve_psram_shared_region(void);
|
|||||||
|
|
||||||
|
|
||||||
/* Memory used in Take Image Step */
|
/* Memory used in Take Image Step */
|
||||||
void psram_init_shared_memory_for_take_image_step(void);
|
bool psram_init_shared_memory_for_take_image_step(void);
|
||||||
|
void psram_deinit_shared_memory_for_take_image_step(void);
|
||||||
void *psram_reserve_shared_stbi_memory(size_t size);
|
void *psram_reserve_shared_stbi_memory(size_t size);
|
||||||
void *psram_reallocate_shared_stbi_memory(void *ptr, size_t newsize);
|
void *psram_reallocate_shared_stbi_memory(void *ptr, size_t newsize);
|
||||||
void psram_free_shared_stbi_memory(void *p);
|
void psram_free_shared_stbi_memory(void *p);
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ select {
|
|||||||
<tr>
|
<tr>
|
||||||
<td style="padding-top: 10px">x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()"></td>
|
<td style="padding-top: 10px">x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()"></td>
|
||||||
<td style="padding-top: 10px">dx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchanged()"></td>
|
<td style="padding-top: 10px">dx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchanged()"></td>
|
||||||
<td rowspan="2" style="padding-top: 10px"><input class="button" type="button" value="Update Reference" onclick="CutOutReference()"></td>
|
<td rowspan="2" style="padding-top: 10px"><input class="button" type="button" value="Update Reference Image" onclick="CutOutReference()"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()"></td>
|
<td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()"></td>
|
||||||
@@ -133,7 +133,7 @@ function SaveToConfig(){
|
|||||||
WriteConfigININew();
|
WriteConfigININew();
|
||||||
UpdateConfigReference(domainname)
|
UpdateConfigReference(domainname)
|
||||||
SaveConfigToServer(domainname);
|
SaveConfigToServer(domainname);
|
||||||
firework.launch('Configuration got updated. It will get applied after the next reboot!', 'success', 5000);
|
firework.launch('Reference Marks got updated. The change will get applied after the next reboot!', 'success', 5000);
|
||||||
}
|
}
|
||||||
|
|
||||||
function EnhanceContrast(){
|
function EnhanceContrast(){
|
||||||
@@ -144,8 +144,9 @@ function EnhanceContrast(){
|
|||||||
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
|
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
|
||||||
|
|
||||||
enhanceCon = true;
|
enhanceCon = true;
|
||||||
MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname);
|
if (MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname)) {
|
||||||
UpdateReference();
|
UpdateReference();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function UpdateReference(){
|
function UpdateReference(){
|
||||||
@@ -250,9 +251,10 @@ function dataURLtoBlob(dataurl) {
|
|||||||
refInfo[aktindex]["y"] = document.getElementById("refy").value;
|
refInfo[aktindex]["y"] = document.getElementById("refy").value;
|
||||||
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
|
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
|
||||||
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
|
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
|
||||||
MakeRefZW(refInfo[aktindex], domainname);
|
if (MakeRefZW(refInfo[aktindex], domainname)) {
|
||||||
UpdateReference();
|
UpdateReference();
|
||||||
document.getElementById("enhancecontrast").disabled = false;
|
document.getElementById("enhancecontrast").disabled = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function drawGrid(){
|
function drawGrid(){
|
||||||
|
|||||||
@@ -272,7 +272,7 @@ table {
|
|||||||
SaveCanvasToImage(canvas, "/config/reference.jpg", true, getDomainname());
|
SaveCanvasToImage(canvas, "/config/reference.jpg", true, getDomainname());
|
||||||
showReference(param);
|
showReference(param);
|
||||||
UpdatePage();
|
UpdatePage();
|
||||||
firework.launch('Reference got updated. It will get applied after the next reboot!', 'success', 5000);
|
firework.launch('Reference got saved. It will get applied after the next reboot!', 'success', 5000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -252,11 +252,21 @@ function MakeContrastImageZW(zw, _enhance, _domainname){
|
|||||||
var xhttp = new XMLHttpRequest();
|
var xhttp = new XMLHttpRequest();
|
||||||
try {
|
try {
|
||||||
xhttp.open("GET", url, false);
|
xhttp.open("GET", url, false);
|
||||||
xhttp.send(); }
|
xhttp.send();
|
||||||
|
}
|
||||||
catch (error)
|
catch (error)
|
||||||
{
|
{
|
||||||
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (xhttp.responseText == "CutImage Done") {
|
||||||
|
firework.launch('Reference Image Contrast got enhanced.', 'success', 5000);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -268,13 +278,23 @@ function MakeRefZW(zw, _domainname){
|
|||||||
var xhttp = new XMLHttpRequest();
|
var xhttp = new XMLHttpRequest();
|
||||||
try {
|
try {
|
||||||
xhttp.open("GET", url, false);
|
xhttp.open("GET", url, false);
|
||||||
xhttp.send(); }
|
xhttp.send();
|
||||||
|
}
|
||||||
catch (error)
|
catch (error)
|
||||||
{
|
{
|
||||||
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
||||||
}
|
}
|
||||||
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
|
|
||||||
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
|
if (xhttp.responseText == "CutImage Done") {
|
||||||
FileCopyOnServer(_filetarget, _filetarget2, _domainname);
|
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
|
||||||
|
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
|
||||||
|
FileCopyOnServer(_filetarget, _filetarget2, _domainname);
|
||||||
|
firework.launch('Reference Image got updated.', 'success', 5000);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user