From ca09002f85fdd1a4afc5af0dbc36531304172694 Mon Sep 17 00:00:00 2001
From: Jakob Schwendner <jakob.schwendner@gmail.com>
Date: Mon, 4 Dec 2023 22:03:28 +0100
Subject: [PATCH] extend roi to include analog dial calibration values

---
 .../ClassFlowCNNGeneral.cpp                   | 26 ++++++++++++++++++-
 .../ClassFlowDefineTypes.h                    |  2 ++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
index 2d08ff012..681c22153 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
@@ -358,10 +358,18 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph)
             neuroi->deltax = std::stoi(splitted[3]);
             neuroi->deltay = std::stoi(splitted[4]);
             neuroi->CCW = false;
+            neuroi->calibrate = false;
             if (splitted.size() >= 6)
             {
                 neuroi->CCW = toUpper(splitted[5]) == "TRUE";
             }
+            if (splitted.size() >= 9)
+            {
+                neuroi->calibrate = true;
+                neuroi->parallax_x = std::stof(splitted[6]);
+                neuroi->parallax_y = std::stof(splitted[7]);
+                neuroi->value_offset = std::stof(splitted[8]);
+            }
             neuroi->result_float = -1;
             neuroi->image = NULL;
             neuroi->image_org = NULL;
@@ -692,8 +700,24 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time)
                             GENERAL[n]->ROI[roi]->result_float = 10 - (result * 10);
                         else
                             GENERAL[n]->ROI[roi]->result_float = result * 10;
-                              
+                        
                         ESP_LOGD(TAG, "General result (Analog)%i - CCW: %d -  %f", roi, GENERAL[n]->ROI[roi]->CCW, GENERAL[n]->ROI[roi]->result_float);
+
+                        if(GENERAL[n]->ROI[roi]->calibrate)
+                        {
+                            float cw = GENERAL[n]->ROI[roi]->CCW ? 1 : -1;
+                            float dx = GENERAL[n]->ROI[roi]->parallax_x;
+                            float dy = GENERAL[n]->ROI[roi]->parallax_y;
+                            float dval = GENERAL[n]->ROI[roi]->value_offset;
+                            float value = GENERAL[n]->ROI[roi]->result_float;
+                            float angle = cw * value / 10 * (2 * M_PI);
+                            float corrected_angle = atan2(sin(angle) + dx, cos(angle) + dy);
+                            float corrected_value = cw * corrected_angle / (2 * M_PI) * 10 + dval;
+                            GENERAL[n]->ROI[roi]->result_float = fmod(corrected_value + 10, 10);
+
+                            ESP_LOGD(TAG, "General result (Analog)%i - Calibrated: %f (%f, %f, %f)", roi, GENERAL[n]->ROI[roi]->result_float, dx, dy, dval);
+                        }
+                              
                         if (isLogImage)
                             LogImage(logPath, GENERAL[n]->ROI[roi]->name, &GENERAL[n]->ROI[roi]->result_float, NULL, time, GENERAL[n]->ROI[roi]->image_org);
                     } break;
diff --git a/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h b/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h
index 10c7b8e58..114632432 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h
@@ -10,6 +10,8 @@ struct roi {
     float result_float;
     int result_klasse;
     bool isReject, CCW;
+    bool calibrate;
+    float value_offset, parallax_x, parallax_y;
     string name;
     CImageBasis *image, *image_org;
 };