Merge pull request #6 from viordash/ElementsStorage

Elements storage
viordash · Sep 8, 2024 · 485164d · 485164d
2 parents 6bb8e1d + a2d1622
commit 485164d
Show file tree

Hide file tree

Showing 112 changed files with 3,512 additions and 1,663 deletions.
diff --git a/PLC_esp8266/.vscode/settings.json b/PLC_esp8266/.vscode/settings.json
@@ -107,6 +107,11 @@
         "variant": "cpp",
         "logicprogram.h": "c",
         "controller_engine.h": "c",
-        "process_engine.h": "c"
+        "process_engine.h": "c",
+        "portable.h": "c",
+        "portmacro.h": "c",
+        "xtensa_rtos.h": "c",
+        "xtensa_timer.h": "c",
+        "freertosconfig.h": "c"
     }
 }
diff --git a/PLC_esp8266/Makefile b/PLC_esp8266/Makefile
@@ -12,7 +12,7 @@ SHELL := env PATH=$(PATH) /bin/bash
 
 project_prepare:
 	@tar -xzf $(PWD)/../SDK/xtensa-lx106-elf-gcc8_4_0-esp-2020r3-linux-amd64.tar.gz -C $(PWD)/../SDK/
-	@mkdir $(PWD)/main/MigrateAnyData
+	@mkdir -p $(PWD)/main/MigrateAnyData
 	@ln -sf $(PWD)/../SDK/MigrateAnyCppData/MigrateAnyData/MigrateAnyData.cpp $(PWD)/main/MigrateAnyData/MigrateAnyData.cpp
 	@ln -sf $(PWD)/../SDK/MigrateAnyCppData/MigrateAnyData/MigrateAnyData.h $(PWD)/main/MigrateAnyData/MigrateAnyData.h
 

diff --git a/PLC_esp8266/main/Display/DisplayChainItem.cpp b/PLC_esp8266/main/Display/DisplayChainItem.cpp
diff --git a/PLC_esp8266/main/Display/DisplayChainItem.h b/PLC_esp8266/main/Display/DisplayChainItem.h
diff --git a/PLC_esp8266/main/Display/DisplayItemBase.cpp b/PLC_esp8266/main/Display/DisplayItemBase.cpp
diff --git a/PLC_esp8266/main/Display/DisplayItemBase.h b/PLC_esp8266/main/Display/DisplayItemBase.h
diff --git a/PLC_esp8266/main/Display/LabeledLogicItem.cpp b/PLC_esp8266/main/Display/LabeledLogicItem.cpp
@@ -5,11 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-LabeledLogicItem::LabeledLogicItem(const char *label) {
+void LabeledLogicItem::SetLabel(const char *label) {
     this->label = label;
     this->width = 6 * strlen(label);
     this->height = 12;
 }
-
-LabeledLogicItem::~LabeledLogicItem() {
-}
diff --git a/PLC_esp8266/main/Display/LabeledLogicItem.h b/PLC_esp8266/main/Display/LabeledLogicItem.h
@@ -10,7 +10,7 @@ class LabeledLogicItem {
     uint8_t width;
     uint8_t height;
 
+    void SetLabel(const char *label);
+
   public:
-    explicit LabeledLogicItem(const char *label);
-    virtual ~LabeledLogicItem();
 };
diff --git a/PLC_esp8266/main/Display/MapIOIndicator.cpp b/PLC_esp8266/main/Display/MapIOIndicator.cpp
@@ -1,18 +1,13 @@
 #include "Display/MapIOIndicator.h"
-#include "Display/Common.h"
+#include "Display/display.h"
 #include "LogicProgram/MapIO.h"
 #include "esp_err.h"
 #include "esp_log.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-MapIOIndicator::MapIOIndicator(const Point &incoming_point,
-                               const char *name,
-                               uint8_t progress,
-                               uint8_t separator_width)
-    : DisplayItemBase() {
-    this->incoming_point = incoming_point;
+MapIOIndicator::MapIOIndicator(const char *name, uint8_t progress, uint8_t separator_width) {
     this->name = name;
     this->progress = progress;
     this->separator_width = separator_width;
@@ -21,21 +16,22 @@ MapIOIndicator::MapIOIndicator(const Point &incoming_point,
 MapIOIndicator::~MapIOIndicator() {
 }
 
-bool MapIOIndicator::Render(uint8_t *fb) {
+bool MapIOIndicator::Render(uint8_t *fb, Point *start_point) {
     bool res;
-    res = draw_horz_progress_bar(fb, incoming_point.x + margin, incoming_point.y, progress);
+
+    start_point->x += margin;
+
+    res = draw_horz_progress_bar(fb, start_point->x, start_point->y, progress);
 
     res &= draw_text_f5X7(fb,
-                          incoming_point.x + margin,
-                          incoming_point.y + margin + HORZ_PROGRESS_BAR_HEIGHT,
+                          start_point->x + margin,
+                          start_point->y + margin + HORZ_PROGRESS_BAR_HEIGHT,
                           name);
+
+    start_point->x += (text_width * name_size) + margin + margin + separator_width;          
     return res;
 }
 
-uint8_t MapIOIndicator::GetWidth() {
-    return margin + (text_width * name_size) + margin + margin;
-}
-
 uint8_t MapIOIndicator::GetHeight() {
     return HORZ_PROGRESS_BAR_HEIGHT + text_height;
 }
diff --git a/PLC_esp8266/main/Display/MapIOIndicator.h b/PLC_esp8266/main/Display/MapIOIndicator.h
@@ -1,13 +1,11 @@
 #pragma once
 
 #include "Display/Common.h"
-#include "Display/DisplayItemBase.h"
 #include <stdint.h>
 #include <unistd.h>
 
-class MapIOIndicator : public DisplayItemBase {
+class MapIOIndicator {
   protected:
-    Point incoming_point;
     const char *name;
     uint8_t progress;
     uint8_t separator_width;
@@ -18,13 +16,9 @@ class MapIOIndicator : public DisplayItemBase {
     static const uint8_t margin = 1;
 
   public:
-    explicit MapIOIndicator(const Point &incoming_point,
-                            const char *name,
-                            uint8_t progress,
-                            uint8_t separator_width);
+    explicit MapIOIndicator(const char *name, uint8_t progress, uint8_t separator_width);
     virtual ~MapIOIndicator();
 
-    bool Render(uint8_t *fb) override final;
-    static uint8_t GetWidth();
+    bool Render(uint8_t *fb, Point *start_point);
     static uint8_t GetHeight();
 };
diff --git a/PLC_esp8266/main/Display/display.cpp b/PLC_esp8266/main/Display/display.cpp
@@ -20,7 +20,7 @@ extern "C" {
 #define SCL_PIN GPIO_NUM_4
 #define SDA_PIN GPIO_NUM_5
 
-static const char *TAG = "display";
+static const char *TAG_display = "display";
 
 static struct {
     ssd1306_t dev = { .i2c_port = I2C_NUM_0,
@@ -75,7 +75,7 @@ void display_init() {
 
     // ESP_ERROR_CHECK(ssd1306_load_frame_buffer(&display.dev, display.buffer) != 0 ? ESP_FAIL
     //                                                                              : ESP_OK);
-    ESP_LOGI(TAG, "init succesfully");
+    ESP_LOGI(TAG_display, "init succesfully");
 }
 
 void ladder_diagram(int8_t x, int8_t y) {

diff --git a/PLC_esp8266/main/LogicProgram/Controller.cpp b/PLC_esp8266/main/LogicProgram/Controller.cpp
@@ -3,6 +3,8 @@
 #include "LogicProgram/Controller.h"
 
 #include "Display/Common.h"
+#include "Display/display.h"
+#include "LogicProgram/Ladder.h"
 #include "LogicProgram/LogicProgram.h"
 #include "LogicProgram/StatusBar.h"
 #include "esp_event.h"
@@ -14,80 +16,54 @@
 
 static const char *TAG_Controller = "controller";
 
-uint8_t Controller::Var1 = StatefulElement::MinValue;
-uint8_t Controller::Var2 = StatefulElement::MinValue;
-uint8_t Controller::Var3 = StatefulElement::MinValue;
-uint8_t Controller::Var4 = StatefulElement::MinValue;
+bool Controller::runned = false;
+EventGroupHandle_t Controller::gpio_events = NULL;
 
-Controller::Controller(EventGroupHandle_t gpio_events) {
-    runned = false;
-    this->gpio_events = gpio_events;
-}
-
-Controller::~Controller() {
-    Stop();
-}
+uint8_t Controller::Var1 = LogicElement::MinValue;
+uint8_t Controller::Var2 = LogicElement::MinValue;
+uint8_t Controller::Var3 = LogicElement::MinValue;
+uint8_t Controller::Var4 = LogicElement::MinValue;
 
-void Controller::Start() {
-    runned = true;
-    ESP_ERROR_CHECK(xTaskCreate(ProcessTask, "controller_task", 4096, this, 3, NULL) != pdPASS
+void Controller::Start(EventGroupHandle_t gpio_events) {
+    Controller::gpio_events = gpio_events;
+    Controller::runned = true;
+    ESP_ERROR_CHECK(xTaskCreate(ProcessTask, "controller_task", 4096, NULL, 3, NULL) != pdPASS
                         ? ESP_FAIL
                         : ESP_OK);
 }
 
 void Controller::Stop() {
-    runned = false;
+    Controller::runned = false;
 }
 
 void Controller::ProcessTask(void *parm) {
+    (void)parm;
     ESP_LOGI(TAG_Controller, "start ++++++");
-    Controller *controller = (Controller *)parm;
-    StatusBar statusBar(controller, 0);
-
-    IncomeRail incomeRail0(controller, 0, LogicItemState::lisActive);
 
-    InputNO input00(MapIO::DI, &incomeRail0);
-    InputNC input01(MapIO::V1, &input00);
-    TimerMSecs timer00(500, &input01);
-    SetOutput output00(MapIO::V1, &timer00);
-    OutcomeRail outcomeRail0(&output00, 0);
-
-    IncomeRail incomeRail1(controller, 1, LogicItemState::lisActive);
-    InputNO input10(MapIO::DI, &incomeRail1);
-    InputNO input11(MapIO::V1, &input10);
-    TimerMSecs timer10(500, &input11);
-    ResetOutput output10(MapIO::V1, &timer10);
-    OutcomeRail outcomeRail1(&output10, 1);
+    StatusBar statusBar(0);
+    Ladder ladder;
+    ladder.Load();
 
     bool need_render = true;
-    while (controller->runned) {
+    while (Controller::runned) {
         const int read_adc_max_period_ms = 100;
-        EventBits_t uxBits = xEventGroupWaitBits(controller->gpio_events,
+        EventBits_t uxBits = xEventGroupWaitBits(Controller::gpio_events,
                                                  INPUT_1_IO_CLOSE | INPUT_1_IO_OPEN,
                                                  true,
                                                  false,
                                                  read_adc_max_period_ms / portTICK_PERIOD_MS);
 
         need_render |= (uxBits & (INPUT_1_IO_CLOSE | INPUT_1_IO_OPEN));
 
-        need_render |= incomeRail0.DoAction();
-        need_render |= incomeRail1.DoAction();
-
-        // need_render |= timer00.ProgressHasChanges();
-        // need_render |= timer10.ProgressHasChanges();
+        need_render |= ladder.DoAction();
 
         if (need_render) {
             ESP_LOGI(TAG_Controller, ".");
 
             uint8_t *fb = begin_render();
 
             statusBar.Render(fb);
-
-            incomeRail0.Render(fb);
-            outcomeRail0.Render(fb);
-
-            incomeRail1.Render(fb);
-            outcomeRail1.Render(fb);
+            ladder.Render(fb);
 
             end_render(fb);
             need_render = false;
@@ -107,18 +83,18 @@ uint8_t Controller::GetAIRelativeValue() {
 
 uint8_t Controller::GetDIRelativeValue() {
     bool val_1bit = get_digital_input_value();
-    uint8_t percent04 = val_1bit ? StatefulElement::MaxValue : StatefulElement::MinValue;
+    uint8_t percent04 = val_1bit ? LogicElement::MaxValue : LogicElement::MinValue;
     return percent04;
 }
 
 uint8_t Controller::GetO1RelativeValue() {
-    uint8_t percent04 = get_digital_value(gpio_output::OUTPUT_0) ? StatefulElement::MaxValue
-                                                                 : StatefulElement::MinValue;
+    uint8_t percent04 =
+        get_digital_value(gpio_output::OUTPUT_0) ? LogicElement::MaxValue : LogicElement::MinValue;
     return percent04;
 }
 uint8_t Controller::GetO2RelativeValue() {
-    uint8_t percent04 = get_digital_value(gpio_output::OUTPUT_1) ? StatefulElement::MaxValue
-                                                                 : StatefulElement::MinValue;
+    uint8_t percent04 =
+        get_digital_value(gpio_output::OUTPUT_1) ? LogicElement::MaxValue : LogicElement::MinValue;
     return percent04;
 }
 uint8_t Controller::GetV1RelativeValue() {
@@ -135,10 +111,10 @@ uint8_t Controller::GetV4RelativeValue() {
 }
 
 void Controller::SetO1RelativeValue(uint8_t value) {
-    set_digital_value(gpio_output::OUTPUT_0, value != StatefulElement::MinValue);
+    set_digital_value(gpio_output::OUTPUT_0, value != LogicElement::MinValue);
 }
 void Controller::SetO2RelativeValue(uint8_t value) {
-    set_digital_value(gpio_output::OUTPUT_1, value != StatefulElement::MinValue);
+    set_digital_value(gpio_output::OUTPUT_1, value != LogicElement::MinValue);
 }
 void Controller::SetV1RelativeValue(uint8_t value) {
     Controller::Var1 = value;

diff --git a/PLC_esp8266/main/LogicProgram/Controller.h b/PLC_esp8266/main/LogicProgram/Controller.h
@@ -20,19 +20,16 @@ extern "C" {
 
 class Controller {
   private:
-    bool runned;
-    EventGroupHandle_t gpio_events;
+    static bool runned;
+    static EventGroupHandle_t gpio_events;
     static uint8_t Var1;
     static uint8_t Var2;
     static uint8_t Var3;
     static uint8_t Var4;
 
   public:
-    explicit Controller(EventGroupHandle_t gpio_events);
-    ~Controller();
-
-    void Start();
-    void Stop();
+    static void Start(EventGroupHandle_t gpio_events);
+    static void Stop();
 
     static void ProcessTask(void *parm);