Merge OOP Branch into main #37
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…declared symbol NO_OF_HAND_PINS, even then hand_actuation.h isn't included. need a later FIX for that.
…hanging "button pressed" method & some minor code optimization
…andActuation::ButtonState& btnState)" which decodes the result of "int check(void)"
…herstation-bim112) configuration, see also commit 870c980
…sVoltageReturn() and convertADmV(int valueAD), now the must be declared in applications code
…ion setting other then -O0
…so Isr will internally compare with AD-Values, because on the fly conversation from AD-Value to milliVoltage was to slow and could cause knx bus communcation problems
…iling of out8-bcu1 and rol-jal-bim112 !!! changed constructor HandActuation to take hand actuation configuration as parameters, so we can get rid of "extern const int handPins[NO_OF_HAND_PINS];"
…cles, removed some commented out variables
…age fail will be reported
…r (idea from out-cs-bim112), added busVoltageFailTimeMs & busVoltageReturnTimeMs to specify how long bus voltage must be below/above a threshold
…dState(..) instead, added get & set methods for delayBetweenButtonsMs_ & delayAtEndMs_
…:ADCInterruptHandler(), fixed result of BusVoltage::failed()
…r (like in out6-cs-bim112) to convert with a constant frequency, callbacks are done via a sub-class of BusVoltageCallback, moved Ise to class BusVoltage
…rted to new HandActuation constructor
… HandActuation constructor
…eturn or drop as mentioned in https://selfbus.org/forum/viewtopic.php?p=4716#p4716
…bus-voltage return or drop as mentioned in https://selfbus.org/forum/viewtopic.php?p=4716#p4716 Modified actuators/outputs/out8-bcu1/src/app_main.cpp (quick&dirty flash read/write mostly c&p from out6-cs-bim112) Modified actuators/outputs/out8-bcu1/src/app_out8.cpp (include "hand_actation.h" only if HAND_ACTUATION is set Modified actuators/outputs/out8-bcu1/src/bus_voltage.cpp (refactored isr variables) Modified actuators/outputs/out8-bcu1/src/bus_voltage.h (changed comment)
…ndler to BusVoltage::checkPeriodic
…ic settings which shall survive a power loss Added actuators/outputs/out8-bcu1/src/app_nov_settings.cpp Added actuators/outputs/out8-bcu1/src/app_nov_settings.h
…o save/restore appdata, moved some DEFS to config.h, some code clean-up
…ns,code clean-up, moved outputPins to config.h
-readonly CommObjectTableAddress 0x4400 set with bcu.begin(...)
SHT2x-Config was written to wrong memory segment Started implementing status object for outputs Fixes in knxprod, like wrong version number handling
DimEncoder is a duplicate from "in8-bcu1" and was now updated from there Additinally delete a unused variable
…HT fixes Automatically set value pointer for comobjs in RAM, do no longer depend on knxprod Ignore some more configuration errors which previously lead to a hard fault Try to detect errors reading CCS811 and reinitialize DHT skipped wait-after-measure-time if measuring failed
- changed SensorConfig::init from automatic sensor and type detection to specification by ETS parameters, otherwise init would take up to ~10s - avoid possible usage of double operations - added macro TS_ARM to switch between TS_ARM and 4TE controller pin-out
The supply voltage of RM is switched on after mounting the RM to the base plate
Fix wrong scaling...
dallmair
approved these changes
Feb 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge brings several enhancements developed over the past two years and fixes these issues:
Fixes #31
Fixes #22
Relates to #21
Relates to #13