Update diagram pdf files, cad files (guides)

- update / export pdf version from current drawio connection-plan and
  function-diagram
- update cad files

.gitattributes

@@ -0,0 +1 @@
+*.fcstd text

.gitignore

@@ -7,3 +7,6 @@ build
 
 # drawio files
 *.bkp
+
+# freecad backup files
+*.FCStd1

cad/export/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

docs/vfd/currently-used_T13-750W-12-h.txt

@@ -0,0 +1,2 @@
+currently the vfd 'T13-750W-12-h' is actually used. 
+Included documentation about T13-400W here too, modbus specification might be the same.

main/config.hpp

@@ -55,6 +55,9 @@ extern "C" {
 
 
 
+//=============================
+//======= configuration =======
+//=============================
 //--------------------------
 //----- display config -----
 //--------------------------
@@ -79,11 +82,20 @@ extern "C" {
 //--------------------------
 //------ calibration -------
 //--------------------------
-//use encoder test for calibration and calculate STEPS_PER_METER
+//enable mode  encoder test for calibration
-//#define ENCODER_TEST //show encoder count instead of converted meters
+//if defined, displays always show length and steps instead of the normal messages
+//#define ENCODER_TEST
+
+//steps per meter
 #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
+//millimetres added to target length
+//to ensure that length does not fall short when spool slightly rotates back after stop
+#define TARGET_LENGTH_OFFSET 0
+
+//millimetres lengthNow can be below lengthTarget to still stay in target_reached state
+#define TARGET_REACHED_TOLERANCE 5
+
 
 
 

main/control.cpp

@@ -43,7 +43,7 @@ QueueHandle_t encoder_queue = NULL; //encoder event queue
 rotary_encoder_state_t encoderState;
 
 int lengthNow = 0; //length measured in mm
-int lengthTarget = 3000; //target length in mm
+int lengthTarget = 5000; //default 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
@@ -54,7 +54,7 @@ int lengthBeeped = 0; //only beep once per meter during encoder test
 //automatic cut
 int cut_msRemaining = 0;
 uint32_t timestamp_cut_lastBeep = 0;
-uint32_t autoCut_delayMs = 3000; //TODO add this to config
+uint32_t autoCut_delayMs = 2500; //TODO add this to config
 bool autoCutEnabled = false; //store state of toggle switch (no hotswitch)
 
 
@@ -110,11 +110,11 @@ bool handleStopCondition(handledDisplay * displayTop, handledDisplay * displayBo
 void setDynSpeedLvl(uint8_t lvlMax = 3){
     uint8_t lvl;
     //define speed level according to difference
-    if (lengthRemaining < 20) {
+    if (lengthRemaining < 40) {
         lvl = 0;
-    } else if (lengthRemaining < 200) {
+    } else if (lengthRemaining < 300) {
         lvl = 1;
-    } else if (lengthRemaining < 600) {
+    } else if (lengthRemaining < 700) {
         lvl = 2;
     } else { //more than last step remaining
         lvl = 3;
@@ -190,12 +190,16 @@ void task_control(void *pvParameter)
         //---------------------------
         //--- RESET switch ---
         if (SW_RESET.risingEdge) {
+            //dont reset when press used for stopping pending auto-cut
+            if (controlState != systemState_t::AUTO_CUT_WAITING) {
                 rotary_encoder_reset(&encoder);
                 lengthNow = 0;
                 buzzer.beep(1, 700, 100);
+                displayTop.blink(2, 100, 100, "1ST     ");
                 //TODO: stop cutter with reset switch?
                 //cutter_stop();
             }
+        }
 
         //--- CUT switch ---
         //start cut cycle immediately
@@ -205,6 +209,9 @@ void task_control(void *pvParameter)
                 cutter_stop();
                 buzzer.beep(1, 600, 0);
             }
+            else if (controlState == systemState_t::AUTO_CUT_WAITING) {
+                //do nothing when press used for stopping pending auto-cut
+            }
             //start cutter when motor not active
             else if (controlState != systemState_t::WINDING_START //TODO use vfd state here?
                     && controlState != systemState_t::WINDING) {
@@ -250,7 +257,7 @@ void task_control(void *pvParameter)
             //read adc
             potiRead = gpio_readAdc(ADC_CHANNEL_POTI); //0-4095
             //scale to target length range
-            int lengthTargetNew = (float)potiRead / 4095 * 30000;
+            int lengthTargetNew = (float)potiRead / 4095 * 50000;
             //apply hysteresis and round to whole meters //TODO optimize this
             if (lengthTargetNew % 1000 < 200) { //round down if less than .2 meter
                 ESP_LOGD(TAG, "Poti input = %d -> rounding down", lengthTargetNew);
@@ -283,20 +290,20 @@ void task_control(void *pvParameter)
         //--- target length presets ---
         if (controlState != systemState_t::MANUAL) { //dont apply preset length while controlling motor with preset buttons
             if (SW_PRESET1.risingEdge) {
-                lengthTarget = 1000;
-                buzzer.beep(lengthTarget/1000, 25, 30);
-                displayBot.blink(3, 100, 100, "S0LL    ");
-            }
-            else if (SW_PRESET2.risingEdge) {
                 lengthTarget = 5000;
                 buzzer.beep(lengthTarget/1000, 25, 30);
                 displayBot.blink(2, 100, 100, "S0LL    ");
             }
-            else if (SW_PRESET3.risingEdge) {
+            else if (SW_PRESET2.risingEdge) {
                 lengthTarget = 10000;
                 buzzer.beep(lengthTarget/1000, 25, 30);
                 displayBot.blink(2, 100, 100, "S0LL    ");
             }
+            else if (SW_PRESET3.risingEdge) {
+                lengthTarget = 15000;
+                buzzer.beep(lengthTarget/1000, 25, 30);
+                displayBot.blink(2, 100, 100, "S0LL    ");
+            }
         }
 
 
@@ -305,7 +312,7 @@ void task_control(void *pvParameter)
         //--------- control ---------
         //---------------------------
         //calculate length difference
-        lengthRemaining = lengthTarget - lengthNow;
+        lengthRemaining = lengthTarget - lengthNow + TARGET_LENGTH_OFFSET;
 
         //--- statemachine ---
         switch (controlState) {
@@ -342,7 +349,7 @@ void task_control(void *pvParameter)
             case systemState_t::TARGET_REACHED:
                 vfd_setState(false);
                 //switch to counting state when no longer at or above target length
-                if ( lengthRemaining > 10 ) { //FIXME: require reset switch to be able to restart? or evaluate a tolerance here?
+                if ( lengthNow < lengthTarget - TARGET_REACHED_TOLERANCE ) {
                     changeState(systemState_t::COUNTING);
                 }
                 //switch initiate countdown to auto-cut
@@ -362,8 +369,13 @@ void task_control(void *pvParameter)
                 //handle delayed start of cut
                 cut_msRemaining = autoCut_delayMs - (esp_log_timestamp() - timestamp_changedState);
                 //- countdown stop conditions -
-                if (!autoCutEnabled || !SW_AUTO_CUT.state || SW_RESET.state || SW_CUT.state) { //TODO: also stop when target not reached anymore?
+                //stop with any button
+                if (!autoCutEnabled
+                        || SW_RESET.state || SW_CUT.state 
+                        || SW_SET.state || SW_PRESET1.state
+                        || SW_PRESET2.state || SW_PRESET3.state) {//TODO: also stop when target not reached anymore?
                     changeState(systemState_t::COUNTING);
+                    buzzer.beep(5, 100, 50);
                 }
                 //- trigger cut if delay passed -
                 else if (cut_msRemaining <= 0) {

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, 8));
+    ESP_ERROR_CHECK(max7219_set_brightness(&dev, 8)); //TODO add this to config
     return dev;
     //display = dev;
     ESP_LOGI(TAG, "initializing display - done");
@@ -50,7 +50,7 @@ void display_ShowWelcomeMsg(max7219_t dev){
     //show name and date
     ESP_LOGI(TAG, "showing startup message...");
     max7219_clear(&dev);
-    max7219_draw_text_7seg(&dev, 0, "CUTTER  20.08.2022");
+    max7219_draw_text_7seg(&dev, 0, "CUTTER  29.09.2022");
     //                                   1234567812 34 5678
     vTaskDelay(pdMS_TO_TICKS(700));
     //scroll "hello" over 2 displays
@@ -60,6 +60,11 @@ void display_ShowWelcomeMsg(max7219_t dev){
         max7219_draw_text_7seg(&dev, 0, hello + (22 - offset) );
         vTaskDelay(pdMS_TO_TICKS(50));
     }
+
+    //noticed rare bug that one display does not initialize / is not configured correctly after start
+    //initialize display again after the welcome message in case it did not work the first time
+    ESP_ERROR_CHECK(max7219_init(&dev));
+    ESP_ERROR_CHECK(max7219_set_brightness(&dev, 8)); //TODO add this to config
 }