Diff: pulse.cpp

Revision:

33:686a1a0c690f

Parent:

32:69cd1390bc21

Child:

34:701503855d52

--- a/pulse.cpp	Tue Dec 06 20:57:56 2016 +0000
+++ b/pulse.cpp	Mon Dec 12 03:31:55 2016 +0000
@@ -98,38 +98,38 @@
 void pulse::pace_charge_shutdown() {
     /* Stage 1: Switch-OFF/Ground-ON */
     atr_pace_ctrl.write(0);
-    vent_pace_ctrl.write(0);;
-    atr_grnd_ctrl .write(1);;
-    vent_grnd_ctrl.write(myChamber->getPaceAmp());;
+    vent_pace_ctrl.write(0);
+    atr_grnd_ctrl .write(1);
+    vent_grnd_ctrl.write(1);
     wait_ms(50);
     
 
     /* Stage 2: Ref PWM LOW */
-    pacing_ref_pwm.write(0);;
+    pacing_ref_pwm.write(0);
     wait_ms(100);
 
     /* Stage 3: Charge CTRL off */
-    pace_charge_ctrl.write(0);;
+    pace_charge_ctrl.write(0);
     wait_ms(10);
     
     /* Stage 4: Ground OFF */
-    atr_grnd_ctrl .write(0);;
-    vent_grnd_ctrl.write(0);;
+    atr_grnd_ctrl .write(0);
+    vent_grnd_ctrl.write(0);
 }
 
 void pulse::vent_pace_prime() {
     /* Redundant code to close ground switches, 
      * prevents accidentally shorting the pacemaker
      */ 
-    atr_grnd_ctrl .write(0);;
-    vent_grnd_ctrl.write(0);;
+    atr_grnd_ctrl .write(0);
+    vent_grnd_ctrl.write(0);
     
     /* Stage 1: Ref PWM On */
-    pacing_ref_pwm.write(myChamber->getPaceAmp());;
+    pacing_ref_pwm.write(myChamber->getPaceAmp());
     wait_ms(10);
 
     /* Stage 2: Charge CTRL on */
-    pace_charge_ctrl.write(myChamber->getPaceAmp());;
+    pace_charge_ctrl.write(1);
     wait_ms(10);
 }
 
@@ -137,15 +137,15 @@
     /* Redundant code to close ground switches, 
      * prevents accidentally shorting the pacemaker
      */ 
-    atr_grnd_ctrl .write(0);;
-    vent_grnd_ctrl.write(0);;
+    atr_grnd_ctrl .write(0);
+    vent_grnd_ctrl.write(0);
     
     /* Stage 4: Ref PWM On */
-    pacing_ref_pwm.write(myChamber->getPaceAmp());;
+    pacing_ref_pwm.write(myChamber->getPaceAmp());
     wait_ms(10);
 
     /* Stage 5: Charge CTRL on */
-    pace_charge_ctrl.write(myChamber->getPaceAmp());;
+    pace_charge_ctrl.write(1);
     wait_ms(10);
 }
 
@@ -153,13 +153,13 @@
     vent_pace_prime();
 
     // Begin Pace Event Output
-    vent_pace_ctrl.write(myChamber->getPaceAmp());;
+    vent_pace_ctrl.write(1);
     
     // Pace Duration
-    wait(pulse_width_us);
+    Thread::wait(pulse_width_us);
     
     // Shut off Pace
-    vent_pace_ctrl.write(0);;
+    vent_pace_ctrl.write(0);
     
     pace_charge_shutdown (); 
 }
@@ -168,13 +168,13 @@
     atr_pace_prime();
 
     // Begin Pace Event Output
-    atr_pace_ctrl.write(myChamber->getPaceAmp());;
+    atr_pace_ctrl.write(myChamber->getPaceAmp());
     
     // Pace Duration
-    wait(pulse_width_us);
+    Thread::wait(pulse_width_us);
     
     // Shut off Pace
-    atr_pace_ctrl.write(0);;
+    atr_pace_ctrl.write(0);
         
     pace_charge_shutdown (); 
 }
@@ -183,11 +183,11 @@
 void pulse::startPulse(){
     pulse::pace_charge_shutdown();
     char a = myChamber->getChamberType();
-    if(a = 'a'){
+    if(a == 'a'){
         pulse::pace_vent(myChamber->getPaceWidth());
     }
     else{
         pulse::pace_vent(myChamber->getPaceWidth());
-
+    }
 }
     
\ No newline at end of file