Uppercase status strings, Don't enable read interrupt immediately in usart_readline...

diff --git a/src/machine.c b/src/machine.c
index 22410bdbfe556525995a63b9b8f6fdbe0f135443..aaff4f7343612168189848bbdcdae8adce179855 100644 (file)
--- a/src/machine.c
+++ b/src/machine.c
@@ -208,9 +208,9 @@ float mach_get_feed_rate() {return mach.gm.feed_rate;}
 
 PGM_P mp_get_units_mode_pgmstr(machUnitsMode_t mode) {
   switch (mode) {
-  case INCHES:      return PSTR("in");
-  case MILLIMETERS: return PSTR("mm");
-  case DEGREES:     return PSTR("deg");
+  case INCHES:      return PSTR("IN");
+  case MILLIMETERS: return PSTR("MM");
+  case DEGREES:     return PSTR("DEG");
   }
 
   return PSTR("invalid");
@@ -691,8 +691,7 @@ void mach_set_coord_system(machCoordSystem_t coord_system) {
  * the planner and that all motion has stopped.
  */
 void mach_set_position(int axis, float position) {
-  if (!mp_is_quiescent()) CM_ALARM(STAT_INTERNAL_ERROR);
-
+  //if (!mp_is_quiescent()) CM_ALARM(STAT_INTERNAL_ERROR);
   mach.position[axis] = position;
   mach.ms.target[axis] = position;
   mp_set_planner_position(axis, position);

diff --git a/src/plan/state.c b/src/plan/state.c
index 40c99e2b19aee2b40e7da6e17a37fdf077cd5ff9..bd160bb01ed359e98379ce1959a217568233db4a 100644 (file)
--- a/src/plan/state.c
+++ b/src/plan/state.c
@@ -60,11 +60,11 @@ plannerCycle_t mp_get_cycle() {return ps.cycle;}
 
 PGM_P mp_get_state_pgmstr(plannerState_t state) {
   switch (state) {
-  case STATE_READY:     return PSTR("ready");
-  case STATE_ESTOPPED:  return PSTR("estopped");
-  case STATE_RUNNING:   return PSTR("running");
-  case STATE_STOPPING:  return PSTR("stopping");
-  case STATE_HOLDING:   return PSTR("holding");
+  case STATE_READY:     return PSTR("READY");
+  case STATE_ESTOPPED:  return PSTR("ESTOPPED");
+  case STATE_RUNNING:   return PSTR("RUNNING");
+  case STATE_STOPPING:  return PSTR("STOPPING");
+  case STATE_HOLDING:   return PSTR("HOLDING");
   }
 
   return PSTR("invalid");
@@ -73,11 +73,11 @@ PGM_P mp_get_state_pgmstr(plannerState_t state) {
 
 PGM_P mp_get_cycle_pgmstr(plannerCycle_t cycle) {
   switch (cycle) {
-  case CYCLE_MACHINING:   return PSTR("machining");
-  case CYCLE_HOMING:      return PSTR("homing");
-  case CYCLE_PROBING:     return PSTR("probing");
-  case CYCLE_CALIBRATING: return PSTR("calibrating");
-  case CYCLE_JOGGING:     return PSTR("jogging");
+  case CYCLE_MACHINING:   return PSTR("MACHINING");
+  case CYCLE_HOMING:      return PSTR("HOMING");
+  case CYCLE_PROBING:     return PSTR("PROBING");
+  case CYCLE_CALIBRATING: return PSTR("CALIBRATING");
+  case CYCLE_JOGGING:     return PSTR("JOGGING");
   }
 
   return PSTR("invalid");

diff --git a/src/usart.c b/src/usart.c
index 7d66f635b4cb8dc2a208e96b28fa0894d92d3ede..91ecb108952dc311275a70304d50403446e59239 100644 (file)
--- a/src/usart.c
+++ b/src/usart.c
@@ -199,7 +199,8 @@ char *usart_readline() {
   bool eol = false;
 
   while (!rx_buf_empty()) {
-    char data = usart_getc();
+    char data = rx_buf_peek();
+    rx_buf_pop();
 
     if (usart_flags & USART_ECHO) usart_putc(data);
 
@@ -235,10 +236,13 @@ char *usart_readline() {
     if (eol) {
       line[i] = 0;
       i = 0;
+
+      _set_rxc_interrupt(true); // Enable read interrupt
       return line;
     }
   }
 
+  _set_rxc_interrupt(true); // Enable read interrupt
   return 0;
 }