Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F_relay #13

Merged
merged 29 commits into from
Jul 1, 2023
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1f6fb0c
Sliding avg class added
Apr 8, 2023
44ac7ca
Some tuning
FredM67 Apr 28, 2023
4c69aa2
get average as same type than elements
FredM67 Apr 28, 2023
37caf6d
Merge branch 'main' into f_relay
FredM67 May 1, 2023
9dcb9cf
Add relay config class
FredM67 May 1, 2023
5975daf
Add class for relay diversion
FredM67 May 1, 2023
52f7f98
Reorganize includes
FredM67 May 1, 2023
405e9c3
More reorganization
FredM67 May 1, 2023
09a8647
Next step
FredM67 May 2, 2023
9854dd0
More code for relay diversion
FredM67 May 5, 2023
515cab7
Set some members const
FredM67 May 5, 2023
ca16002
Set limit to duration
FredM67 May 7, 2023
995b88b
Reformating
FredM67 May 13, 2023
43c3e10
Add serial output for sliding average
FredM67 May 13, 2023
a084117
Merge branch 'f_relay' of https://github.com/FredM67/PVRouter-3-phase…
FredM67 May 13, 2023
366a8d0
Some cleanup
FredM67 May 13, 2023
30c27af
Fix link
FredM67 May 13, 2023
5deae48
Fix links
FredM67 May 13, 2023
50e2413
Fix clang format
FredM67 May 13, 2023
a2ce569
Add clang script
FredM67 May 13, 2023
70955f4
Fix formatter and clang config
FredM67 May 13, 2023
7cc4966
Fix formating
FredM67 May 14, 2023
368df2c
Merge branch 'f_relay' of https://github.com/FredM67/PVRouter-3-phase…
FredM67 May 14, 2023
0acaabf
Add relay cfg during startup
FredM67 May 26, 2023
95e6994
Fix template
FredM67 May 27, 2023
9d2b4e1
Fix
FredM67 Jun 14, 2023
e356441
Fix first dataset
FredM67 Jun 14, 2023
dc1a24b
Fix formating
FredM67 Jun 14, 2023
24b867c
Merge branch 'main' into f_relay
FredM67 Jul 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Mk2_3phase_RFdatalog_temp/utils_relay.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ template< uint8_t T = 1 > class relayOutput
const uint16_t minON{ 5 * 60 }; /**< Minimum duration in seconds the relay is turned ON */
const uint16_t minOFF{ 5 * 60 }; /**< Minimum duration in seconds the relay is turned OFF */

uint16_t duration{ 0 }; /**< Duration of the current state */
bool relayState{ false }; /**< State of the relay */
uint16_t duration{ 0 }; /**< Duration of the current state */
bool relayState{ false }; /**< State of the relay */

static inline movingAvg< int16_t, T * 60 / DATALOG_PERIOD_IN_SECONDS > sliding_Average;
};
Expand Down