From 92f729908077416e6b660e6d3c00a7cf0ff0eabd Mon Sep 17 00:00:00 2001
From: jonny_ji7 <jonny@wwad.de>
Date: Mon, 22 Aug 2022 23:02:26 +0200
Subject: [PATCH] Disp: show manual lvl and dir, brightness, soll blink

- in manual mode blink between 'manual' and lvl+direction indication on
  display 2

- when setting custom target length only blink value not "soll"

- reduce brightness from 12 to 8 because of high display temperature
---
 main/control.cpp | 9 ++++++---
 main/display.cpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/main/control.cpp b/main/control.cpp
index 3441bb7..29e23ec 100644
--- a/main/control.cpp
+++ b/main/control.cpp
@@ -63,7 +63,6 @@ rotary_encoder_info_t encoder; //encoder device/info
 QueueHandle_t encoder_queue = NULL; //encoder event queue
 rotary_encoder_state_t encoderState;
 
-uint8_t count = 0; //count for testing
 uint32_t timestamp_pageSwitched = 0;
 bool page = false; //store page number currently displayed
 int lengthNow = 0; //length measured in mm
@@ -319,15 +318,19 @@ void task_control(void *pvParameter)
                 else if ( SW_PRESET1.state && !SW_PRESET3.state ) {
                     vfd_setSpeedLevel(level); //TODO: use poti input for level
                     vfd_setState(true, REV);
+                    sprintf(buf_disp2, "[--%02i   ", level);
+                    //                  123 45 678
                 }
                 //P2 + P3 -> turn right
                 else if ( SW_PRESET3.state && !SW_PRESET1.state ) {
                     vfd_setSpeedLevel(level); //TODO: use poti input for level
                     vfd_setState(true, FWD);
+                    sprintf(buf_disp2, "   %02i--]", level);
                 }
                 //no valid switch combination -> turn off motor
                 else {
                     vfd_setState(false);
+                    sprintf(buf_disp2, "   %02i   ", level);
                 }
         }
 
@@ -350,11 +353,11 @@ void task_control(void *pvParameter)
         //setting target length: blink target length
         if (SW_SET.state == true){
             sprintf(buf_tmp, "S0LL%5.3f", (float)lengthTarget/1000);
-            displayBot.blinkStrings(buf_tmp, "        ", 300, 100);
+            displayBot.blinkStrings(buf_tmp, "S0LL    ", 300, 100);
         }
         //manual state: blink "manual"
         else if (controlState == MANUAL) {
-            displayBot.blinkStrings(" MANUAL ", "        ", 1000, 800);
+            displayBot.blinkStrings(" MANUAL ", buf_disp2, 1000, 1000);
         }
         //otherwise show target length
         else {
diff --git a/main/display.cpp b/main/display.cpp
index ad7639f..9e8d493 100644
--- a/main/display.cpp
+++ b/main/display.cpp
@@ -34,7 +34,7 @@ max7219_t display_init(){
     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));
+    ESP_ERROR_CHECK(max7219_set_brightness(&dev, 9));
     return dev;
     //display = dev;
     ESP_LOGI(TAG, "initializing display - done");