Browse Source

Clean up code, remove _now command function

Scott Lahteine 7 years ago
parent
commit
93aad54dc1
3 changed files with 2 additions and 6 deletions
  1. 0
    1
      Marlin/Marlin.h
  2. 0
    4
      Marlin/Marlin_main.cpp
  3. 2
    1
      Marlin/UBL_G29.cpp

+ 0
- 1
Marlin/Marlin.h View File

244
 inline bool IsStopped() { return !Running; }
244
 inline bool IsStopped() { return !Running; }
245
 
245
 
246
 bool enqueue_and_echo_command(const char* cmd, bool say_ok=false); //put a single ASCII command at the end of the current buffer or return false when it is full
246
 bool enqueue_and_echo_command(const char* cmd, bool say_ok=false); //put a single ASCII command at the end of the current buffer or return false when it is full
247
-void enqueue_and_echo_command_now(const char* cmd); // enqueue now, only return when the command has been enqueued
248
 void enqueue_and_echo_commands_P(const char* cmd); //put one or many ASCII commands at the end of the current buffer, read from flash
247
 void enqueue_and_echo_commands_P(const char* cmd); //put one or many ASCII commands at the end of the current buffer, read from flash
249
 void clear_command_queue();
248
 void clear_command_queue();
250
 
249
 

+ 0
- 4
Marlin/Marlin_main.cpp View File

896
   return false;
896
   return false;
897
 }
897
 }
898
 
898
 
899
-void enqueue_and_echo_command_now(const char* cmd) {
900
-  while (!enqueue_and_echo_command(cmd)) idle();
901
-}
902
-
903
 void setup_killpin() {
899
 void setup_killpin() {
904
   #if HAS_KILL
900
   #if HAS_KILL
905
     SET_INPUT_PULLUP(KILL_PIN);
901
     SET_INPUT_PULLUP(KILL_PIN);

+ 2
- 1
Marlin/UBL_G29.cpp View File

1109
     const uint16_t k = E2END - ubl.eeprom_start;
1109
     const uint16_t k = E2END - ubl.eeprom_start;
1110
 
1110
 
1111
     SERIAL_PROTOCOLPGM("Unified Bed Leveling System Version 1.00 ");
1111
     SERIAL_PROTOCOLPGM("Unified Bed Leveling System Version 1.00 ");
1112
-    if (ubl.state.active)  
1112
+    if (ubl.state.active)
1113
       SERIAL_PROTOCOLCHAR('A');
1113
       SERIAL_PROTOCOLCHAR('A');
1114
     else
1114
     else
1115
       SERIAL_PROTOCOLPGM("In");
1115
       SERIAL_PROTOCOLPGM("In");
1363
 
1363
 
1364
       do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);    // Move the nozzle to where we are going to edit
1364
       do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);    // Move the nozzle to where we are going to edit
1365
       do_blocking_move_to_xy(LOGICAL_X_POSITION(rawx), LOGICAL_Y_POSITION(rawy));
1365
       do_blocking_move_to_xy(LOGICAL_X_POSITION(rawx), LOGICAL_Y_POSITION(rawy));
1366
+
1366
       float new_z = ubl.z_values[location.x_index][location.y_index];
1367
       float new_z = ubl.z_values[location.x_index][location.y_index];
1367
       
1368
       
1368
       round_off = (int32_t)(new_z * 1000.0);    // we chop off the last digits just to be clean. We are rounding to the
1369
       round_off = (int32_t)(new_z * 1000.0);    // we chop off the last digits just to be clean. We are rounding to the

Loading…
Cancel
Save