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

working version, without control dynamiclly

Browse Source
This commit is contained in:
Simon Schmidt 2021-09-07 09:52:12 +02:00
parent 79e88d29c3
commit 392f2c1bbc
36 changed files with 163 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/treppe/FSMTreppe3/FSMTreppe3.cpp → lib/treppe/FSMTreppe4/FSMTreppe4.cpp
View File

@ -7,34 +7,36 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.51
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Wed Jul 7 18:54:01 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
// Code generation objectives: Unspecified
// Validation result: Not run
//
#include "FSMTreppe3.h"
#include "FSMTreppe4.h"
// Named constants for Chart: '<Root>/FSMTreppe'
const uint32_t FSMTreppe_IN_abdimmen_hoch = 1U;
const uint32_t FSMTreppe_IN_abdimmen_ldr = 2U;
const uint32_t FSMTreppe_IN_abdimmen_runter = 3U;
const uint32_t FSMTreppe_IN_aufdimmen_hoch = 4U;
const uint32_t FSMTreppe_IN_aufdimmen_ldr = 5U;
const uint32_t FSMTreppe_IN_aufdimmen_runter = 6U;
const uint32_t FSMTreppe_IN_inaktiv = 7U;
const uint32_t FSMTreppe_IN_ruhezustand = 8U;
const uint32_t FSMTreppe_IN_warten_hoch = 9U;
const uint32_t FSMTreppe_IN_warten_runter = 10U;
const uint8_t FSMTreppe_IN_abdimmen_hoch = 1U;
const uint8_t FSMTreppe_IN_abdimmen_ldr = 2U;
const uint8_t FSMTreppe_IN_abdimmen_runter = 3U;
const uint8_t FSMTreppe_IN_aufdimmen_hoch = 4U;
const uint8_t FSMTreppe_IN_aufdimmen_ldr = 5U;
const uint8_t FSMTreppe_IN_aufdimmen_runter = 6U;
const uint8_t FSMTreppe_IN_dimm_regelung = 7U;
const uint8_t FSMTreppe_IN_inaktiv = 8U;
const uint8_t FSMTreppe_IN_ruhezustand = 9U;
const uint8_t FSMTreppe_IN_warten_hoch = 10U;
const uint8_t FSMTreppe_IN_warten_runter = 11U;
// Model step function
void FSMTreppeModelClass::step()
{
// Chart: '<Root>/FSMTreppe' incorporates:
// Inport: '<Root>/anim_beendet'
// Inport: '<Root>/ldr_changed'
// Inport: '<Root>/ldr_schwelle'
// Inport: '<Root>/sensor_oben'
// Inport: '<Root>/sensor_unten'
@ -150,6 +152,18 @@ void FSMTreppeModelClass::step()
}
break;
case FSMTreppe_IN_dimm_regelung:
// Outport: '<Root>/status'
FSMTreppe_Y.status = 10U;
if ((FSMTreppe_DW.temporalCounter_i1 >= 500U) || (FSMTreppe_U.anim_beendet
== 1U)) {
FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_ruhezustand;
// Outport: '<Root>/status'
FSMTreppe_Y.status = 3U;
}
break;
case FSMTreppe_IN_inaktiv:
// Outport: '<Root>/status'
FSMTreppe_Y.status = 0U;
@ -201,6 +215,12 @@ void FSMTreppeModelClass::step()
// Outport: '<Root>/dimmrichtung'
FSMTreppe_Y.dimmrichtung = 0U;
} else if (FSMTreppe_U.ldr_changed == 1U) {
FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_dimm_regelung;
FSMTreppe_DW.temporalCounter_i1 = 0U;
// Outport: '<Root>/status'
FSMTreppe_Y.status = 10U;
}
break;

34
lib/treppe/FSMTreppe3/FSMTreppe3.h → lib/treppe/FSMTreppe4/FSMTreppe4.h
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.51
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Wed Jul 7 18:54:01 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
@ -27,24 +27,25 @@ class FSMTreppeModelClass {
public:
// Block states (default storage) for system '<Root>'
struct DW_FSMTreppe_T {
uint16_t temporalCounter_i1=0; // '<Root>/FSMTreppe'
uint8_t is_active_c3_FSMTreppe=0; // '<Root>/FSMTreppe'
uint8_t is_c3_FSMTreppe=0; // '<Root>/FSMTreppe'
uint16_t temporalCounter_i1; // '<Root>/FSMTreppe'
uint8_t is_active_c3_FSMTreppe; // '<Root>/FSMTreppe'
uint8_t is_c3_FSMTreppe; // '<Root>/FSMTreppe'
};
// External inputs (root inport signals with default storage)
struct ExtU_FSMTreppe_T {
uint32_t sensor_unten=0; // '<Root>/sensor_unten'
uint32_t sensor_oben=0; // '<Root>/sensor_oben'
uint32_t anim_beendet=0; // '<Root>/anim_beendet'
uint32_t ldr_schwelle=0; // '<Root>/ldr_schwelle'
uint32_t sensor_unten; // '<Root>/sensor_unten'
uint32_t sensor_oben; // '<Root>/sensor_oben'
uint32_t anim_beendet; // '<Root>/anim_beendet'
uint32_t ldr_schwelle; // '<Root>/ldr_schwelle'
uint32_t ldr_changed; // '<Root>/ldr_changed'
};
// External outputs (root outports fed by signals with default storage)
struct ExtY_FSMTreppe_T {
uint32_t laufrichtung=0; // '<Root>/laufrichtung'
uint32_t status=0; // '<Root>/status'
uint32_t dimmrichtung=0; // '<Root>/dimmrichtung'
uint32_t laufrichtung; // '<Root>/laufrichtung'
uint32_t status; // '<Root>/status'
uint32_t dimmrichtung; // '<Root>/dimmrichtung'
};
// model initialize function
@ -67,16 +68,13 @@ class FSMTreppeModelClass {
// Root inports set method
void setExternalInputs(const ExtU_FSMTreppe_T* pExtU_FSMTreppe_T)
{
FSMTreppe_U.anim_beendet = pExtU_FSMTreppe_T->anim_beendet;
FSMTreppe_U.ldr_schwelle = pExtU_FSMTreppe_T->ldr_schwelle;
FSMTreppe_U.sensor_oben = pExtU_FSMTreppe_T->sensor_oben;
FSMTreppe_U.sensor_unten = pExtU_FSMTreppe_T->sensor_unten;
FSMTreppe_U = *pExtU_FSMTreppe_T;
}
// Root-level structure-based outputs get method
// Root outports get method
const FSMTreppeModelClass::ExtY_FSMTreppe_T getExternalOutputs() const
const FSMTreppeModelClass::ExtY_FSMTreppe_T & getExternalOutputs() const
{
return FSMTreppe_Y;
}

6
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/FSMTreppe.cpp
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.64
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Tue Sep 7 08:38:51 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
@ -216,7 +216,7 @@ void FSMTreppeModelClass::step()
// Outport: '<Root>/dimmrichtung'
FSMTreppe_Y.dimmrichtung = 0U;
} else if (FSMTreppe_U.ldr_changed == 1.0) {
} else if (FSMTreppe_U.ldr_changed == 1U) {
FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_dimm_regelung;
FSMTreppe_DW.temporalCounter_i1 = 0U;

6
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/FSMTreppe.h
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.64
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Tue Sep 7 08:38:51 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
@ -47,7 +47,7 @@ class FSMTreppeModelClass {
uint32_T sensor_oben; // '<Root>/sensor_oben'
uint32_T anim_beendet; // '<Root>/anim_beendet'
uint32_T ldr_schwelle; // '<Root>/ldr_schwelle'
real_T ldr_changed; // '<Root>/ldr_changed'
uint32_T ldr_changed; // '<Root>/ldr_changed'
};
// External outputs (root outports fed by signals with default storage)

4
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/FSMTreppe_private.h
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.64
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Tue Sep 7 08:38:51 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M

4
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/FSMTreppe_types.h
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.64
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Tue Sep 7 08:38:51 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/buildInfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/codeInfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/codedescriptor.dmr
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/compileInfo.mat
View File

Binary file not shown.

4
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/ert_main.cpp
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.64
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Tue Sep 7 08:38:51 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/make_exception.mat
View File

Binary file not shown.

4
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/rtwtypes.h
View File

@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'FSMTreppe'.
//
// Model version : 1.64
// Model version : 1.65
// Simulink Coder version : 9.5 (R2021a) 14-Nov-2020
// C/C++ source code generated on : Tue Sep 7 08:38:51 2021
// C/C++ source code generated on : Tue Sep 7 08:47:00 2021
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/rtwtypeschksum.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/FSMTreppe_ert_rtw/tmwinternal/tr
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/FSM_Treppenlicht.slx
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_jitprj/jitEngineAccessInfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_jitprj/sTGUi98rQlfFIIKcc1lBYo.l Normal file
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_jitprj/sTGUi98rQlfFIIKcc1lBYo.mat Normal file
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/EMLReport/emlReportAccessInfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/EMLReport/sTGUi98rQlfFIIKcc1lBYo.mat Normal file
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/FSMTreppe/_self/rtw/ert/info/binfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/FSMTreppe/amsi_serial.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/FSM_Treppenlicht/_self/sfun/info/binfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/FSM_Treppenlicht/amsi_serial.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/precompile/autoInferAccessInfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/precompile/l5Ow0tOImwRNrau57tMSHG.mat Normal file
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/_sfprj/precompile/lMa6MnlnLShAL9YOlpRKdD.mat Normal file
View File

Binary file not shown.

133
lib/treppe/MatLabSrc/slprj/ert/FSMTreppe/tmwinternal/CompileInfo.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<MF0 version="1.1" packageUris="http://schema.mathworks.com/mf0/ci/19700101 http://schema.mathworks.com/mf0/sl_modelref_info/R2021a http://schema.mathworks.com/mf0/slexec_mm_sto/R2021a_202007071525">
<ModelRefInfoRepo.ModelRefInfoRoot type="ModelRefInfoRepo.ModelRefInfoRoot" uuid="7555d04e-b2fe-446f-9fe1-318583822c6f">
<ModelRefInfoRepo.ModelRefInfoRoot type="ModelRefInfoRepo.ModelRefInfoRoot" uuid="8c91d049-4f97-4bab-9878-75249f9e4ce5">
<autoSolverStatusFlags>327</autoSolverStatusFlags>
<childModelRefInfo type="ModelRefInfoRepo.ChildModelRefInfo" uuid="03f2a4ea-5cb0-4e3f-90a0-dd0e1805a761">
<childModelRefInfo type="ModelRefInfoRepo.ChildModelRefInfo" uuid="a6d6d289-18e5-4e3a-a084-25aa29dfde4c">
<modelName>FSMTreppe</modelName>
<modelPath>FSMTreppe</modelPath>
</childModelRefInfo>
@ -12,7 +12,7 @@
<hasBwsAccessed>true</hasBwsAccessed>
<hasBwsAccessedByAnyModel>true</hasBwsAccessedByAnyModel>
<hasStatesModifiedInOutputUpdate>true</hasStatesModifiedInOutputUpdate>
<inports type="ModelRefInfoRepo.InportInformation" uuid="96dc434b-7559-48bc-809e-c4e76148958a">
<inports type="ModelRefInfoRepo.InportInformation" uuid="3dc97546-0910-427f-9bc7-9e91fec18867">
<isNotDerivPort>true</isNotDerivPort>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -25,9 +25,9 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="b7c3a0c2-0424-4f2c-ad98-6946e41cc9c6"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="9cd81293-70da-4c16-8844-138377fd2ffa"/>
</inports>
<inports type="ModelRefInfoRepo.InportInformation" uuid="b6a4a316-d1eb-44ef-b08e-641a6afda1e1">
<inports type="ModelRefInfoRepo.InportInformation" uuid="f73563dc-9c8d-4480-99e9-2c0b052edfc9">
<isNotDerivPort>true</isNotDerivPort>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -41,9 +41,9 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="418561e6-ffb5-470a-90d9-f15eff4f4f30"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="98c95bd5-dcdd-41dd-87c0-d47532b36c10"/>
</inports>
<inports type="ModelRefInfoRepo.InportInformation" uuid="3aa6343e-6d39-42af-9615-9947972bdfcd">
<inports type="ModelRefInfoRepo.InportInformation" uuid="2034510f-ecff-4ad3-b7a1-bd08f645356b">
<isNotDerivPort>true</isNotDerivPort>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -57,9 +57,9 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="1b16866b-129a-4603-9f13-4830178f2710"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="cd2922c2-d42f-4799-aeec-e36598671a09"/>
</inports>
<inports type="ModelRefInfoRepo.InportInformation" uuid="bffcdc1c-176a-4f58-b0cc-c190848613c0">
<inports type="ModelRefInfoRepo.InportInformation" uuid="cc6453dd-0d6b-44c7-ae81-7ae9ea6fee69">
<isNotDerivPort>true</isNotDerivPort>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -73,9 +73,9 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="44a75dc2-a909-4071-8714-05eeb6859d93"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="b541c213-306d-4f84-a877-ad3423724d21"/>
</inports>
<inports type="ModelRefInfoRepo.InportInformation" uuid="0c897dc9-dc8f-4173-b90a-dc2578d10b7c">
<inports type="ModelRefInfoRepo.InportInformation" uuid="bd911fe8-045d-4191-ba64-990a9b0baba8">
<isNotDerivPort>true</isNotDerivPort>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -89,7 +89,7 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="d5424f81-ff3d-4ba3-8e39-3f31745085c5"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="9282f124-0226-4425-9c6a-8fbc484d8f62"/>
</inports>
<isBdInSimModeForSimCodegenVariants>false</isBdInSimModeForSimCodegenVariants>
<isInlineParamsOn>true</isInlineParamsOn>
@ -116,7 +116,7 @@
<origOutportBusType></origOutportBusType>
<origOutportBusType></origOutportBusType>
<origOutportBusType></origOutportBusType>
<outports type="ModelRefInfoRepo.OutportInformation" uuid="10253844-4a79-4779-8d8d-a5ec80db828b">
<outports type="ModelRefInfoRepo.OutportInformation" uuid="730188ea-a135-4ebe-90bf-6d86de487f40">
<hasSystemInitMethod>true</hasSystemInitMethod>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -128,9 +128,9 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="52063b6d-7cc4-4c8b-8d92-d1715afbe8e2"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="022f3f70-d650-4c09-b92e-a82eae70cca0"/>
</outports>
<outports type="ModelRefInfoRepo.OutportInformation" uuid="11796f98-a0b7-4eb0-b64e-49bf2ffe978d">
<outports type="ModelRefInfoRepo.OutportInformation" uuid="a4bd5e44-5daa-439d-9fcd-074b1f23791b">
<hasSystemInitMethod>true</hasSystemInitMethod>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -143,9 +143,9 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="21f58345-79e5-4411-9eef-d114196a5e0e"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="9a85f83a-af2f-4a8b-8b39-f87903bab9e3"/>
</outports>
<outports type="ModelRefInfoRepo.OutportInformation" uuid="f8910c79-7cff-4166-b02d-97bf6428b343">
<outports type="ModelRefInfoRepo.OutportInformation" uuid="b045b60e-3dae-4adc-990e-4bb63a007aa3">
<hasSystemInitMethod>true</hasSystemInitMethod>
<designMax>Inf</designMax>
<designMin>-Inf</designMin>
@ -158,7 +158,7 @@
<rateIdx>0</rateIdx>
</rateInfo>
<resolvedSignalObject></resolvedSignalObject>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="c2674bf4-ac65-4b69-823e-fac5a85b7dc0"/>
<sigNameToEMVCEMap type="ModelRefInfoRepo.SigNameEMVCEInfo" uuid="c528ad7d-8ccf-4847-9b02-7492d282a463"/>
</outports>
<removeResetFunc>true</removeResetFunc>
<runtimeNonFcnCallRateInfos type="ModelRefInfoRepo.RateInfo">
@ -171,27 +171,27 @@
<sampleTimeInheritanceRule>2</sampleTimeInheritanceRule>
<timingAndTaskingRegistry>&lt;?xml version=&quot;1.0&quot;?&gt;
&lt;slexec_sto version=&quot;1.1&quot; packageUris=&quot;http://schema.mathworks.com/mf0/slexec_mm_sto/R2021a_202007071525&quot;&gt;
&lt;sto.Registry type=&quot;sto.Registry&quot; uuid=&quot;ba7c0a74-67aa-483e-8150-1c7f77bd4db1&quot;&gt;
&lt;clocks type=&quot;sto.Timer&quot; uuid=&quot;588e59c8-3f1f-47d4-8b44-94c98d3a35a5&quot;&gt;
&lt;sto.Registry type=&quot;sto.Registry&quot; uuid=&quot;9b7d34e5-9d96-44f0-b2a3-9f989daf3c92&quot;&gt;
&lt;clocks type=&quot;sto.Timer&quot; uuid=&quot;626dfc1a-2af1-4bf4-b453-3f3a1fda66c1&quot;&gt;
&lt;computedFundamentalDiscretePeriod&gt;.01&lt;/computedFundamentalDiscretePeriod&gt;
&lt;resolution&gt;.01&lt;/resolution&gt;
&lt;clockTickConstraint&gt;PeriodicWithFixedResolution&lt;/clockTickConstraint&gt;
&lt;specifiedTaskingMode&gt;ClassicMultiTasking&lt;/specifiedTaskingMode&gt;
&lt;timeAdvanceMode&gt;FixedStep&lt;/timeAdvanceMode&gt;
&lt;clockDomain type=&quot;sto.ClockDomain&quot; uuid=&quot;5f4d6ed0-4e4d-479f-9712-7cf4da42ed97&quot;&gt;
&lt;clockDomain type=&quot;sto.ClockDomain&quot; uuid=&quot;e7bc3f67-5218-4c0d-9dea-3c07a32eafc4&quot;&gt;
&lt;baseTaskID&gt;_task0&lt;/baseTaskID&gt;
&lt;rates type=&quot;sto.Rate&quot; uuid=&quot;d24609d5-a5fb-4db3-9540-ed0b011f0b3a&quot;/&gt;
&lt;rootTaskHierarchyElements type=&quot;sto.Task&quot; uuid=&quot;29015274-7e5f-4a50-819e-621bfb182f06&quot;&gt;
&lt;rates type=&quot;sto.Rate&quot; uuid=&quot;d4495b93-a61c-4a6a-81c8-0f9b18a67d05&quot;/&gt;
&lt;rootTaskHierarchyElements type=&quot;sto.Task&quot; uuid=&quot;5a391a5c-a43d-4aa9-bc41-2a93663da7b2&quot;&gt;
&lt;isExecutable&gt;true&lt;/isExecutable&gt;
&lt;orderIndex&gt;1&lt;/orderIndex&gt;
&lt;rates type=&quot;sto.Rate&quot; uuid=&quot;d24609d5-a5fb-4db3-9540-ed0b011f0b3a&quot;&gt;
&lt;rates type=&quot;sto.Rate&quot; uuid=&quot;d4495b93-a61c-4a6a-81c8-0f9b18a67d05&quot;&gt;
&lt;annotation&gt;D1&lt;/annotation&gt;
&lt;colorIndex&gt;2&lt;/colorIndex&gt;
&lt;description&gt;Discrete 1&lt;/description&gt;
&lt;eventSourceType&gt;UNSPECIFIED_EVENT_SOURCE&lt;/eventSourceType&gt;
&lt;registry type=&quot;sto.Registry&quot; uuid=&quot;ba7c0a74-67aa-483e-8150-1c7f77bd4db1&quot;/&gt;
&lt;registry type=&quot;sto.Registry&quot; uuid=&quot;9b7d34e5-9d96-44f0-b2a3-9f989daf3c92&quot;/&gt;
&lt;taskId&gt;_task0&lt;/taskId&gt;
&lt;rateSpec type=&quot;sto.RateSpec&quot; uuid=&quot;3191e5c3-988f-4441-8cc9-a9d20920c22d&quot;&gt;
&lt;rateSpec type=&quot;sto.RateSpec&quot; uuid=&quot;ae5af4bd-9e1d-4b56-893c-68e4b2480f8d&quot;&gt;
&lt;period&gt;.01&lt;/period&gt;
&lt;rateType&gt;ClassicPeriodicDiscrete&lt;/rateType&gt;
&lt;/rateSpec&gt;
@ -203,19 +203,19 @@
&lt;/clockDomain&gt;
&lt;/clocks&gt;
&lt;executionSpec&gt;Undetermined&lt;/executionSpec&gt;
&lt;taskDependencyGraph type=&quot;sto.SerializedTaskConnectionList&quot; uuid=&quot;ee1864fc-d534-42ce-aec5-7292148af732&quot;&gt;
&lt;taskDependencyGraph type=&quot;sto.SerializedTaskConnectionList&quot; uuid=&quot;f3e9c73b-bb20-4ef6-a737-eff2b3a03780&quot;&gt;
&lt;taskIdentifier&gt;_task0&lt;/taskIdentifier&gt;
&lt;/taskDependencyGraph&gt;
&lt;taskPriorityDirection&gt;HighNumberLast&lt;/taskPriorityDirection&gt;
&lt;taskingMode&gt;ClassicMultiTasking&lt;/taskingMode&gt;
&lt;tasks type=&quot;sto.Task&quot; uuid=&quot;29015274-7e5f-4a50-819e-621bfb182f06&quot;/&gt;
&lt;tasks type=&quot;sto.Task&quot; uuid=&quot;5a391a5c-a43d-4aa9-bc41-2a93663da7b2&quot;/&gt;
&lt;timeAdvanceMode&gt;FixedStep&lt;/timeAdvanceMode&gt;
&lt;/sto.Registry&gt;
&lt;/slexec_sto&gt;</timingAndTaskingRegistry>
<zeroInternalMemoryAtStartupUnchecked>true</zeroInternalMemoryAtStartupUnchecked>
<FMUBlockMap type="ModelRefInfoRepo.FMUBlockInfo" uuid="2dd4025f-9351-4e7c-9074-0e7aa39cdf36"/>
<codeGenInfo type="ModelRefInfoRepo.CodeGenInformation" uuid="2e133251-5287-43b2-9b4a-5389aafb25f2"/>
<configSettingsForConsistencyChecks type="ModelRefInfoRepo.ConfigSettingsForConsistencyChecks" uuid="6546012e-563f-4082-866c-56b3b4442d30">
<FMUBlockMap type="ModelRefInfoRepo.FMUBlockInfo" uuid="b93b26b0-22f0-4764-a798-053907f178f4"/>
<codeGenInfo type="ModelRefInfoRepo.CodeGenInformation" uuid="d598be23-3911-4922-9ca1-b6dca592cdf8"/>
<configSettingsForConsistencyChecks type="ModelRefInfoRepo.ConfigSettingsForConsistencyChecks" uuid="79532f7e-333b-46dc-830a-de1e37104a81">
<consistentOutportInitialization>true</consistentOutportInitialization>
<fixedStepSize>.01</fixedStepSize>
<hasHybridSampleTime>true</hasHybridSampleTime>
@ -224,7 +224,7 @@
<simSIMDOptimization>1</simSIMDOptimization>
<solverName>FixedStepDiscrete</solverName>
<solverType>SOLVER_TYPE_FIXEDSTEP</solverType>
<hardwareSettings type="ModelRefInfoRepo.HardwareSettings" uuid="eb5a4b10-25e9-40c6-bb62-c40e4583ea06">
<hardwareSettings type="ModelRefInfoRepo.HardwareSettings" uuid="69f559cc-e983-4421-8260-4b0ab3d57945">
<prodBitPerChar>8</prodBitPerChar>
<prodBitPerDouble>64</prodBitPerDouble>
<prodBitPerFloat>32</prodBitPerFloat>
@ -242,9 +242,9 @@
<prodWordSize>32</prodWordSize>
</hardwareSettings>
</configSettingsForConsistencyChecks>
<controllableInputRatesMap type="ModelRefInfoRepo.VarTsUIDMap" uuid="e700b233-60b9-4bae-a176-4252a98ea9df"/>
<controllableOutputRatesMap type="ModelRefInfoRepo.VarTsUIDMap" uuid="d6389860-36b9-4d36-ab76-159980d60dc2"/>
<dataPortGroup type="ModelRefInfoRepo.DataPortGroup" uuid="0f8667e7-fe6e-4660-a547-82a75ba80f86">
<controllableInputRatesMap type="ModelRefInfoRepo.VarTsUIDMap" uuid="188fca95-6ffa-4497-91c4-097c5c5aee33"/>
<controllableOutputRatesMap type="ModelRefInfoRepo.VarTsUIDMap" uuid="34d898ee-0488-42bb-be25-40cbd6819eaf"/>
<dataPortGroup type="ModelRefInfoRepo.DataPortGroup" uuid="99ea55ca-19b6-439c-b494-ab33265aa22b">
<compDataInputPorts>0</compDataInputPorts>
<compDataInputPorts>1</compDataInputPorts>
<compDataInputPorts>2</compDataInputPorts>
@ -262,75 +262,76 @@
<dataOutputPorts>1</dataOutputPorts>
<dataOutputPorts>2</dataOutputPorts>
</dataPortGroup>
<expFcnUnconnectedDataPortGroup type="ModelRefInfoRepo.DataPortGroup" uuid="54f645f4-7048-4a7a-bdba-987f462f9049"/>
<interfaceParameterInfo type="ModelRefInfoRepo.InterfaceParameterInfo" uuid="f3ffe881-fe0f-4380-b6d4-fc2904df6735"/>
<messageInfo type="ModelRefInfoRepo.MessageInformation" uuid="417f8bab-9c4c-43fe-bb6c-a5fa82a05f7d"/>
<methodInfo type="ModelRefInfoRepo.MethodExistenceInfo" uuid="1742a0ba-e6d5-4884-aeac-07757b6c68df">
<expFcnUnconnectedDataPortGroup type="ModelRefInfoRepo.DataPortGroup" uuid="9857c752-3ac8-4e50-8860-b306bd783dd4"/>
<interfaceParameterInfo type="ModelRefInfoRepo.InterfaceParameterInfo" uuid="e1381a12-d132-4b2a-8837-635f4863a9c2"/>
<messageInfo type="ModelRefInfoRepo.MessageInformation" uuid="d14ba5d4-7085-4560-87a6-b9de7a83fb36"/>
<methodInfo type="ModelRefInfoRepo.MethodExistenceInfo" uuid="d88c6655-e78d-4745-93e1-9f8837d13b0b">
<hasEnableMethod>true</hasEnableMethod>
<hasSystemInitializeMethod>true</hasSystemInitializeMethod>
<hasSystemResetMethod>true</hasSystemResetMethod>
<hasTerminateMethod>true</hasTerminateMethod>
</methodInfo>
<periodicEventPortUnsupportedBlockInfo type="ModelRefInfoRepo.PeriodicEventPortUnsupportedBlockInfo" uuid="ac9bb6a2-0700-4ee3-9008-5e19e55c5010"/>
<portGroupsRequireSameRate type="ModelRefInfoRepo.PortGroupsRequireSameRate" uuid="ece8d6c3-f133-445b-a473-3082ea4d0485">
<DSMPortGroups type="ModelRefInfoRepo.NameToPortGroupIdxVectMap" uuid="55bbc064-14a3-480d-b127-7ab64cafc98e"/>
<GlobalDSMPortGroups type="ModelRefInfoRepo.NameToPortGroupIdxVectMap" uuid="be54cdd0-e105-46b0-91c1-fb6def8fc679"/>
<mergedPortGroups type="ModelRefInfoRepo.NameToPortGroupIdxVectMap" uuid="1833b1af-1f19-40ab-84c0-7bccd46c9745"/>
<periodicEventPortUnsupportedBlockInfo type="ModelRefInfoRepo.PeriodicEventPortUnsupportedBlockInfo" uuid="f61487e4-ebaf-4b99-9d2b-c4b1ea41af92"/>
<portGroupsRequireSameRate type="ModelRefInfoRepo.PortGroupsRequireSameRate" uuid="79702c85-5b35-40f3-ae57-7023f221a663">
<DSMPortGroups type="ModelRefInfoRepo.NameToPortGroupIdxVectMap" uuid="6de7bfcb-0451-406e-8e38-16e7fe1c75a6"/>
<GlobalDSMPortGroups type="ModelRefInfoRepo.NameToPortGroupIdxVectMap" uuid="6f27c871-22fc-4c10-8f4d-1d41d46055ee"/>
<mergedPortGroups type="ModelRefInfoRepo.NameToPortGroupIdxVectMap" uuid="5d9254a5-a2a4-4a98-9aef-3308701c81f0"/>
</portGroupsRequireSameRate>
<rateBasedMdlGlobalDSMRateSpec type="ModelRefInfoRepo.GlobalDSMRateSpecMap" uuid="ffb0ca00-9662-40c0-84da-e487c5dc546e"/>
<rateSpecOfGlobalDSMAccessedByDescExpFcnMdlMap type="ModelRefInfoRepo.GlobalDSMRateSpecMap" uuid="eca8ad4f-0c38-46d9-9832-66b8d77ec8cb"/>
<rootBlockDiagramInterface type="ci.Model" uuid="a83d0372-6504-4aff-bc66-ef8bd8998783">
<p_RootComponentInterface type="ci.ComponentInterface" uuid="bda18f0d-f088-4d3e-9118-5ec3e1f6d2b0">
<p_InputPorts type="ci.SignalInterface" uuid="b99a5f21-4128-4029-938f-6ee457b0f36d">
<rateBasedMdlGlobalDSMRateSpec type="ModelRefInfoRepo.GlobalDSMRateSpecMap" uuid="a29995d7-52f1-4edd-aaef-698a2a68529b"/>
<rateSpecOfGlobalDSMAccessedByDescExpFcnMdlMap type="ModelRefInfoRepo.GlobalDSMRateSpecMap" uuid="45b11e5f-09ce-4444-be7c-9384c8ed3d75"/>
<rootBlockDiagramInterface type="ci.Model" uuid="25370f49-f80f-4984-a40b-a7f84df8f739">
<p_RootComponentInterface type="ci.ComponentInterface" uuid="70af63cd-69ac-460e-af61-b81475e3805e">
<p_InputPorts type="ci.SignalInterface" uuid="05356a46-76c9-496b-b870-a6606a2681b4">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_InputPorts>
<p_InputPorts type="ci.SignalInterface" uuid="6a5be651-5127-4b00-b1fe-7f037b420f72">
<p_InputPorts type="ci.SignalInterface" uuid="65b4f285-1e30-435e-93ab-dd78ef98157e">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_InputPorts>
<p_InputPorts type="ci.SignalInterface" uuid="8786dad2-1d32-4804-bb88-db269c473b9e">
<p_InputPorts type="ci.SignalInterface" uuid="7af0a6c1-c38b-47c3-b02a-8930848add94">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_InputPorts>
<p_InputPorts type="ci.SignalInterface" uuid="5b5c02c6-c37a-4d51-8f0e-5bf15e0a817d">
<p_InputPorts type="ci.SignalInterface" uuid="6840ec21-0ff0-4091-9e69-78eafc35d6f5">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_InputPorts>
<p_InputPorts type="ci.SignalInterface" uuid="1f3758be-eeec-4263-8ac9-55386a85f6f2">
<p_InputPorts type="ci.SignalInterface" uuid="11187d0c-88fb-4a76-b6c1-8ae6af93ec59">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_InputPorts>
<p_Name>FSMTreppe</p_Name>
<p_OutputPorts type="ci.SignalInterface" uuid="b7ae01fb-67a8-499e-8dfb-a34ae83e9536">
<p_OutputPorts type="ci.SignalInterface" uuid="a983c36b-3a44-48e2-95a5-3cf9884f8810">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_OutputPorts>
<p_OutputPorts type="ci.SignalInterface" uuid="3ba52f46-b991-4ffc-bbc2-dabf9138da2f">
<p_OutputPorts type="ci.SignalInterface" uuid="f099e52b-3f98-4f3d-9a53-e5f41ee8bd93">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
<p_ComputedSymbolicDimensions>inherit</p_ComputedSymbolicDimensions>
<p_ComputedType>uint32</p_ComputedType>
</p_OutputPorts>
<p_OutputPorts type="ci.SignalInterface" uuid="2c8a0fdf-a813-4a6c-90ed-616b12e0372f">
<p_OutputPorts type="ci.SignalInterface" uuid="21fb1cab-f5bf-4b33-8280-97ca7bd77920">
<p_ComputedNumericDimensions>1.0</p_ComputedNumericDimensions>
<p_ComputedSampleTime>.01</p_ComputedSampleTime>
<p_ComputedSampleTime>0.0</p_ComputedSampleTime>
@ -340,22 +341,22 @@
<p_Type>ROOT</p_Type>
</p_RootComponentInterface>
</rootBlockDiagramInterface>
<simulinkFunctions type="ModelRefInfoRepo.SimulinkFunctions" uuid="51f47d31-bf69-45c2-9925-aa1697244457">
<simulinkFunctions type="ModelRefInfoRepo.SimulinkFunctions" uuid="d5f398f3-db0d-4011-8e70-b49ab7ad1d2e">
<compSimulinkFunctionCatalog></compSimulinkFunctionCatalog>
</simulinkFunctions>
<stateWriterToOwnerMap type="ModelRefInfoRepo.StateWriterInfo" uuid="a88190c0-15f9-4e52-a6ab-81ddfb811279"/>
<stoClientDataRegistry type="sto.ClientDataRegistry" uuid="2c8ac090-591a-44b7-9b7a-a7ac062c172d">
<dataSets type="sto.ClientClockNamedDataSet" uuid="5b0a4d1d-030d-4f88-9e9e-3e12190e42db">
<stateWriterToOwnerMap type="ModelRefInfoRepo.StateWriterInfo" uuid="bd389837-c442-4b09-904b-968bdf13ec78"/>
<stoClientDataRegistry type="sto.ClientDataRegistry" uuid="b745f9d4-b391-4ce6-8b3b-ddfa4c1c3048">
<dataSets type="sto.ClientClockNamedDataSet" uuid="295512be-0378-4fde-8696-c3318b490c08">
<tag>sltpEvents</tag>
</dataSets>
<dataSets type="sto.ClientTaskHierarchyElementNamedDataSet" uuid="2d7a8ed4-f0bd-4eab-b498-23b0dbedc489">
<dataSets type="sto.ClientTaskHierarchyElementNamedDataSet" uuid="aee088fb-049d-4150-9f5f-88ba57760916">
<tag>sltpTaskGroups</tag>
</dataSets>
<dataSets type="sto.ClientTaskHierarchyElementNamedDataSet" uuid="c135ba12-cf4d-4052-8821-1c8c3030ce09">
<dSet type="ModelRefInfoRepo.SltpTaskData" uuid="d63284be-885e-4fb9-8db1-d89efe1107d9"/>
<tSet type="ModelRefInfoRepo.SltpTaskData" uuid="d63284be-885e-4fb9-8db1-d89efe1107d9">
<dataSets type="sto.ClientTaskHierarchyElementNamedDataSet" uuid="26bbddc2-d033-4b56-bd42-4ebc47367e3f">
<dSet type="ModelRefInfoRepo.SltpTaskData" uuid="e04174da-4467-4c63-a2fe-3974591c9c06"/>
<tSet type="ModelRefInfoRepo.SltpTaskData" uuid="e04174da-4467-4c63-a2fe-3974591c9c06">
<dataName>D1</dataName>
<linkedSet type="sto.ClientTaskHierarchyElementNamedDataSet" uuid="c135ba12-cf4d-4052-8821-1c8c3030ce09"/>
<linkedSet type="sto.ClientTaskHierarchyElementNamedDataSet" uuid="26bbddc2-d033-4b56-bd42-4ebc47367e3f"/>
<id type="sto.TaskHierarchyElementId">
<id>_task0</id>
</id>
@ -363,6 +364,6 @@
<tag>sltpTasks</tag>
</dataSets>
</stoClientDataRegistry>
<varTsUIDMap type="ModelRefInfoRepo.VarTsUIDMap" uuid="f0b6a5ce-69cc-4e9c-87e1-435ad3c8bcb8"/>
<varTsUIDMap type="ModelRefInfoRepo.VarTsUIDMap" uuid="5509c4d8-513d-44e6-94d3-3b9fa42f55f1"/>
</ModelRefInfoRepo.ModelRefInfoRoot>
</MF0>

BIN
lib/treppe/MatLabSrc/slprj/ert/FSMTreppe/tmwinternal/binfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/ert/FSMTreppe/tmwinternal/minfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/ert/FSMTreppe/tmwinternal/scv
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/ert/FSM_Treppenlicht/tmwinternal/sinfo.mat
View File

Binary file not shown.

BIN
lib/treppe/MatLabSrc/slprj/ert/_sharedutils/shared_file.dmr
View File

Binary file not shown.

37
lib/treppe/treppe.cpp
View File

@ -82,6 +82,10 @@ void Treppe::start_animation(dimmer_t *dimmer, bool dim_type, uint16_t on_pwm,
dimmer->tick = 0;
dimmer->pwm = dimmer->start_pwm;
#ifndef LDR_REGELUNG
idle_pwm_ist = param.idle_pwm_max;
#endif
Serial.printf("stufe %d, ticks %d, delta %f, start %d, ziel %d\n",
dimmer->stufe, dimmer->ticks, dimmer->delta_pwm,
dimmer->start_pwm, dimmer->ziel_pwm);
@ -201,7 +205,6 @@ void Treppe::sample_ldr() {
if(check_ldr(ldr_avg)) {
update_soll_pwm_with_ldr(ldr_avg);
}
ldr_average = 0.0;
ldr_average_cnt = 0;
}
@ -214,6 +217,8 @@ void Treppe::update_soll_pwm_with_ldr(float ldr_avg) {
---- = ------------
ist ldr_schwelle
*/
#ifdef LDR_REGELUNG
if(ldr_avg >= param.ldr_schwelle) {
return;
}
@ -221,7 +226,8 @@ void Treppe::update_soll_pwm_with_ldr(float ldr_avg) {
Serial.printf("Update idle_pwm_soll_with_ldr: %d\n", idle_pwm_soll);
if(idle_pwm_ist != idle_pwm_soll)
fsm_pend.ldr_changed = true;
fsm_inputs.ldr_changed = true;
#endif
}
bool Treppe::check_ldr(float ldr_avg) {
@ -243,6 +249,7 @@ void Treppe::task() {
#endif
sample_ldr();
#ifdef DEBUG_TIMING
Serial.print("1:");
Serial.println(micros() - m);
@ -283,22 +290,32 @@ void Treppe::task() {
fsm_outputs.status == ST_ABDIMMEN_HOCH ||
fsm_outputs.status == ST_AUFDIMMEN_RUNTER ||
fsm_outputs.status == ST_ABDIMMEN_RUNTER) {
if (fsm_pend.anim_beendet)
if (fsm_pend.anim_beendet) {
start_animation(&dimmer_stufen, DIM_STUFEN, param.active_pwm,
idle_pwm_ist);
else
}
else {
fsm_pend.anim_beendet = dimmer_tick(&dimmer_stufen, DIM_STUFEN);
} else if (fsm_outputs.status == ST_AUFDIMMEN_LDR ||
}
}
else if (fsm_outputs.status == ST_AUFDIMMEN_LDR ||
fsm_outputs.status == ST_ABDIMMEN_LDR) {
if (fsm_pend.anim_beendet) {
#ifdef LDR_REGELUNG
start_animation(&dimmer_ldr, DIM_LDR, idle_pwm_soll, 0);
idle_pwm_ist = idle_pwm_soll;
#else
start_animation(&dimmer_ldr, DIM_LDR, idle_pwm_ist, 0);
#endif
}
else
fsm_pend.anim_beendet = dimmer_tick(&dimmer_ldr, DIM_LDR);
} else if (fsm_outputs.status == ST_RUHEZUSTAND) {
if (fsm_pend.ldr_changed) {
fsm_pend.ldr_changed = false;
}
else if(fsm_outputs.status == ST_LDR_CHANGED) {
fsm_inputs.ldr_changed = false;
#ifdef LDR_REGELUNG
if (fsm_pend.anim_beendet) {
if(idle_pwm_soll < idle_pwm_ist) {
fsm_outputs.dimmrichtung = DR_ABDIMMEN;
start_animation(&dimmer_ldr, DIM_LDR, idle_pwm_ist, idle_pwm_soll);
@ -309,9 +326,10 @@ void Treppe::task() {
}
idle_pwm_ist = idle_pwm_soll;
}
if (!fsm_pend.anim_beendet) {
else {
fsm_pend.anim_beendet = dimmer_tick(&dimmer_ldr, DIM_LDR);
}
#endif
}
if (fsm_outputs.status == ST_RUHEZUSTAND ||
@ -343,6 +361,7 @@ void Treppe::setup() {
// WARNING: before getting Parameters of Flash, make sure plausible parameters
// are written in flash!
EEPROM.get(EEP_START_ADDR, param); // get Parameters of flash
param_pend = param;
pinMode(13, OUTPUT);
pinMode(0, OUTPUT);

8
lib/treppe/treppe.h
View File

@ -1,11 +1,12 @@
#ifndef __TREPPE_H
#define __TREPPE_H
#include "FSMTreppe3/FSMTreppe3.h"
#include "FSMTreppe4/FSMTreppe4.h"
#include "PCA9685.h"
#include <EEPROM.h>
// #define LDRDEBUG // comment in to override LDR measurement
// #define LDR_REGELUNG // comment in to activate LDR control
// #define LDRDEBUG // comment in to show LDR measurement
#define LDR_HYS 100 // Hysteresis for switching off FSM [lux]
#define LDR_AVERAGE_SAMPLES 50
@ -81,7 +82,8 @@ private:
ST_ABDIMMEN_HOCH = 6,
ST_AUFDIMMEN_RUNTER = 7,
ST_WARTEN_RUNTER = 8,
ST_ABDIMMEN_RUNTER = 9
ST_ABDIMMEN_RUNTER = 9,
ST_LDR_CHANGED = 10
};
enum fsm_laufrichtung_t { LR_RUNTER = 0, LR_HOCH = 1 };
enum fsm_dimmrichtung_t { DR_ABDIMMEN = 0, DR_AUFDIMMEN = 1 };