Outsource display functions to display.cpp

move functions for initializing and writing to display to new files
display.cpp/hpp

main/CMakeLists.txt

@@ -5,6 +5,7 @@ idf_component_register(
         "control.cpp"
         "buzzer.cpp"
         "vfd.cpp"
+        "display.cpp"
     INCLUDE_DIRS 
         "."
     )

main/config.hpp

@@ -1,7 +1,5 @@
 #pragma once
-extern "C" {
 #include "driver/adc.h"
-}
 #include "gpio_evaluateSwitch.hpp"
 #include "buzzer.hpp"
 

main/control.cpp

@@ -1,32 +1,5 @@
 #include "control.hpp"
 
-//========================
-//===== init display =====
-//========================
-max7219_t init_display(){
-    // Configure SPI bus
-    spi_bus_config_t cfg;
-    cfg.mosi_io_num = DISPLAY_PIN_NUM_MOSI;
-    cfg.miso_io_num = -1;
-    cfg.sclk_io_num = DISPLAY_PIN_NUM_CLK;
-    cfg.quadwp_io_num = -1;
-    cfg.quadhd_io_num = -1;
-    cfg.max_transfer_sz = 0;
-    cfg.flags = 0;
-    ESP_ERROR_CHECK(spi_bus_initialize(HOST, &cfg, 1));
-
-    // Configure device
-    max7219_t dev;
-    dev.cascade_size = 2;
-    dev.digits = 0;
-    dev.mirrored = true;
-    ESP_ERROR_CHECK(max7219_init_desc(&dev, HOST, MAX7219_MAX_CLOCK_SPEED_HZ, DISPLAY_PIN_NUM_CS));
-    ESP_ERROR_CHECK(max7219_init(&dev));
-    //0...15
-    ESP_ERROR_CHECK(max7219_set_brightness(&dev, 12));
-    return dev;
-}
-
 
 //========================
 //===== init encoder =====
@@ -81,7 +54,6 @@ static const char *TAG = "control"; //tag for logging
 const char* systemStateStr[5] = {"COUNTING", "WINDING_START", "WINDING", "TARGET_REACHED", "MANUAL"};
 systemState_t controlState = COUNTING;
 
-max7219_t display; //display device
 char buf_disp[20]; //both displays
 char buf_disp1[10];// 8 digits + decimal point + \0
 char buf_disp2[10];// 8 digits + decimal point + \0
@@ -169,28 +141,16 @@ void setDynSpeedLvl(uint8_t lvlMax = 3){
 //========================
 void task_control(void *pvParameter)
 {
-    //initialize display
-    display = init_display();
     //initialize encoder
     encoder_queue = init_encoder(&encoder);
 
-    //-----------------------------------
+    //initialize display
-    //------- display welcome msg -------
+    display_init(); //outsourced in display.c
-    //-----------------------------------
+
+    //--- display welcome msg ---
     //display welcome message on two 7 segment displays
-    //show name and date
+    //currently show name and date and scrolling 'hello'
-    ESP_LOGI(TAG, "showing startup message...");
+    display_ShowWelcomeMsg();
-    max7219_clear(&display);
-    max7219_draw_text_7seg(&display, 0, "CUTTER  20.08.2022");
-    //                                   1234567812 34 5678
-    vTaskDelay(pdMS_TO_TICKS(700));
-    //scroll "hello" over 2 displays
-    for (int offset = 0; offset < 23; offset++) {
-        max7219_clear(&display);
-        char hello[23] = "                HELL0 ";
-        max7219_draw_text_7seg(&display, 0, hello + (22 - offset) );
-        vTaskDelay(pdMS_TO_TICKS(50));
-    }
 
 
     //================
@@ -364,16 +324,17 @@ void task_control(void *pvParameter)
         //--------- display ---------
         //---------------------------
         //-- show current position on display1 ---
-        //sprintf(buf_tmp, "%06.1f cm", (float)lengthNow/10); //cm
         sprintf(buf_tmp, "1ST %5.4f", (float)lengthNow/1000); //m
         //                123456789
         //limit length to 8 digits + decimal point (drop decimal places when it does not fit)
         sprintf(buf_disp1, "%.9s", buf_tmp);
+        display1_showString(buf_tmp);
 
         //--- show target length on display2 ---
         //sprintf(buf_disp2, "%06.1f cm", (float)lengthTarget/10); //cm
-        sprintf(buf_disp2, "S0LL%5.3f", (float)lengthTarget/1000); //m
+        sprintf(buf_tmp, "S0LL%5.3f", (float)lengthTarget/1000); //m
         //                  1234  5678
+        display2_showString(buf_tmp);
         
         //TODO: blink disp2 when set button pressed
         //TODO: blink disp2 when preset button pressed (exept manual mode)
@@ -382,8 +343,8 @@ void task_control(void *pvParameter)
 
         //--- write to display ---
         //max7219_clear(&display); //results in flickering display if same value anyways
-        max7219_draw_text_7seg(&display, 0, buf_disp1);
+        //max7219_draw_text_7seg(&display, 0, buf_disp1);
-        max7219_draw_text_7seg(&display, 8, buf_disp2);
+        //max7219_draw_text_7seg(&display, 8, buf_disp2);
 
         //  //switch between two display pages
         //  if (esp_log_timestamp() - timestamp_pageSwitched > 1000){

main/control.hpp

@@ -10,7 +10,6 @@ extern "C"
 #include "esp_log.h"
 #include "driver/adc.h"
 
-#include <max7219.h>
 #include "rotary_encoder.h"
 }
 #include <cmath>
@@ -19,6 +18,7 @@ extern "C"
 #include "gpio_evaluateSwitch.hpp"
 #include "buzzer.hpp"
 #include "vfd.hpp"
+#include "display.hpp"
 
 
 

main/display.cpp

@@ -0,0 +1,97 @@
+#include "display.hpp"
+
+
+//=== variables ===
+static const char *TAG = "display"; //tag for logging
+max7219_t display;
+
+//========================
+//===== init display =====
+//========================
+void display_init(){
+    // Configure SPI bus
+    spi_bus_config_t cfg;
+    cfg.mosi_io_num = DISPLAY_PIN_NUM_MOSI;
+    cfg.miso_io_num = -1;
+    cfg.sclk_io_num = DISPLAY_PIN_NUM_CLK;
+    cfg.quadwp_io_num = -1;
+    cfg.quadhd_io_num = -1;
+    cfg.max_transfer_sz = 0;
+    cfg.flags = 0;
+    ESP_ERROR_CHECK(spi_bus_initialize(HOST, &cfg, 1));
+
+    // Configure device
+    max7219_t dev;
+    dev.cascade_size = 2;
+    dev.digits = 0;
+    dev.mirrored = true;
+    ESP_ERROR_CHECK(max7219_init_desc(&dev, HOST, MAX7219_MAX_CLOCK_SPEED_HZ, DISPLAY_PIN_NUM_CS));
+    ESP_ERROR_CHECK(max7219_init(&dev));
+    //0...15
+    ESP_ERROR_CHECK(max7219_set_brightness(&dev, 12));
+    //return dev;
+    display = dev;
+}
+
+
+
+void display_ShowWelcomeMsg(){
+    //-----------------------------------
+    //------- display welcome msg -------
+    //-----------------------------------
+    //display welcome message on two 7 segment displays
+    //show name and date
+    ESP_LOGI(TAG, "showing startup message...");
+    max7219_clear(&display);
+    max7219_draw_text_7seg(&display, 0, "CUTTER  20.08.2022");
+    //                                   1234567812 34 5678
+    vTaskDelay(pdMS_TO_TICKS(700));
+    //scroll "hello" over 2 displays
+    for (int offset = 0; offset < 23; offset++) {
+        max7219_clear(&display);
+        char hello[23] = "                HELL0 ";
+        max7219_draw_text_7seg(&display, 0, hello + (22 - offset) );
+        vTaskDelay(pdMS_TO_TICKS(50));
+    }
+}
+
+
+
+void display1_showString(const char * buf){
+        max7219_draw_text_7seg(&display, 0, buf);
+}
+void display2_showString(const char * buf){
+        max7219_draw_text_7seg(&display, 8, buf);
+}
+
+void display_showString(uint8_t pos, const char * buf){
+        max7219_draw_text_7seg(&display, pos, buf);
+}
+
+//        //---------------------------
+//        //--------- display ---------
+//        //---------------------------
+//        //-- show current position on display1 ---
+//        //sprintf(buf_tmp, "%06.1f cm", (float)lengthNow/10); //cm
+//        sprintf(buf_tmp, "1ST %5.4f", (float)lengthNow/1000); //m
+//        //                123456789
+//        //limit length to 8 digits + decimal point (drop decimal places when it does not fit)
+//        sprintf(buf_disp1, "%.9s", buf_tmp);
+//
+//        //--- show target length on display2 ---
+//        //sprintf(buf_disp2, "%06.1f cm", (float)lengthTarget/10); //cm
+//        sprintf(buf_disp2, "S0LL%5.3f", (float)lengthTarget/1000); //m
+//        //                  1234  5678
+//        
+//                //TODO: blink disp2 when set button pressed
+//        //TODO: blink disp2 when preset button pressed (exept manual mode)
+//        //TODO: write "MAN CTL" to disp2 when in manual mode
+//        //TODO: display or blink "REACHED" when reached state and start pressed
+//
+//        //--- write to display ---
+//        //max7219_clear(&display); //results in flickering display if same value anyways
+//        max7219_draw_text_7seg(&display, 0, buf_disp1);
+//        max7219_draw_text_7seg(&display, 8, buf_disp2);
+//
+//
+//

main/display.hpp

@@ -0,0 +1,23 @@
+#pragma once
+extern "C"
+{
+#include <stdio.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_idf_version.h>
+#include "freertos/queue.h"
+#include "esp_system.h"
+#include "esp_log.h"
+#include "driver/adc.h"
+
+#include <max7219.h>
+#include "rotary_encoder.h"
+}
+
+#include "config.hpp"
+
+void display_init();
+void display_ShowWelcomeMsg();
+void display1_showString(const char * buf);
+void display2_showString(const char * buf);
+void display_showString(uint8_t pos, const char * buf);