Add poti and display section; Cleanup

Add readadc function from armchair project
Rework display section
   - show lengthNow on first display
   - show lengthTarget on second display
Prepare for statemachine

Remove unneeded function
Add comments improve structure

main/config.hpp

@@ -1,7 +1,11 @@
 #pragma once
+extern "C" {
+#include "driver/adc.h"
+}
 #include "gpio_evaluateSwitch.hpp"
 #include "buzzer.hpp"
 
+
 //===================================
 //===== define output gpio pins =====
 //===================================
@@ -28,6 +32,7 @@
 #define GPIO_SW_PRESET3 GPIO_NUM_39
 
 #define GPIO_POTI GPIO_NUM_36
+#define ADC_CHANNEL_POTI ADC1_CHANNEL_0
 
 
 //--------------------------

main/control.cpp

@@ -50,67 +50,50 @@ QueueHandle_t init_encoder(rotary_encoder_info_t * info){
 }
 
 
-//============================
+//=============================
-//===== display distance =====
+//========= readAdc ===========
-//============================
+//=============================
-//display current position in meters from current encoder count
+//function for multisampling an anlog input
-void display_current_distance(max7219_t * dev, rotary_encoder_info_t * info){
+int readAdc(adc1_channel_t adc_channel, bool inverted = false) {
-    // --- event based action ---
+    //make multiple measurements
-    // Wait for incoming events on the event queue.
+    int adc_reading = 0;
-    // rotary_encoder_event_t event;
+    for (int i = 0; i < 16; i++) {
-    // if (xQueueReceive(event_queue, &event, 1000 / portTICK_PERIOD_MS) == pdTRUE)
+        adc_reading += adc1_get_raw(adc_channel);
-    // {
+    }
-    //     ESP_LOGI(TAG, "Event: position %d, direction %s", event.state.position,
+    adc_reading = adc_reading / 16;
-    //             event.state.direction ? (event.state.direction == ROTARY_ENCODER_DIRECTION_CLOCKWISE ? "CW" : "CCW") : "NOT_SET");
-    //     //--- calculate distalce ---
-    //     distance_mm = event.state.position * (MEASURING_ROLL_DIAMETER * PI / 600); //TODO dont calculate constant factor every time
-    //     //--- show current position on display ---
-    //     //sprintf(buf, "%08d", event.state.position);
-    //     //--- show current distance in cm on display ---
-    //     sprintf(buf, "%06.1f cm", (float)distance_mm/10);
-    //     //printf("float num\n");
-    //     max7219_clear(&dev);
-    //     max7219_draw_text_7seg(&dev, 0, buf);
-    // }
-    // else //no event for 1s
-    // {
-    //     // Poll current position and direction
-    //     rotary_encoder_state_t state;
-    //     ESP_ERROR_CHECK(rotary_encoder_get_state(&info, &state));
-    //     ESP_LOGI(TAG, "Poll: position %d, direction %s", state.position,
-    //             state.direction ? (state.direction == ROTARY_ENCODER_DIRECTION_CLOCKWISE ? "CW" : "CCW") : "NOT_SET");
-    // }
 
-    // Poll current position and direction
+    //return original or inverted result
-    rotary_encoder_state_t state;
+    if (inverted) {
-    rotary_encoder_get_state(info, &state);
+        return 4095 - adc_reading;
-    //--- calculate distalce ---
+    } else {
-    float distance_mm = state.position * (MEASURING_ROLL_DIAMETER * PI / 600); //TODO dont calculate constant factor every time
+        return adc_reading;
-
+    }
-    //--- show current position on display ---
-    char buf[10]; // 8 digits + decimal point + \0
-    sprintf(buf, "%06.1f cm", (float)distance_mm/10);
-    //printf("float num\n");
-    max7219_clear(dev);
-    max7219_draw_text_7seg(dev, 0, buf);
 }
 
 
 
-
 //====================
 //==== variables =====
 //====================
 static const char *TAG = "control";
-char display_buf[20]; // 8 digits + decimal point + \0
+char buf_disp[20]; //both displays
+char buf_disp1[10];// 8 digits + decimal point + \0
+char buf_disp2[10];// 8 digits + decimal point + \0
+char buf_tmp[15];
 max7219_t display; //display device
 QueueHandle_t encoder_queue = NULL; //encoder event queue
 rotary_encoder_info_t encoder; //encoder device/info
+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
 bool state = false; //store state of motor
+int lengthNow = 0; //length measured in mm
+int lengthTarget = 3000; //target length in mm
+int potiRead = 0; //voltage read from adc
+
+systemState_t controlState = COUNTING;
 
                       
            
@@ -122,15 +105,19 @@ void task_control(void *pvParameter)
     //initialize display
     display = init_display();
     //initialize encoder
-    encoder_queue = init_encoder(&encoder);
+//both dispencoder_queue = init_encoder(&encoder);
 
-    //---- startup message ----
+    //-----------------------------------
-    //display welcome message on 7 segment display
+    //------- display welcome msg -------
+    //-----------------------------------
+    //display welcome message on 2 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 ";
@@ -138,14 +125,15 @@ void task_control(void *pvParameter)
         vTaskDelay(pdMS_TO_TICKS(50));
     }
 
-        max7219_clear(&display);
+    //================
-            sprintf(display_buf, "1ST 987.4");
-            max7219_draw_text_7seg(&display, 0, display_buf);
-
     //===== loop =====
+    //================
     while(1){
         vTaskDelay(20 / portTICK_PERIOD_MS);
 
+        //-----------------------------
+        //------ handle switches ------
+        //-----------------------------
         //run handle functions for all switches
         SW_START.handle();
         SW_RESET.handle();
@@ -154,45 +142,129 @@ void task_control(void *pvParameter)
         SW_PRESET2.handle();
         SW_PRESET3.handle();
 
-      //  //switch between two display pages
+
-      //  if (esp_log_timestamp() - timestamp_pageSwitched > 1000){
+        //----------------------------
-      //      timestamp_pageSwitched = esp_log_timestamp();
+        //------ rotary encoder ------
-      //      page = !page;
+        //----------------------------
-      //  }
+        // Poll current position and direction
-      //  max7219_clear(&display);
+        rotary_encoder_get_state(&encoder, &encoderState);
-      //  if (page){
+        //--- calculate distance ---
-      //      //display current position
+        //lengthNow = encoderState.position * (MEASURING_ROLL_DIAMETER * PI); //TODO dont calculate constant factor every time FIXME: ROUNDING ISSUE float-int?
-      //      display_current_distance(&display, &encoder);
+        lengthNow += 155;
-      //  } else {
-      //      //display counter
-      //      sprintf(display_buf, "lvl: %02d", count);
-      //      max7219_draw_text_7seg(&display, 0, display_buf);
-      //      //count++;
-      //  }
-            sprintf(display_buf, "S0LL 12.3");
-            max7219_draw_text_7seg(&display, 8, display_buf);
 
 
-        //testing: rotate through speed levels
+        //---------------------------
-        if(SW_SET.risingEdge){
+        //------ potentiometer ------
-            //rotate count 0-7
+        //---------------------------
-            if (count >= 7){
+        //set target length to poti position when set switch is pressed
-                count = 0;
+        if (SW_SET.state == true) {
-            } else {
+            //read adc
-                count ++;
+            potiRead = readAdc(ADC_CHANNEL_POTI);
-            }
+            //scale to target length range
-            //set motor level
+            lengthTarget = (float)potiRead / 4095 * 50000;
-            vfd_setSpeedLevel(count);
+            //round to whole meters
-            buzzer.beep(1, 100, 100);
+            lengthTarget = round(lengthTarget / 1000) * 1000;
+            //TODO update lengthTarget only at button release?
+        }
+        //beep
+        if (SW_SET.risingEdge) {
+            buzzer.beep(1, 100, 50);
+        }
+        if (SW_SET.fallingEdge) {
+            buzzer.beep(2, 100, 50);
         }
 
 
-        //testing: toggle motor state
+        //TODO: ADD PRESET SWITCHES HERE
-        if(SW_START.risingEdge){
+
-            state = !state;
+
-            vfd_setState(state);
+        //--------------------------------
-            buzzer.beep(1, 500, 100);
+        //--------- statemachine ---------
+        //--------------------------------
+        switch (controlState) {
+            case COUNTING:
+
+                break;
+
+            case WINDING_START:
+
+                break;
+
+            case WINDING:
+
+                break;
+
+            case TARGET_REACHED:
+
+                break;
         }
+
+
+
+        //---------------------------
+        //--------- 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
+
+        //--- 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);
+
+        //  //switch between two display pages
+        //  if (esp_log_timestamp() - timestamp_pageSwitched > 1000){
+        //      timestamp_pageSwitched = esp_log_timestamp();
+        //      page = !page;
+        //  }
+        //  max7219_clear(&display);
+        //  if (page){
+        //      //display current position
+        //      display_current_distance(&display, &encoder);
+        //  } else {
+        //      //display counter
+        //      sprintf(display_buf, "lvl: %02d", count);
+        //      max7219_draw_text_7seg(&display, 0, display_buf);
+        //      //count++;
+        //  }
+
+        //sprintf(display_buf, "S0LL 12.3");
+        //max7219_draw_text_7seg(&display, 8, display_buf);
+
+
+        //---------------------------
+        //--------- testing ---------
+        //---------------------------
+        ////testing: rotate through speed levels
+        //if(SW_SET.risingEdge){
+        //    //rotate count 0-7
+        //    if (count >= 7){
+        //        count = 0;
+        //    } else {
+        //        count ++;
+        //    }
+        //    //set motor level
+        //    vfd_setSpeedLevel(count);
+        //    buzzer.beep(1, 100, 100);
+        //}
+
+        ////testing: toggle motor state
+        //if(SW_START.risingEdge){
+        //    state = !state;
+        //    vfd_setState(state);
+        //    buzzer.beep(1, 500, 100);
+        //}
     }
 
 }

main/control.hpp

@@ -8,10 +8,12 @@ extern "C"
 #include "freertos/queue.h"
 #include "esp_system.h"
 #include "esp_log.h"
+#include "driver/adc.h"
 
 #include <max7219.h>
 #include "rotary_encoder.h"
 }
+#include <cmath>
 
 #include "config.hpp"
 #include "gpio_evaluateSwitch.hpp"
@@ -20,4 +22,6 @@ extern "C"
 
 
 
+typedef enum systemState_t {COUNTING, WINDING_START, WINDING, TARGET_REACHED} systemState_t;
+
 void task_control(void *pvParameter);

main/main.cpp

@@ -7,6 +7,7 @@ extern "C"
 #include "freertos/queue.h"
 #include "esp_system.h"
 #include "esp_log.h"
+#include "driver/adc.h"
 }
 
 #include "config.hpp"
@@ -38,6 +39,11 @@ void init_gpios(){
     gpio_configure_output(GPIO_BUZZER);
     //5v regulator
     gpio_configure_output(GPIO_NUM_17);
+
+    //initialize and configure ADC
+    adc1_config_width(ADC_WIDTH_BIT_12); //=> max resolution 4096
+    adc1_config_channel_atten(ADC_CHANNEL_POTI, ADC_ATTEN_DB_11); //max voltage
+
 }