From 248668c526f0eebb30940341e6e87be39fa74944 Mon Sep 17 00:00:00 2001
From: jonny_l480 <jonny@wwad.de>
Date: Fri, 26 Aug 2022 13:24:51 +0200
Subject: [PATCH] Add encoder-test, calibrate distance conversion

Add encoder test:
  - used for calibrating the length measurement by counting the steps
    per meter
  - enabled with #define ENCODER_TEST  in config.hpp
  - display1: enocder steps
  - display2: converted length in meter

Distance conversion:
  - defining STEPS_PER_METER instead of MEASURING_ROLL_DIAMETER in
    config.hpp
  - defining the steps per meter by issuing 3 test measurements with
    4mm2 solar cable in the new encoder test mode
---
 main/config.hpp  | 11 ++++++++---
 main/control.cpp | 24 +++++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/main/config.hpp b/main/config.hpp
index 907ae9f..e005d5a 100644
--- a/main/config.hpp
+++ b/main/config.hpp
@@ -56,9 +56,14 @@ extern "C" {
 #define ENABLE_HALF_STEPS false  // Set to true to enable tracking of rotary encoder at half step resolution
 #define FLIP_DIRECTION    false  // Set to true to reverse the clockwise/counterclockwise sense
 
-//#define MEASURING_ROLL_DIAMETER 44 //roll v2 glued
-#define MEASURING_ROLL_DIAMETER 86.6 //roll v3 large
-#define PI 3.14159265358979323846
+//--------------------------
+//------ calibration -------
+//--------------------------
+//use encoder test for calibration and calculate STEPS_PER_METER
+//#define ENCODER_TEST //show encoder count instead of converted meters
+#define STEPS_PER_METER 2127 //roll-v3-gummi-86.6mm - d=89.8mm
+//#define MEASURING_ROLL_DIAMETER 86.6 //roll v3 large
+//#define PI 3.14159265358979323846
 
 
 
diff --git a/main/control.cpp b/main/control.cpp
index eaf960a..20f6aab 100644
--- a/main/control.cpp
+++ b/main/control.cpp
@@ -99,6 +99,8 @@ int lengthTarget = 3000; //target length in mm
 int lengthRemaining = 0; //(target - now) length needed for reaching the target
 int potiRead = 0; //voltage read from adc
 uint32_t timestamp_motorStarted = 0; //timestamp winding started
+                                     
+int lengthBeeped = 0; //only beep once per meter during encoder test
 
 
 //===== change State =====
@@ -218,7 +220,8 @@ void task_control(void *pvParameter)
         // Poll current position and direction
         rotary_encoder_get_state(&encoder, &encoderState);
         //--- calculate distance ---
-        lengthNow = (float)encoderState.position * (MEASURING_ROLL_DIAMETER * PI) / 600; //TODO dont calculate constant factor every time FIXME: ROUNDING ISSUE float-int?
+        //lengthNow = (float)encoderState.position * (MEASURING_ROLL_DIAMETER * PI) / 600; //TODO dont calculate constant factor every time FIXME: ROUNDING ISSUE float-int?
+        lengthNow = (float)encoderState.position * 1000 / STEPS_PER_METER;
 
 
 
@@ -373,17 +376,32 @@ void task_control(void *pvParameter)
         //---------------------------
         //--------- display ---------
         //---------------------------
+#ifdef ENCODER_TEST
+        //-- show encoder steps on display1 ---
+        sprintf(buf_disp1, "EN %05d", encoderState.position); //count
+        //--- show converted distance on display2 ---
+        sprintf(buf_disp2, "Met %5.3f", (float)lengthNow/1000); //m
+        //--- beep every 1m ---
+        //note: only works precicely in forward/positive direction
+        if (lengthNow % 1000 < 50) { //with tolerance in case of missed exact value
+            if (fabs(lengthNow - lengthBeeped) >= 900) { //dont beep multiple times at same meter
+                //TODO: add case for reverse direction. currently beeps 0.1 too early
+                buzzer.beep(1, 400, 100);
+                lengthBeeped = lengthNow;
+            }
+        }
+#else
         //-- 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
+        //                  123456789
+#endif
         
         //TODO: blink disp2 when set button pressed
         //TODO: blink disp2 when preset button pressed (exept manual mode)