Skip to content

Comps: Fix missed conversion to new api #4567

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.

Sign up for GitHub

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

Closed
Sigma1912 wants to merge 1 commit into from
+22 −24
Closed

Comps: Fix missed conversion to new api #4567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions src/hal/components/momentary2nist.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pin out bool on "turn device on";
pin out bool off "turn device off";
variable unsigned debounce_cntr;
variable unsigned pulse_length;
variable bool state;
variable unsigned state;

option period no;
function _;
Expand All @@ -52,34 +52,31 @@ FUNCTION(_) {
debounce_val = 2; // set a sane value
}

if (in_val && state == 0 ) { // input has changed from debounced 0 -> 1
if (in_val && state == 0 ) {
// input has changed from 0 -> 1
debounce_cntr++;
if ( debounce_cntr >= debounce_val ) {
if (!ison_val) { // turn ON if it's off
on_set(1);
off_set(0);
} else { // turn OFF if it's on
on_set(0);
off_set(1);
}
on_set(!ison_val);
off_set(ison_val);
pulse_length = 0;
state = 1;
debounce_cntr = 0;
}
} else if (!in_val && state == 1) { // input has changed from debounced 1 -> 0
} else if (!in_val && state == 1) {
// input has changed from 1 -> 0
debounce_cntr++;
if ( debounce_cntr >= debounce_val ) {
state = 0;
debounce_cntr = 0;
}
} else if ((!ison_val && off) || (ison_val && on) || (pulse_length > max_pulse_length)) {
// reset outputs once device has switched or maximum pulse length is reached
on_set(0);
off_set(0);
} else if ( (!ison_val != off) && (ison_val != on) && (pulse_length < max_pulse_length) ) {
// Waiting for the 'ison' pin to confirm change of state
debounce_cntr = 0;
pulse_length = 0;
pulse_length ++;
} else {
on_set(0);
off_set(0);
debounce_cntr = 0;
pulse_length ++;
}
}

17 changes: 9 additions & 8 deletions src/hal/components/toggle2nist.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,34 +53,35 @@ FUNCTION(_) {
debounce_val = 2; // set a sane value
}

if (in_val && state == 0 ) { /* input has changed from debounced 0 -> 1 */
if (in_val && state == 0) { /* input has changed from 0 -> 1 */
debounce_cntr++;
if ( debounce_cntr >= debounce_val ) {
if (!ison_val) { /* turn ON if it's off */
on_set(1);
off_set(0);
pulse_length = 0;
}
state = 1;
debounce_cntr = 0;
}
} else if (!in_val && state == 1) { /* input has changed from debounced 1 -> 0 */
} else if (!in_val && state == 1) { /* input has changed from 1 -> 0 */
debounce_cntr++;
if ( debounce_cntr >= debounce_val ) {
if (ison_val) { /* turn OFF if it's on */
on_set(0);
off_set(1);
pulse_length = 0;
}
state = 0;
debounce_cntr = 0;
}
} else if ((!ison_val && off) || (ison_val && on) || (pulse_length > max_pulse_length)) {
// reset outputs once device has switched or maximum pulse length is reached
on_set(0);
off_set(0);
} else if ( (!ison_val != off) && (ison_val != on) && (pulse_length < max_pulse_length) ) {
// Waiting for the 'ison' pin to confirm change of state
debounce_cntr = 0;
pulse_length = 0;
pulse_length ++;
} else {
on_set(0);
off_set(0);
debounce_cntr = 0;
pulse_length ++;
}
}
Loading