schmidtsi76327/ESP8266_Treppenlicht
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FSM2: rm rtm code, change print, add ldr_schwelle

Browse Source
This commit is contained in:
Simon Schmidt 2021-07-03 17:36:10 +02:00
parent eeac10c66f
commit f5d6e376c6
4 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PCA9685-Arduino

@ -1 +1 @@
Subproject commit 23e06c06a6026801a856141f64a6de54dd493b47 Subproject commit a70be39257e317d35e9118b385006a1e030e6452

10
lib/treppe/FSMTreppe2/FSMTreppe2.cpp
View File

@ -17,7 +17,6 @@
// Validation result: Not run // Validation result: Not run
// //
#include "FSMTreppe2.h" #include "FSMTreppe2.h"
// #include "FSMTreppe_private.h"
#include <stdint.h> #include <stdint.h>
// Named constants for Chart: '<Root>/FSMTreppe' // Named constants for Chart: '<Root>/FSMTreppe'
@ -212,8 +211,7 @@ void FSMTreppeModelClass::terminate()
FSMTreppeModelClass::FSMTreppeModelClass() : FSMTreppeModelClass::FSMTreppeModelClass() :
FSMTreppe_DW(), FSMTreppe_DW(),
FSMTreppe_U(), FSMTreppe_U(),
FSMTreppe_Y(), FSMTreppe_Y()
FSMTreppe_M()
{ {
// Currently there is no constructor body generated. // Currently there is no constructor body generated.
} }
@ -224,12 +222,6 @@ FSMTreppeModelClass::~FSMTreppeModelClass()
// Currently there is no destructor body generated. // 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. // File trailer for generated code.
// //

20
lib/treppe/FSMTreppe2/FSMTreppe2.h
View File

@ -21,15 +21,6 @@
#include <stdint.h> #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 declaration for model FSMTreppe
class FSMTreppeModelClass { class FSMTreppeModelClass {
// public data and function members // public data and function members
@ -56,11 +47,6 @@ class FSMTreppeModelClass {
uint8_t dimmrichtung; // '<Root>/dimmrichtung' uint8_t dimmrichtung; // '<Root>/dimmrichtung'
}; };
// Real-time Model Data Structure
struct RT_MODEL_FSMTreppe_T {
const char * volatile errorStatus;
};
// model initialize function // model initialize function
void initialize(); void initialize();
@ -92,9 +78,6 @@ class FSMTreppeModelClass {
return FSMTreppe_Y; return FSMTreppe_Y;
} }
// Real-Time Model get method
FSMTreppeModelClass::RT_MODEL_FSMTreppe_T * getRTM();
// private data and function members // private data and function members
private: private:
// Block states // Block states
@ -105,9 +88,6 @@ class FSMTreppeModelClass {
// External outputs // External outputs
ExtY_FSMTreppe_T FSMTreppe_Y; ExtY_FSMTreppe_T FSMTreppe_Y;
// Real-Time Model
RT_MODEL_FSMTreppe_T FSMTreppe_M;
}; };
//- //-

11
lib/treppe/treppe.cpp
View File

@ -160,16 +160,20 @@ void Treppe::print_state_on_change() {
if( if(
fsm_inputs.anim_beendet != last_in.anim_beendet || fsm_inputs.anim_beendet != last_in.anim_beendet ||
fsm_inputs.sensor_oben != last_in.sensor_oben || 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.anim_beendet = fsm_inputs.anim_beendet;
last_in.sensor_oben = fsm_inputs.sensor_oben; last_in.sensor_oben = fsm_inputs.sensor_oben;
last_in.sensor_unten = fsm_inputs.sensor_unten; 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); fsm_inputs.sensor_oben, fsm_inputs.sensor_unten, fsm_inputs.anim_beendet);
Serial.print(" step => "); 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; state = switch_state;
} }
fsm_inputs.ldr_schwelle = 1;
fsm_inputs.sensor_oben = read_sensor(SENSOR_OBEN); fsm_inputs.sensor_oben = read_sensor(SENSOR_OBEN);
fsm_inputs.sensor_unten = read_sensor(SENSOR_UNTEN); fsm_inputs.sensor_unten = read_sensor(SENSOR_UNTEN);
fsm_inputs.anim_beendet = static_cast<bool>(finish); fsm_inputs.anim_beendet = static_cast<bool>(finish);