Skip to content

Commit

Permalink
Merge branch 'master' into homing-with-pressures
Browse files Browse the repository at this point in the history
  • Loading branch information
teddyort committed Mar 28, 2020
2 parents 53c53c5 + fc2b19a commit 487f4c6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions e-vent.ino
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
enum States {DEBUG_STATE, IN_STATE, PAUSE_STATE, EX_STATE, PREHOME_STATE, HOMING_STATE, POSTHOME_STATE};

#include <LiquidCrystal.h>
#include <RoboClaw.h>
#include "Display.h"
Expand Down Expand Up @@ -43,7 +45,6 @@ float VOL_MIN = 100;
float VOL_MAX = 450; // 900; // For full

//Setup States
enum States {DEBUG_STATE, IN_STATE, PAUSE_STATE, EX_STATE, PREHOME_STATE, HOMING_STATE, POSTHOME_STATE};
States state;
bool enteringState;
unsigned long stateTimer;
Expand Down Expand Up @@ -176,7 +177,7 @@ void setup() {
void loop() {
if(DEBUG){
if(Serial.available() > 0){
setState(Serial.parseInt());
setState((States) Serial.parseInt());
while(Serial.available() > 0) Serial.read();
}
}
Expand Down

0 comments on commit 487f4c6

Please sign in to comment.