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-10 05:26:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
CaCO3
2023-04-23 16:44:19 +02:00
parent eebdd7c6eb 03c84a1ff3
commit e40ceb54ce
8 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp
View File

@@ -190,7 +190,11 @@ bool ClassFlowAlignment::doFlow(string time)
if (!ImageTMP)
{
<<<<<<< HEAD
ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation!
=======
ImageTMP = new CImageBasis("ImageTMP", ImageBasis);
>>>>>>> master
if (!ImageTMP)
{
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!");