From f5d6e376c655ea3533fa6c114a090591596cb4b7 Mon Sep 17 00:00:00 2001
From: Simon Schmidt <schmidtsi76327@th-nuernberg.de>
Date: Sat, 3 Jul 2021 17:36:10 +0200
Subject: [PATCH] FSM2: rm rtm code, change print, add ldr_schwelle

---
 lib/PCA9685-Arduino                  |  2 +-
 lib/treppe/FSMTreppe2/FSMTreppe2.cpp | 10 +---------
 lib/treppe/FSMTreppe2/FSMTreppe2.h   | 20 --------------------
 lib/treppe/treppe.cpp                | 11 ++++++++---
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/lib/PCA9685-Arduino b/lib/PCA9685-Arduino
index 23e06c0..a70be39 160000
--- a/lib/PCA9685-Arduino
+++ b/lib/PCA9685-Arduino
@@ -1 +1 @@
-Subproject commit 23e06c06a6026801a856141f64a6de54dd493b47
+Subproject commit a70be39257e317d35e9118b385006a1e030e6452
diff --git a/lib/treppe/FSMTreppe2/FSMTreppe2.cpp b/lib/treppe/FSMTreppe2/FSMTreppe2.cpp
index 11ae2c3..0e187fa 100644
--- a/lib/treppe/FSMTreppe2/FSMTreppe2.cpp
+++ b/lib/treppe/FSMTreppe2/FSMTreppe2.cpp
@@ -17,7 +17,6 @@
 // Validation result: Not run
 //
 #include "FSMTreppe2.h"
-// #include "FSMTreppe_private.h"
 #include <stdint.h>
 
 // Named constants for Chart: '<Root>/FSMTreppe'
@@ -212,8 +211,7 @@ void FSMTreppeModelClass::terminate()
 FSMTreppeModelClass::FSMTreppeModelClass() :
   FSMTreppe_DW(),
   FSMTreppe_U(),
-  FSMTreppe_Y(),
-  FSMTreppe_M()
+  FSMTreppe_Y()
 {
   // Currently there is no constructor body generated.
 }
@@ -224,12 +222,6 @@ FSMTreppeModelClass::~FSMTreppeModelClass()
   // Currently there is no destructor body generated.
 }
 
-// Real-Time Model get method
-FSMTreppeModelClass::RT_MODEL_FSMTreppe_T * FSMTreppeModelClass::getRTM()
-{
-  return (&FSMTreppe_M);
-}
-
 //
 // File trailer for generated code.
 //
diff --git a/lib/treppe/FSMTreppe2/FSMTreppe2.h b/lib/treppe/FSMTreppe2/FSMTreppe2.h
index 17eb042..f72f945 100644
--- a/lib/treppe/FSMTreppe2/FSMTreppe2.h
+++ b/lib/treppe/FSMTreppe2/FSMTreppe2.h
@@ -21,15 +21,6 @@
 
 #include <stdint.h>
 
-// Macros for accessing real-time model data structure
-#ifndef rtmGetErrorStatus
-#define rtmGetErrorStatus(rtm)         ((rtm)->errorStatus)
-#endif
-
-#ifndef rtmSetErrorStatus
-#define rtmSetErrorStatus(rtm, val)    ((rtm)->errorStatus = (val))
-#endif
-
 // Class declaration for model FSMTreppe
 class FSMTreppeModelClass {
   // public data and function members
@@ -56,11 +47,6 @@ class FSMTreppeModelClass {
     uint8_t dimmrichtung;              // '<Root>/dimmrichtung'
   };
 
-  // Real-time Model Data Structure
-  struct RT_MODEL_FSMTreppe_T {
-    const char * volatile errorStatus;
-  };
-
   // model initialize function
   void initialize();
 
@@ -92,9 +78,6 @@ class FSMTreppeModelClass {
     return FSMTreppe_Y;
   }
 
-  // Real-Time Model get method
-  FSMTreppeModelClass::RT_MODEL_FSMTreppe_T * getRTM();
-
   // private data and function members
  private:
   // Block states
@@ -105,9 +88,6 @@ class FSMTreppeModelClass {
 
   // External outputs
   ExtY_FSMTreppe_T FSMTreppe_Y;
-
-  // Real-Time Model
-  RT_MODEL_FSMTreppe_T FSMTreppe_M;
 };
 
 //-
diff --git a/lib/treppe/treppe.cpp b/lib/treppe/treppe.cpp
index 46de158..1004bc2 100644
--- a/lib/treppe/treppe.cpp
+++ b/lib/treppe/treppe.cpp
@@ -160,16 +160,20 @@ void Treppe::print_state_on_change() {
   if(
     fsm_inputs.anim_beendet != last_in.anim_beendet || 
     fsm_inputs.sensor_oben != last_in.sensor_oben || 
-    fsm_inputs.sensor_unten != last_in.sensor_unten
+    fsm_inputs.sensor_unten != last_in.sensor_unten ||
+    fsm_outputs.dimmrichtung != last_out.dimmrichtung || 
+    fsm_outputs.laufrichtung != last_out.laufrichtung || 
+    fsm_outputs.status != last_out.status
   ) {
     last_in.anim_beendet = fsm_inputs.anim_beendet;
     last_in.sensor_oben  = fsm_inputs.sensor_oben;
     last_in.sensor_unten = fsm_inputs.sensor_unten;
 
-    Serial.printf("FSM inputs: s_u: %d, s_o: %d, an_fin: %d =>", 
+    Serial.printf("FSM IN: s_u: %d, s_o: %d, beendet: %d =>", 
       fsm_inputs.sensor_oben, fsm_inputs.sensor_unten, fsm_inputs.anim_beendet);
     Serial.print(" step => ");
-    Serial.printf("FSM outputs: LR: %d DR: %d ST: %d\n", fsm_outputs.laufrichtung, fsm_outputs.dimmrichtung, fsm_outputs.status);
+    Serial.printf("OUT: LR: %d DR: %d ST: %d\n", 
+      fsm_outputs.laufrichtung, fsm_outputs.dimmrichtung, fsm_outputs.status);
   }
 }
 
@@ -181,6 +185,7 @@ void Treppe::task(){
     state = switch_state;
   }
   
+  fsm_inputs.ldr_schwelle = 1;
   fsm_inputs.sensor_oben =  read_sensor(SENSOR_OBEN);
   fsm_inputs.sensor_unten = read_sensor(SENSOR_UNTEN);
   fsm_inputs.anim_beendet = static_cast<bool>(finish);