Team S - EDP 2 / Mbed 2 deprecated modular_signal_processing

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed

Fork of modular_signal_processing by Conor Begley

Diff: main.cpp

Revision:
5:bbfcd046cd43
Parent:
4:bfa5feb61689
Child:
6:9c5c36d2c0e1
--- a/main.cpp	Thu Feb 15 21:29:58 2018 +0000
+++ b/main.cpp	Thu Feb 15 22:04:22 2018 +0000
@@ -141,10 +141,9 @@
     return processed;
 }
 
-bool above_trig_low(float point)   //Check if data goes below low trigger
+bool below_trig_low(float point)   //Check if data goes below low trigger
 {
     if(point <= trigger_low) {
-        triggered = false;
         return true;
     }
     return false;
@@ -153,7 +152,6 @@
 bool above_trig_high(float point)   //Check if data goes above high trigger
 {
     if(point >= trigger_high) {
-        triggered = true;
         return true;
     }
     return false;
@@ -163,13 +161,16 @@
 {
     // Implementation of hysteresis
     if(triggered) {
-        if (above_trig_low(normalisedData)) {
+        if (below_trig_low(normalisedData)) {
+            triggered = false;
             pulse = 0;
         } else {
             pulse = 1;
         }
-    } else if (!triggered) {
+    } 
+    else {
         if (above_trig_high(normalisedData)) {
+            triggered = true;
             pulse = 1;
         } else {
             pulse = 0;