Centralizing the defines (#1624)

* defines changes

* Finish #define move + #define STBI_ONLY_JPEGsave 2% of Flash

* remove the defines on the old places

* ClassFlowCNNGeneral in define.h

* revert to origin

* fix translation not ready

code/components/jomjol_flowcontroll/ClassFlow.cpp

@@ -4,6 +4,7 @@
 #include <iostream>
 #include <string.h>
 #include "esp_log.h"
+#include "../../include/defines.h"
 
 static const char *TAG = "CLASS";
 

code/components/jomjol_flowcontroll/ClassFlow.h

@@ -9,10 +9,6 @@
 
 using namespace std;
 
-#define LOGFILE_TIME_FORMAT "%Y%m%d-%H%M%S"
-#define LOGFILE_TIME_FORMAT_DATE_EXTR substr(0, 8)
-#define LOGFILE_TIME_FORMAT_HOUR_EXTR substr(9, 2)
-
 struct HTMLInfo
 {
 	float val;

code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -7,6 +7,7 @@
 
 
 #include "ClassLogFile.h"
+#include "../../include/defines.h"
 
 
 static const char *TAG = "ALIGN";

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp

@@ -8,6 +8,7 @@
 #include "CTfLiteClass.h"
 #include "ClassLogFile.h"
 #include "esp_log.h"
+#include "../../include/defines.h"
 
 static const char* TAG = "CNN";
 

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h

@@ -23,13 +23,15 @@ protected:
     t_CNNType CNNType;
     std::vector<general*> GENERAL;
     float CNNGoodThreshold;
-    float AnalogFehler = 3.0;
-    float AnalogToDigtalFehler = 0.8;
-    float DigitalUnschaerfe = 0.2;
-    int DigitalBand = 3;
-    float DigitalAnalogerVorgaengerUebergangsbereich = 2;
-    float DigitalUebergangsbereichVorgaenger = 0.7; // 9.3 - 0.7
-    float DigitalUebergangsbereichVorlauf = 9.7; // Vorlauf-Nulldurchgang passiert erst ab ca. 9.7
+	//moved to define.h
+    //float Analog_error = 3.0;
+    //float AnalogToDigtalFehler = 0.8;
+    //float Digital_Uncertainty = 0.2;
+    //int DigitalBand = 3;
+    //float Digital_Transition_Range_Predecessor = 2;
+    //float Digital_Transition_Area_Predecessor = 0.7; // 9.3 - 0.7
+    //float Digital_Transition_Area_Forward = 9.7; // Pre-run zero crossing only happens from approx. 9.7 onwards
+
 
     string cnnmodelfile;
     int modelxsize, modelysize, modelchannel;

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -24,11 +24,8 @@ extern "C" {
     #include "server_mqtt.h"
 #endif //ENABLE_MQTT
 
-//#include "CImg.h"
-
 #include "server_help.h"
-
-//#define DEBUG_DETAIL_ON  
+#include "../../include/defines.h"
 
 static const char* TAG = "CTRL";
 

code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -19,13 +19,6 @@
 #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
 {

code/components/jomjol_flowcontroll/ClassFlowImage.cpp

@@ -15,6 +15,7 @@ extern "C" {
 #include "ClassLogFile.h"
 #include "CImageBasis.h"
 #include "esp_log.h"
+#include "../../include/defines.h"
 
 static const char* TAG = "IMG";
 

code/components/jomjol_flowcontroll/ClassFlowInfluxDB.cpp

@@ -9,6 +9,7 @@
 
 #include "ClassFlowPostProcessing.h"
 #include "esp_log.h"
+#include "../../include/defines.h"
 
 #include <time.h>
 

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -15,14 +15,9 @@
 #include "server_mqtt.h"
 
 #include <time.h>
-
-
-#define __HIDE_PASSWORD
+#include "../../include/defines.h"
 
 static const char *TAG = "MQTT";
-#define LWT_TOPIC        "connection"
-#define LWT_CONNECTED    "connected"
-#define LWT_DISCONNECTED "connection lost"
 
 extern const char* libfive_git_version(void);
 extern const char* libfive_git_revision(void);

code/components/jomjol_flowcontroll/ClassFlowMakeImage.cpp

@@ -7,6 +7,7 @@
 
 #include "esp_wifi.h"
 #include "esp_log.h"
+#include "../../include/defines.h"
 
 #include <time.h>
 

code/components/jomjol_flowcontroll/ClassFlowMakeImage.h

@@ -1,15 +1,10 @@
 #pragma once
 #include "ClassFlowImage.h"
 #include "ClassControllCamera.h"
+#include "../../include/defines.h"
 
 #include <string>
 
-#define BLINK_GPIO GPIO_NUM_4
-
-#define CAMERA_MODEL_AI_THINKER
-
-
-
 class ClassFlowMakeImage :
     public ClassFlowImage
 {

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -11,16 +11,10 @@
 #include "time_sntp.h"
 
 #include "esp_log.h"
+#include "../../include/defines.h"
 
 static const char* TAG = "POSTPROC";
 
-//#define SERIAL_DEBUG // testing debug on serial enabled
-
-
-#define PREVALUE_TIME_FORMAT_OUTPUT "%Y-%m-%dT%H:%M:%S%z"
-#define PREVALUE_TIME_FORMAT_INPUT "%d-%d-%dT%d:%d:%d"
-
-
 std::string ClassFlowPostProcessing::getNumbersName()
 {
     std::string ret="";

code/components/jomjol_flowcontroll/ClassFlowWriteList.cpp

@@ -3,7 +3,7 @@
 #include "Helper.h"
 
 #include "time_sntp.h"
-
+#include "../../include/defines.h"
 
 #include <time.h>
 

code/components/jomjol_flowcontroll/camera_define.h

@@ -1,101 +0,0 @@
-#ifndef CAMERADEFINED
-#define CAMERADEFINED
-
-
-#if defined(CAMERA_MODEL_WROVER_KIT)
-#define PWDN_GPIO_NUM    -1
-#define RESET_GPIO_NUM   -1
-#define XCLK_GPIO_NUM    21
-#define SIOD_GPIO_NUM    26
-#define SIOC_GPIO_NUM    27
-
-#define Y9_GPIO_NUM      35
-#define Y8_GPIO_NUM      34
-#define Y7_GPIO_NUM      39
-#define Y6_GPIO_NUM      36
-#define Y5_GPIO_NUM      19
-#define Y4_GPIO_NUM      18
-#define Y3_GPIO_NUM       5
-#define Y2_GPIO_NUM       4
-#define VSYNC_GPIO_NUM   25
-#define HREF_GPIO_NUM    23
-#define PCLK_GPIO_NUM    22
-
-#elif defined(CAMERA_MODEL_M5STACK_PSRAM)
-#define PWDN_GPIO_NUM     -1
-#define RESET_GPIO_NUM    15
-#define XCLK_GPIO_NUM     27
-#define SIOD_GPIO_NUM     25
-#define SIOC_GPIO_NUM     23
-
-#define Y9_GPIO_NUM       19
-#define Y8_GPIO_NUM       36
-#define Y7_GPIO_NUM       18
-#define Y6_GPIO_NUM       39
-#define Y5_GPIO_NUM        5
-#define Y4_GPIO_NUM       34
-#define Y3_GPIO_NUM       35
-#define Y2_GPIO_NUM       32
-#define VSYNC_GPIO_NUM    22
-#define HREF_GPIO_NUM     26
-#define PCLK_GPIO_NUM     21
-
-#elif defined(CAMERA_MODEL_AI_THINKER)
-#define PWDN_GPIO_NUM     GPIO_NUM_32
-#define RESET_GPIO_NUM    -1
-#define XCLK_GPIO_NUM      GPIO_NUM_0
-#define SIOD_GPIO_NUM     GPIO_NUM_26
-#define SIOC_GPIO_NUM     GPIO_NUM_27
-
-#define Y9_GPIO_NUM       GPIO_NUM_35
-#define Y8_GPIO_NUM       GPIO_NUM_34
-#define Y7_GPIO_NUM       GPIO_NUM_39
-#define Y6_GPIO_NUM       GPIO_NUM_36
-#define Y5_GPIO_NUM       GPIO_NUM_21
-#define Y4_GPIO_NUM       GPIO_NUM_19
-#define Y3_GPIO_NUM       GPIO_NUM_18
-#define Y2_GPIO_NUM        GPIO_NUM_5
-#define VSYNC_GPIO_NUM    GPIO_NUM_25
-#define HREF_GPIO_NUM     GPIO_NUM_23
-#define PCLK_GPIO_NUM     GPIO_NUM_22
-
-#else
-#error "Camera model not selected"
-#endif
-
-
-
-static camera_config_t camera_config = {
-    .pin_pwdn  = PWDN_GPIO_NUM,
-    .pin_reset = RESET_GPIO_NUM,
-    .pin_xclk = XCLK_GPIO_NUM,
-    .pin_sscb_sda = SIOD_GPIO_NUM,
-    .pin_sscb_scl = SIOC_GPIO_NUM,
-
-    .pin_d7 = Y9_GPIO_NUM,
-    .pin_d6 = Y8_GPIO_NUM,
-    .pin_d5 = Y7_GPIO_NUM,
-    .pin_d4 = Y6_GPIO_NUM,
-    .pin_d3 = Y5_GPIO_NUM,
-    .pin_d2 = Y4_GPIO_NUM,
-    .pin_d1 = Y3_GPIO_NUM,
-    .pin_d0 = Y2_GPIO_NUM,
-    .pin_vsync = VSYNC_GPIO_NUM,
-    .pin_href = HREF_GPIO_NUM,
-    .pin_pclk = PCLK_GPIO_NUM,
-
-    //XCLK 20MHz or 10MHz for OV2640 double FPS (Experimental)
-    .xclk_freq_hz = 20000000,
-    .ledc_timer = LEDC_TIMER_0,
-    .ledc_channel = LEDC_CHANNEL_0,
-
-    .pixel_format = PIXFORMAT_JPEG,//YUV422,GRAYSCALE,RGB565,JPEG
-//    .pixel_format = PIXFORMAT_RGB888,//YUV422,GRAYSCALE,RGB565,JPEG
-//    .frame_size = FRAMESIZE_QVGA,//QQVGA-QXGA Do not use sizes above QVGA when not JPEG
-    .frame_size = FRAMESIZE_SVGA,//QQVGA-QXGA Do not use sizes above QVGA when not JPEG
-
-    .jpeg_quality = 12, //0-63 lower number means higher quality
-    .fb_count = 1 //if more than one, i2s runs in continuous mode. Use only with JPEG
-};
-
-#endif