version model 1.29 added state for inaktiv = LDR ...

lib/treppe/FSMTreppe/FSMTreppe.cpp

-//
-// Academic License - for use in teaching, academic research, and meeting
-// course requirements at degree granting institutions only.  Not for
-// government, commercial, or other organizational use.
-//
-// File: FSMTreppe.cpp
-//
-// Code generated for Simulink model 'FSMTreppe'.
-//
-// Model version                  : 1.22
-// Simulink Coder version         : 9.5 (R2021a) 14-Nov-2020
-// C/C++ source code generated on : Fri Jul  2 17:45:36 2021
-//
-// Target selection: ert.tlc
-// Embedded hardware selection: ARM Compatible->ARM Cortex-M
-// Code generation objectives: Unspecified
-// Validation result: Not run
-//
-#include "FSMTreppe.h"
-
-// Named constants for Chart: '<Root>/FSMTreppe'
-const uint8_t FSMTreppe_IN_animation_down = 1U;
-const uint8_t FSMTreppe_IN_animation_up = 2U;
-const uint8_t FSMTreppe_IN_idle = 3U;
-
-// Model step function
-void FSMTreppeModelClass::step()
-{
-  // Chart: '<Root>/FSMTreppe' incorporates:
-  //   Inport: '<Root>/anim_finished'
-  //   Inport: '<Root>/sensor_oben'
-  //   Inport: '<Root>/sensor_unten'
-
-  if (FSMTreppe_DW.temporalCounter_i1 < 511U) {
-    FSMTreppe_DW.temporalCounter_i1 = static_cast<uint16_t>
-      (FSMTreppe_DW.temporalCounter_i1 + 1U);
-  }
-
-  if (FSMTreppe_DW.is_active_c3_FSMTreppe == 0U) {
-    FSMTreppe_DW.is_active_c3_FSMTreppe = 1U;
-    FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_idle;
-
-    // Outport: '<Root>/anim_active'
-    FSMTreppe_Y.anim_active = 0U;
-    FSMTreppe_DW.got_sensor = 0U;
-    FSMTreppe_DW.got_anim_finished = 0U;
-    FSMTreppe_DW.finished_up = 0U;
-    FSMTreppe_DW.finished_dn = 0U;
-  } else {
-    switch (FSMTreppe_DW.is_c3_FSMTreppe) {
-     case FSMTreppe_IN_animation_down:
-      // Outport: '<Root>/anim_active'
-      FSMTreppe_Y.anim_active = 2U;
-      if ((FSMTreppe_DW.finished_dn == 1) || (FSMTreppe_DW.temporalCounter_i1 >=
-           300U)) {
-        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_idle;
-
-        // Outport: '<Root>/anim_active'
-        FSMTreppe_Y.anim_active = 0U;
-        FSMTreppe_DW.got_sensor = 0U;
-        FSMTreppe_DW.got_anim_finished = 0U;
-        FSMTreppe_DW.finished_up = 0U;
-        FSMTreppe_DW.finished_dn = 0U;
-      } else {
-        if (FSMTreppe_U.sensor_unten) {
-          FSMTreppe_DW.got_sensor = 1U;
-        }
-
-        if (FSMTreppe_U.anim_finished) {
-          FSMTreppe_DW.got_anim_finished = 1U;
-        }
-
-        if ((FSMTreppe_DW.got_anim_finished == 1) && (FSMTreppe_DW.got_sensor ==
-             1)) {
-          FSMTreppe_DW.finished_dn = 1U;
-        }
-      }
-      break;
-
-     case FSMTreppe_IN_animation_up:
-      // Outport: '<Root>/anim_active'
-      FSMTreppe_Y.anim_active = 1U;
-      if ((FSMTreppe_DW.finished_up == 1) || (FSMTreppe_DW.temporalCounter_i1 >=
-           300U)) {
-        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_idle;
-
-        // Outport: '<Root>/anim_active'
-        FSMTreppe_Y.anim_active = 0U;
-        FSMTreppe_DW.got_sensor = 0U;
-        FSMTreppe_DW.got_anim_finished = 0U;
-        FSMTreppe_DW.finished_up = 0U;
-        FSMTreppe_DW.finished_dn = 0U;
-      } else {
-        if (FSMTreppe_U.sensor_oben) {
-          FSMTreppe_DW.got_sensor = 1U;
-        }
-
-        if (FSMTreppe_U.anim_finished) {
-          FSMTreppe_DW.got_anim_finished = 1U;
-        }
-
-        if ((FSMTreppe_DW.got_anim_finished == 1) && (FSMTreppe_DW.got_sensor ==
-             1)) {
-          FSMTreppe_DW.finished_up = 1U;
-        }
-      }
-      break;
-
-     default:
-      // Outport: '<Root>/anim_active'
-      // case IN_idle:
-      FSMTreppe_Y.anim_active = 0U;
-      if (FSMTreppe_U.sensor_oben) {
-        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_animation_down;
-        FSMTreppe_DW.temporalCounter_i1 = 0U;
-
-        // Outport: '<Root>/anim_active'
-        FSMTreppe_Y.anim_active = 2U;
-        FSMTreppe_DW.got_sensor = 0U;
-        FSMTreppe_DW.got_anim_finished = 0U;
-        FSMTreppe_DW.finished_dn = 0U;
-      } else if (FSMTreppe_U.sensor_unten) {
-        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_animation_up;
-        FSMTreppe_DW.temporalCounter_i1 = 0U;
-
-        // Outport: '<Root>/anim_active'
-        FSMTreppe_Y.anim_active = 1U;
-        FSMTreppe_DW.got_sensor = 0U;
-        FSMTreppe_DW.got_anim_finished = 0U;
-        FSMTreppe_DW.finished_up = 0U;
-      }
-      break;
-    }
-  }
-
-  // End of Chart: '<Root>/FSMTreppe'
-}
-
-// Model initialize function
-void FSMTreppeModelClass::initialize()
-{
-  // (no initialization code required)
-}
-
-// Model terminate function
-void FSMTreppeModelClass::terminate()
-{
-  // (no terminate code required)
-}
-
-// Constructor
-FSMTreppeModelClass::FSMTreppeModelClass() :
-  FSMTreppe_DW(),
-  FSMTreppe_U(),
-  FSMTreppe_Y()
-{
-  // Currently there is no constructor body generated.
-}
-
-// Destructor
-FSMTreppeModelClass::~FSMTreppeModelClass()
-{
-  // Currently there is no destructor body generated.
-}
-
-//
-// File trailer for generated code.
-//
-// [EOF]
-//

lib/treppe/FSMTreppe/FSMTreppe.h

-//
-// Academic License - for use in teaching, academic research, and meeting
-// course requirements at degree granting institutions only.  Not for
-// government, commercial, or other organizational use.
-//
-// File: FSMTreppe.h
-//
-// Code generated for Simulink model 'FSMTreppe'.
-//
-// Model version                  : 1.22
-// Simulink Coder version         : 9.5 (R2021a) 14-Nov-2020
-// C/C++ source code generated on : Fri Jul  2 17:45:36 2021
-//
-// Target selection: ert.tlc
-// Embedded hardware selection: ARM Compatible->ARM Cortex-M
-// Code generation objectives: Unspecified
-// Validation result: Not run
-//
-#ifndef RTW_HEADER_FSMTreppe_h_
-#define RTW_HEADER_FSMTreppe_h_
-
-#include <stdint.h>
-
-// Class declaration for model FSMTreppe
-class FSMTreppeModelClass {
-  // public data and function members
- public:
-  // Block states (default storage) for system '<Root>'
-  struct DW_FSMTreppe_T {
-    uint16_t temporalCounter_i1;       // '<Root>/FSMTreppe'
-    uint8_t is_active_c3_FSMTreppe;    // '<Root>/FSMTreppe'
-    uint8_t is_c3_FSMTreppe;           // '<Root>/FSMTreppe'
-    uint8_t got_anim_finished;         // '<Root>/FSMTreppe'
-    uint8_t finished_up;               // '<Root>/FSMTreppe'
-    uint8_t finished_dn;               // '<Root>/FSMTreppe'
-    uint8_t got_sensor;                // '<Root>/FSMTreppe'
-  };
-
-  // External inputs (root inport signals with default storage)
-  struct ExtU_FSMTreppe_T {
-    bool sensor_unten;            // '<Root>/sensor_unten'
-    bool sensor_oben;             // '<Root>/sensor_oben'
-    bool anim_finished;           // '<Root>/anim_finished'
-  };
-
-  // External outputs (root outports fed by signals with default storage)
-  struct ExtY_FSMTreppe_T {
-    uint8_t anim_active;               // '<Root>/anim_active'
-  };
-
-  // model initialize function
-  void initialize();
-
-  // model step function
-  void step();
-
-  // model terminate function
-  void terminate();
-
-  // Constructor
-  FSMTreppeModelClass();
-
-  // Destructor
-  ~FSMTreppeModelClass();
-
-  // Root-level structure-based inputs set method
-
-  // Root inports set method
-  void setExternalInputs(const ExtU_FSMTreppe_T* pExtU_FSMTreppe_T)
-  {
-    FSMTreppe_U = *pExtU_FSMTreppe_T;
-  }
-
-  // Root-level structure-based outputs get method
-
-  // Root outports get method
-  const FSMTreppeModelClass::ExtY_FSMTreppe_T & getExternalOutputs() const
-  {
-    return FSMTreppe_Y;
-  }
-
-  // private data and function members
- private:
-  // Block states
-  DW_FSMTreppe_T FSMTreppe_DW;
-
-  // External inputs
-  ExtU_FSMTreppe_T FSMTreppe_U;
-
-  // External outputs
-  ExtY_FSMTreppe_T FSMTreppe_Y;
-};
-
-//-
-//  The generated code includes comments that allow you to trace directly
-//  back to the appropriate location in the model.  The basic format
-//  is <system>/block_name, where system is the system number (uniquely
-//  assigned by Simulink) and block_name is the name of the block.
-//
-//  Note that this particular code originates from a subsystem build,
-//  and has its own system numbers different from the parent model.
-//  Refer to the system hierarchy for this subsystem below, and use the
-//  MATLAB hilite_system command to trace the generated code back
-//  to the parent model.  For example,
-//
-//  hilite_system('FSM_Treppenlicht/FSMTreppe')    - opens subsystem FSM_Treppenlicht/FSMTreppe
-//  hilite_system('FSM_Treppenlicht/FSMTreppe/Kp') - opens and selects block Kp
-//
-//  Here is the system hierarchy for this model
-//
-//  '<Root>' : 'FSM_Treppenlicht'
-//  '<S1>'   : 'FSM_Treppenlicht/FSMTreppe'
-
-#endif                                 // RTW_HEADER_FSMTreppe_h_
-
-//
-// File trailer for generated code.
-//
-// [EOF]
-//

lib/treppe/FSMTreppe2/FSMTreppe2.cpp

 //
 // Code generated for Simulink model 'FSMTreppe'.
 //
-// Model version                  : 1.28
+// Model version                  : 1.29
 // Simulink Coder version         : 9.5 (R2021a) 14-Nov-2020
-// C/C++ source code generated on : Sat Jul  3 13:50:17 2021
+// C/C++ source code generated on : Sat Jul  3 17:39:25 2021
 //
 // Target selection: ert.tlc
 // Embedded hardware selection: ARM Compatible->ARM Cortex-M
   if (FSMTreppe_DW.is_active_c3_FSMTreppe == 0U) {
     FSMTreppe_DW.is_active_c3_FSMTreppe = 1U;
     FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_inaktiv;
+
+    // Outport: '<Root>/status'
+    FSMTreppe_Y.status = 0U;
   } else {
     switch (FSMTreppe_DW.is_c3_FSMTreppe) {
      case FSMTreppe_IN_abdimmen_hoch:
       FSMTreppe_Y.dimmrichtung = 0U;
 
       // Outport: '<Root>/status'
-      FSMTreppe_Y.status = 3U;
+      FSMTreppe_Y.status = 4U;
       if (FSMTreppe_U.anim_beendet || (FSMTreppe_DW.temporalCounter_i1 >= 500U))
       {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_ruhezustand;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 0U;
+        FSMTreppe_Y.status = 1U;
       }
       break;
 
       FSMTreppe_Y.dimmrichtung = 0U;
 
       // Outport: '<Root>/status'
-      FSMTreppe_Y.status = 6U;
+      FSMTreppe_Y.status = 7U;
       if (FSMTreppe_U.anim_beendet || (FSMTreppe_DW.temporalCounter_i1 >= 500U))
       {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_ruhezustand;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 0U;
+        FSMTreppe_Y.status = 1U;
       }
       break;
 
       FSMTreppe_Y.dimmrichtung = 1U;
 
       // Outport: '<Root>/status'
-      FSMTreppe_Y.status = 1U;
+      FSMTreppe_Y.status = 2U;
       if (FSMTreppe_U.anim_beendet || (FSMTreppe_DW.temporalCounter_i1 >= 500U))
       {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_warten_hoch;
         FSMTreppe_DW.temporalCounter_i1 = 0U;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 2U;
+        FSMTreppe_Y.status = 3U;
       }
       break;
 
       FSMTreppe_Y.dimmrichtung = 1U;
 
       // Outport: '<Root>/status'
-      FSMTreppe_Y.status = 4U;
+      FSMTreppe_Y.status = 5U;
       if (FSMTreppe_U.anim_beendet || (FSMTreppe_DW.temporalCounter_i1 >= 500U))
       {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_warten_runter;
         FSMTreppe_DW.temporalCounter_i1 = 0U;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 5U;
+        FSMTreppe_Y.status = 6U;
       }
       break;
 
      case FSMTreppe_IN_inaktiv:
+      // Outport: '<Root>/status'
+      FSMTreppe_Y.status = 0U;
       if (FSMTreppe_U.ldr_schwelle == 1.0) {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_ruhezustand;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 0U;
+        FSMTreppe_Y.status = 1U;
       }
       break;
 
      case FSMTreppe_IN_ruhezustand:
       // Outport: '<Root>/status'
-      FSMTreppe_Y.status = 0U;
+      FSMTreppe_Y.status = 1U;
       if (FSMTreppe_U.sensor_unten) {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_aufdimmen_hoch;
         FSMTreppe_DW.temporalCounter_i1 = 0U;
         FSMTreppe_Y.dimmrichtung = 1U;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 1U;
+        FSMTreppe_Y.status = 2U;
       } else if (FSMTreppe_U.sensor_oben) {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_aufdimmen_runter;
         FSMTreppe_DW.temporalCounter_i1 = 0U;
         FSMTreppe_Y.dimmrichtung = 1U;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 4U;
+        FSMTreppe_Y.status = 5U;
       } else if (FSMTreppe_U.ldr_schwelle == 0.0) {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_inaktiv;
+
+        // Outport: '<Root>/status'
+        FSMTreppe_Y.status = 0U;
       }
       break;
 
      case FSMTreppe_IN_warten_hoch:
       // Outport: '<Root>/status'
-      FSMTreppe_Y.status = 2U;
+      FSMTreppe_Y.status = 3U;
       if (FSMTreppe_U.sensor_oben || (FSMTreppe_DW.temporalCounter_i1 >= 500U))
       {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_abdimmen_hoch;
         FSMTreppe_Y.dimmrichtung = 0U;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 3U;
+        FSMTreppe_Y.status = 4U;
       }
       break;
 
      default:
       // Outport: '<Root>/status'
       // case IN_warten_runter:
-      FSMTreppe_Y.status = 5U;
+      FSMTreppe_Y.status = 6U;
       if (FSMTreppe_U.sensor_unten || (FSMTreppe_DW.temporalCounter_i1 >= 500U))
       {
         FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_abdimmen_runter;
         FSMTreppe_Y.dimmrichtung = 0U;
 
         // Outport: '<Root>/status'
-        FSMTreppe_Y.status = 6U;
+        FSMTreppe_Y.status = 7U;
       }
       break;
     }

lib/treppe/treppe.cpp

     direction = switch_direction;
     state = switch_state;
   }
-  
-  fsm_inputs.ldr_schwelle = 1;
+
+  fsm_inputs.ldr_schwelle = true;
   fsm_inputs.sensor_oben =  read_sensor(SENSOR_OBEN);
   fsm_inputs.sensor_unten = read_sensor(SENSOR_UNTEN);
   fsm_inputs.anim_beendet = static_cast<bool>(finish);

lib/treppe/treppe.h

 #pragma once
 
-#include "FSMTreppe2/FSMTreppe2.h"
+#include "FSMTreppe/FSMTreppe2.h"
 #include "PCA9685.h"
 
 #define SENSOR_OBEN 2
     FSMTreppeModelClass::ExtU_FSMTreppe_T fsm_inputs;
     FSMTreppeModelClass::ExtY_FSMTreppe_T fsm_outputs;
     void print_state_on_change();
-    
+
     const uint8_t FSMTreppe_IN_animation_down = 1U;
     const uint8_t FSMTreppe_IN_animation_up = 2U;
     const uint8_t FSMTreppe_IN_idle = 3U;