Compare commits
6
Commits
79ff1f0d33
...
FSM1.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a398d9ba0 | ||
|
|
f28aa2df8b | ||
|
|
754da9f931 | ||
|
|
df2a8fa1e3 | ||
|
|
dc159a35d0 | ||
|
|
2378ca80b9 |
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
.pio
|
.pio
|
||||||
.vscode
|
.vscode
|
||||||
.vscode/*
|
.vscode/*
|
||||||
|
.vscode/**
|
||||||
compress
|
compress
|
||||||
data_gz
|
data_gz
|
||||||
platformio.ini
|
platformio.ini
|
||||||
|
|||||||
Vendored
-7
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
|
||||||
// for the documentation about the extensions.json format
|
|
||||||
"recommendations": [
|
|
||||||
"platformio.platformio-ide"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Vendored
-53
@@ -1,53 +0,0 @@
|
|||||||
{
|
|
||||||
"files.associations": {
|
|
||||||
"random": "cpp",
|
|
||||||
"array": "cpp",
|
|
||||||
"*.tcc": "cpp",
|
|
||||||
"deque": "cpp",
|
|
||||||
"list": "cpp",
|
|
||||||
"string": "cpp",
|
|
||||||
"unordered_map": "cpp",
|
|
||||||
"vector": "cpp",
|
|
||||||
"string_view": "cpp",
|
|
||||||
"memory": "cpp",
|
|
||||||
"ranges": "cpp",
|
|
||||||
"initializer_list": "cpp",
|
|
||||||
"utility": "cpp",
|
|
||||||
"atomic": "cpp",
|
|
||||||
"bit": "cpp",
|
|
||||||
"cctype": "cpp",
|
|
||||||
"clocale": "cpp",
|
|
||||||
"cmath": "cpp",
|
|
||||||
"compare": "cpp",
|
|
||||||
"concepts": "cpp",
|
|
||||||
"cstdarg": "cpp",
|
|
||||||
"cstddef": "cpp",
|
|
||||||
"cstdint": "cpp",
|
|
||||||
"cstdio": "cpp",
|
|
||||||
"cstdlib": "cpp",
|
|
||||||
"cstring": "cpp",
|
|
||||||
"cwchar": "cpp",
|
|
||||||
"cwctype": "cpp",
|
|
||||||
"map": "cpp",
|
|
||||||
"set": "cpp",
|
|
||||||
"exception": "cpp",
|
|
||||||
"algorithm": "cpp",
|
|
||||||
"functional": "cpp",
|
|
||||||
"iterator": "cpp",
|
|
||||||
"memory_resource": "cpp",
|
|
||||||
"numeric": "cpp",
|
|
||||||
"optional": "cpp",
|
|
||||||
"system_error": "cpp",
|
|
||||||
"tuple": "cpp",
|
|
||||||
"type_traits": "cpp",
|
|
||||||
"iosfwd": "cpp",
|
|
||||||
"limits": "cpp",
|
|
||||||
"new": "cpp",
|
|
||||||
"ostream": "cpp",
|
|
||||||
"stdexcept": "cpp",
|
|
||||||
"streambuf": "cpp",
|
|
||||||
"cinttypes": "cpp",
|
|
||||||
"typeinfo": "cpp"
|
|
||||||
},
|
|
||||||
"python.pythonPath": "C:\\Users\\simon\\AppData\\Local\\Programs\\Python\\Python37\\python.exe"
|
|
||||||
}
|
|
||||||
+1
-1
Submodule lib/PCA9685-Arduino updated: 23e06c06a6...a70be39257.
@@ -0,0 +1,170 @@
|
|||||||
|
//
|
||||||
|
// 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]
|
||||||
|
//
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
//
|
||||||
|
// 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]
|
||||||
|
//
|
||||||
@@ -155,6 +155,7 @@ void Treppe::setup(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Treppe::task(){
|
void Treppe::task(){
|
||||||
|
FSMTreppe_Obj.step();
|
||||||
|
|
||||||
if(finish){
|
if(finish){
|
||||||
direction = switch_direction;
|
direction = switch_direction;
|
||||||
|
|||||||
+10
-3
@@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "FSMTreppe/FSMTreppe.h"
|
||||||
#include "PCA9685.h"
|
#include "PCA9685.h"
|
||||||
|
|
||||||
#define SENSOR1 2
|
#define SENSOR1 2
|
||||||
@@ -10,6 +11,10 @@
|
|||||||
|
|
||||||
class Treppe {
|
class Treppe {
|
||||||
private:
|
private:
|
||||||
|
// initialize with i2c-Address 0, use Wire Library
|
||||||
|
PCA9685 pwmController;
|
||||||
|
FSMTreppeModelClass FSMTreppe_Obj;// Instance of model class
|
||||||
|
|
||||||
uint8_t stairs;
|
uint8_t stairs;
|
||||||
uint16_t time_per_stair = 300; // dimmtime per stair [ms]
|
uint16_t time_per_stair = 300; // dimmtime per stair [ms]
|
||||||
uint16_t idle_brightness = 100;
|
uint16_t idle_brightness = 100;
|
||||||
@@ -31,21 +36,23 @@ private:
|
|||||||
float differenz_pwm_pro_tick = 0.0;
|
float differenz_pwm_pro_tick = 0.0;
|
||||||
// alternative
|
// alternative
|
||||||
|
|
||||||
|
|
||||||
// initialize with i2c-Address 0, use Wire Library
|
|
||||||
PCA9685 pwmController;
|
|
||||||
uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval);
|
uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval);
|
||||||
void ledsequence();
|
void ledsequence();
|
||||||
void rampe();
|
void rampe();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Treppe(uint8_t _stairs) : stairs(_stairs){
|
Treppe(uint8_t _stairs) : stairs(_stairs){
|
||||||
|
FSMTreppe_Obj.initialize();
|
||||||
|
|
||||||
ticks_pro_stufe = time_per_stair / 20; // [ms]
|
ticks_pro_stufe = time_per_stair / 20; // [ms]
|
||||||
ticks_treppe = ticks_pro_stufe * stairs;
|
ticks_treppe = ticks_pro_stufe * stairs;
|
||||||
|
|
||||||
differenz_pwm_pro_tick = (float) (active_brightness - idle_brightness)
|
differenz_pwm_pro_tick = (float) (active_brightness - idle_brightness)
|
||||||
/ (float) ticks_pro_stufe;
|
/ (float) ticks_pro_stufe;
|
||||||
}
|
}
|
||||||
|
~Treppe() {
|
||||||
|
FSMTreppe_Obj.terminate();
|
||||||
|
}
|
||||||
|
|
||||||
void setup();
|
void setup();
|
||||||
void task(); // call periodically
|
void task(); // call periodically
|
||||||
|
|||||||
Reference in new issue
Block a user