overworked the serial responses. Quite difficult, since many texts are Pronterface...

diff --git a/Marlin/EEPROMwrite.h b/Marlin/EEPROMwrite.h
index ea843344f4fcb775b35413e9e9099930e1edbb7f..dba2d443e5e259bc6ffba58defea6f57ce4c8222 100644 (file)
--- a/Marlin/EEPROMwrite.h
+++ b/Marlin/EEPROMwrite.h
@@ -59,7 +59,7 @@ void StoreSettings() {
   char ver2[4]=EEPROM_VERSION;
   i=EEPROM_OFFSET;
   EEPROM_writeAnything(i,ver2); // validate data
-   ECHOLN("Settings Stored");
+   SERIAL_ECHOLN("Settings Stored");
 
 }
 
@@ -68,7 +68,7 @@ void RetrieveSettings(bool def=false){  // if def=true, the default values will
   char stored_ver[4];
   char ver[4]=EEPROM_VERSION;
   EEPROM_readAnything(i,stored_ver); //read stored version
-//  ECHOLN("Version: [" << ver << "] Stored version: [" << stored_ver << "]");
+//  SERIAL_ECHOLN("Version: [" << ver << "] Stored version: [" << stored_ver << "]");
   if ((!def)&&(strncmp(ver,stored_ver,3)==0)) {   // version number match
       EEPROM_readAnything(i,axis_steps_per_unit);  
       EEPROM_readAnything(i,max_feedrate);  
@@ -87,7 +87,7 @@ void RetrieveSettings(bool def=false){  // if def=true, the default values will
       EEPROM_readAnything(i,Ki);
       EEPROM_readAnything(i,Kd);
 
-      ECHOLN("Stored settings retreived:");
+      SERIAL_ECHOLN("Stored settings retreived:");
   }
   else {
     float tmp1[]=DEFAULT_AXIS_STEPS_PER_UNIT;
@@ -105,21 +105,21 @@ void RetrieveSettings(bool def=false){  // if def=true, the default values will
     mintravelfeedrate=DEFAULT_MINTRAVELFEEDRATE;
     max_xy_jerk=DEFAULT_XYJERK;
     max_z_jerk=DEFAULT_ZJERK;
-    ECHOLN("Using Default settings:");
+    SERIAL_ECHOLN("Using Default settings:");
   }
-  ECHOLN("Steps per unit:");
-  ECHOLN("   M92 X"   <<_FLOAT(axis_steps_per_unit[0],3) << " Y" <<  _FLOAT(axis_steps_per_unit[1],3) << " Z" << _FLOAT(axis_steps_per_unit[2],3) << " E" << _FLOAT(axis_steps_per_unit[3],3));
-  ECHOLN("Maximum feedrates (mm/s):");
-  ECHOLN("   M203 X"  <<_FLOAT(max_feedrate[0]/60,2)<<" Y" << _FLOAT(max_feedrate[1]/60,2) << " Z" << _FLOAT(max_feedrate[2]/60,2) << " E" << _FLOAT(max_feedrate[3]/60,2));
-  ECHOLN("Maximum Acceleration (mm/s2):");
-  ECHOLN("   M201 X"  <<_FLOAT(max_acceleration_units_per_sq_second[0],0) << " Y" << _FLOAT(max_acceleration_units_per_sq_second[1],0) << " Z" << _FLOAT(max_acceleration_units_per_sq_second[2],0) << " E" << _FLOAT(max_acceleration_units_per_sq_second[3],0));
-  ECHOLN("Acceleration: S=acceleration, T=retract acceleration");
-  ECHOLN("   M204 S"  <<_FLOAT(acceleration,2) << " T" << _FLOAT(retract_acceleration,2));
-  ECHOLN("Advanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum xY jerk (mm/s),  Z=maximum Z jerk (mm/s)");
-  ECHOLN("   M205 S"  <<_FLOAT(minimumfeedrate/60,2) << " T" << _FLOAT(mintravelfeedrate/60,2) << " B" << _FLOAT(minsegmenttime,2) << " X" << _FLOAT(max_xy_jerk/60,2) << " Z" << _FLOAT(max_z_jerk/60,2));
+  SERIAL_ECHOLN("Steps per unit:");
+  SERIAL_ECHOLN("   M92 X"   <<_FLOAT(axis_steps_per_unit[0],3) << " Y" <<  _FLOAT(axis_steps_per_unit[1],3) << " Z" << _FLOAT(axis_steps_per_unit[2],3) << " E" << _FLOAT(axis_steps_per_unit[3],3));
+  SERIAL_ECHOLN("Maximum feedrates (mm/s):");
+  SERIAL_ECHOLN("   M203 X"  <<_FLOAT(max_feedrate[0]/60,2)<<" Y" << _FLOAT(max_feedrate[1]/60,2) << " Z" << _FLOAT(max_feedrate[2]/60,2) << " E" << _FLOAT(max_feedrate[3]/60,2));
+  SERIAL_ECHOLN("Maximum Acceleration (mm/s2):");
+  SERIAL_ECHOLN("   M201 X"  <<_FLOAT(max_acceleration_units_per_sq_second[0],0) << " Y" << _FLOAT(max_acceleration_units_per_sq_second[1],0) << " Z" << _FLOAT(max_acceleration_units_per_sq_second[2],0) << " E" << _FLOAT(max_acceleration_units_per_sq_second[3],0));
+  SERIAL_ECHOLN("Acceleration: S=acceleration, T=retract acceleration");
+  SERIAL_ECHOLN("   M204 S"  <<_FLOAT(acceleration,2) << " T" << _FLOAT(retract_acceleration,2));
+  SERIAL_ECHOLN("Advanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum xY jerk (mm/s),  Z=maximum Z jerk (mm/s)");
+  SERIAL_ECHOLN("   M205 S"  <<_FLOAT(minimumfeedrate/60,2) << " T" << _FLOAT(mintravelfeedrate/60,2) << " B" << _FLOAT(minsegmenttime,2) << " X" << _FLOAT(max_xy_jerk/60,2) << " Z" << _FLOAT(max_z_jerk/60,2));
 #ifdef PIDTEMP
-  ECHOLN("PID settings:");
-  ECHOLN("   M301 P"  << _FLOAT(Kp,3) << " I" << _FLOAT(Ki,3) << " D" << _FLOAT(Kd,3));  
+  SERIAL_ECHOLN("PID settings:");
+  SERIAL_ECHOLN("   M301 P"  << _FLOAT(Kp,3) << " I" << _FLOAT(Ki,3) << " D" << _FLOAT(Kd,3));  
 #endif
   
 }  

diff --git a/Marlin/Makefile b/Marlin/Makefile
index f456e3cbd4f3cdbb0348811eb62e98f8cc3caa4f..0504319f727e4762a220aa08a68b7344e90c0f34 100644 (file)
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -14,6 +14,7 @@ UPLOAD_SPEED = 115200
 UPLOAD_PROTOCOL = stk500v2
 BUILD_MCU = atmega2560
 BUILD_F_CPU = 16000000L
+TERM=bash
 
 # getting undefined reference to `__cxa_pure_virtual'
 #~ [http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1254180518 Arduino Forum - Makefile]

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index e56b67128ec90d656f45c31e9ec2cf374c1ee748..06f701d034c8e50196ff8febf291c82048d87652 100644 (file)
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -6,9 +6,11 @@
 #include <WProgram.h>
 #include "fastio.h"
 
-
-#define ECHO(x) Serial << "echo: " << x;
-#define ECHOLN(x) Serial << "echo: "<<x<<endl;
+#include "streaming.h"
+#define SERIAL_ECHO(x) Serial << "echo: " << x;
+#define SERIAL_ECHOLN(x) Serial << "echo: "<<x<<endl;
+#define SERIAL_ERROR(x) Serial << "echo: ERROR: " << x;
+#define SERIAL_ERRORLN(x) Serial << "echo: ERROR: " << x<<endl;
 
 void get_command();
 void process_commands();
@@ -67,7 +69,7 @@ void kill();
 //void plan_set_position(float x, float y, float z, float e);
 //void st_wake_up();
 //void st_synchronize();
-void enquecommand(const char *cmd);
+void enquecommand(const char *cmd); //put an ascii command at the end of the current buffer.
 
 
 #ifndef CRITICAL_SECTION_START

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 1c79af6cadb869abcdd37c6d9af9352de464b2b6..b449bb069236c9c0b4b2d5aab506cdee049f5383 100644 (file)
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -82,6 +82,7 @@ char version_string[] = "1.0.0 Alpha 1";
 // M27  - Report SD print status
 // M28  - Start SD write (M28 filename.g)
 // M29  - Stop SD write
+// M30  - Output time since last M109 or SD card start to serial
 // M42  - Change pin status via gcode
 // M80  - Turn on Power Supply
 // M81  - Turn off Power Supply
@@ -172,24 +173,30 @@ bool savetosd = false;
 int16_t n;
 unsigned long autostart_atmillis=0;
 
-void initsd(){
+void initsd()
+{
   sdactive = false;
 #if SDSS >- 1
   if(root.isOpen())
     root.close();
-  if (!card.init(SPI_FULL_SPEED,SDSS)){
+  if (!card.init(SPI_FULL_SPEED,SDSS))
+  {
     //if (!card.init(SPI_HALF_SPEED,SDSS))
-    Serial.println("SD init fail");
+    SERIAL_ECHOLN("SD init fail");
   }
   else if (!volume.init(&card))
-    Serial.println("volume.init failed");
+  {
+    SERIAL_ERRORLN("volume.init failed");
+  }
   else if (!root.openRoot(&volume)) 
-    Serial.println("openRoot failed");
+  {
+    SERIAL_ERRORLN("openRoot failed");
+  }
   else 
-       {
+  {
     sdactive = true;
-               Serial.println("SD card ok");
-       }
+    SERIAL_ECHOLN("SD card ok");
+  }
 #endif //SDSS
 }
 
@@ -214,7 +221,7 @@ inline void write_command(char *buf){
   //Serial.println(begin);
   file.write(begin);
   if (file.writeError){
-    Serial.println("error writing to file");
+    SERIAL_ERRORLN("error writing to file");
   }
 }
 #endif //SDSUPPORT
@@ -227,7 +234,7 @@ void enquecommand(const char *cmd)
   {
     //this is dangerous if a mixing of serial and this happsens
     strcpy(&(cmdbuffer[bufindw][0]),cmd);
-    Serial.print("en:");Serial.println(cmdbuffer[bufindw]);
+    SERIAL_ECHOLN("enqueing \""<<cmdbuffer[bufindw]<<"\"");
     bufindw= (bufindw + 1)%BUFSIZE;
     buflen += 1;
   }
@@ -237,7 +244,7 @@ void setup()
 { 
        
   Serial.begin(BAUDRATE);
-  ECHOLN("Marlin "<<version_string);
+  SERIAL_ECHOLN("Marlin "<<version_string);
   Serial.println("start");
 #if defined FANCY_LCD || defined SIMPLE_LCD
   lcd_init();
@@ -478,17 +485,17 @@ inline void get_command()
       sdpos = file.curPosition();
       if(sdpos >= filesize){
         sdmode = false;
-        Serial.println("Done printing file");
-                               stoptime=millis();
-                               char time[30];
-                               unsigned long t=(stoptime-starttime)/1000;
-                               int sec,min;
-                               min=t/60;
-                               sec=t%60;
-                               sprintf(time,"%i min, %i sec",min,sec);
-                               Serial.println(time);
-                               LCD_MESSAGE(time);
-                               checkautostart(true);
+        Serial.println("echo: Done printing file");
+       stoptime=millis();
+       char time[30];
+       unsigned long t=(stoptime-starttime)/1000;
+       int sec,min;
+       min=t/60;
+       sec=t%60;
+       sprintf(time,"echo: %i min, %i sec",min,sec);
+       Serial.println(time);
+       LCD_MESSAGE(time);
+       checkautostart(true);
       }
       if(!serial_count) return; //if empty line
       cmdbuffer[bufindw][serial_count] = 0; //terminate string
@@ -721,7 +728,7 @@ inline void process_commands()
     case 24: //M24 - Start SD print
       if(sdactive){
         sdmode = true;
-                               starttime=millis();
+       starttime=millis();
       }
       break;
     case 25: //M25 - Pause SD print
@@ -774,19 +781,19 @@ inline void process_commands()
       //processed in write to file routine above
       //savetosd = false;
       break;
-               case 30:
-               {
-                       stoptime=millis();
-                               char time[30];
-                               unsigned long t=(stoptime-starttime)/1000;
-                               int sec,min;
-                               min=t/60;
-                               sec=t%60;
-                               sprintf(time,"%i min, %i sec",min,sec);
-                               Serial.println(time);
-                               LCD_MESSAGE(time);
-                }
-                                break;
+    case 30: //M30 take time since the start of the SD print or an M109 command
+    {
+      stoptime=millis();
+      char time[30];
+      unsigned long t=(stoptime-starttime)/1000;
+      int sec,min;
+      min=t/60;
+      sec=t%60;
+      sprintf(time,"echo: time needed %i min, %i sec",min,sec);
+      Serial.println(time);
+      LCD_MESSAGE(time);
+    }
+    break;
 #endif //SDSUPPORT
       case 42: //M42 -Change pin status via gcode
         if (code_seen('S'))
@@ -847,7 +854,7 @@ inline void process_commands()
             Serial.println();
           #endif
         #else
-          Serial.println("No thermistors - no temp");
+          Serial.println("echo: No thermistors - no temp");
         #endif
         return;
         //break;
@@ -888,7 +895,8 @@ inline void process_commands()
               }
               #endif //TEMP_RESIDENCY_TIME
             }
-            LCD_MESSAGE("Marlin ready.");
+            LCD_MESSAGE("Heating done.");
+           starttime=millis();
           }
           break;
       case 190: // M190 - Wait bed for heater to reach target.
@@ -1063,9 +1071,9 @@ inline void process_commands()
       if(code_seen('P')) Kp = code_value();
       if(code_seen('I')) Ki = code_value()*PID_dT;
       if(code_seen('D')) Kd = code_value()/PID_dT;
-//      ECHOLN("Kp "<<_FLOAT(Kp,2));
-//      ECHOLN("Ki "<<_FLOAT(Ki/PID_dT,2));
-//      ECHOLN("Kd "<<_FLOAT(Kd*PID_dT,2));
+//      SERIAL_ECHOLN("Kp "<<_FLOAT(Kp,2));
+//      SERIAL_ECHOLN("Ki "<<_FLOAT(Ki/PID_dT,2));
+//      SERIAL_ECHOLN("Kd "<<_FLOAT(Kd*PID_dT,2));
 
 //      temp_iState_min = 0.0;
 //      if (Ki!=0) {
@@ -1093,8 +1101,9 @@ inline void process_commands()
     }
   }
   else{
-    Serial.println("Unknown command:");
-    Serial.println(cmdbuffer[bufindr]);
+    Serial.print("echo: Unknown command:\"");
+    Serial.print(cmdbuffer[bufindr]);
+    Serial.println("\"");
   }
 
   ClearToSend();
@@ -1288,7 +1297,7 @@ void kill()
   disable_e();
   
   if(PS_ON_PIN > -1) pinMode(PS_ON_PIN,INPUT);
-  Serial.println("!! Printer halted. kill() called !!");
+  SERIAL_ERRORLN("Printer halted. kill() called !!");
   while(1); // Wait for reset
 }
 

diff --git a/Marlin/motion_control.cpp b/Marlin/motion_control.cpp
index 875531fb787d1349cbe68a15f91178a263d45177..0b734de4ab1bc6872582366f750d625f966d3914 100644 (file)
--- a/Marlin/motion_control.cpp
+++ b/Marlin/motion_control.cpp
@@ -35,7 +35,7 @@ void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8
 {      
 //   int acceleration_manager_was_enabled = plan_is_acceleration_manager_enabled();
 //   plan_set_acceleration_manager_enabled(false); // disable acceleration management for the duration of the arc
-  Serial.println("mc_arc");
+  SERIAL_ECHOLN("mc_arc.");
   float center_axis0 = position[axis_0] + offset[axis_0];
   float center_axis1 = position[axis_1] + offset[axis_1];
   float linear_travel = target[axis_linear] - position[axis_linear];

diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
index f4bd1289e001e51946ae5499c6e8188d0b62d559..9e5db44a829ef83206e65d0a01fc0b1445a98b2a 100644 (file)
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@ -211,7 +211,7 @@ inline void trapezoid_generator_reset() {
 // It pops blocks from the block_buffer and executes them by pulsing the stepper pins appropriately. \r
 ISR(TIMER1_COMPA_vect)\r
 {        \r
-  if(busy){ Serial.print(*(unsigned short *)OCR1A); Serial.println(" BUSY");\r
+  if(busy){ SERIAL_ERRORLN(*(unsigned short *)OCR1A<< " ISR overtaking itself.");\r
     return; \r
   } // The busy-flag is used to avoid reentering this interrupt\r
 \r

diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 14530ca3f6f2480022dcb6756a6b78a849b1fe6c..6971739242cc3ae0da6973d5b11bf916c46baafe 100644 (file)
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -142,17 +142,8 @@ CRITICAL_SECTION_END;
     }\r
 #endif //PID_OPENLOOP\r
 #ifdef PID_DEBUG\r
-     Serial.print(" Input ");\r
-     Serial.print(pid_input);\r
-     Serial.print(" Output ");\r
-     Serial.print(pid_output);    \r
-     Serial.print(" pTerm ");\r
-     Serial.print(pTerm); \r
-     Serial.print(" iTerm ");\r
-     Serial.print(iTerm); \r
-     Serial.print(" dTerm ");\r
-     Serial.print(dTerm); \r
-     Serial.println();\r
+     SERIAL_ECHOLN(" PIDDEBUG Input "<<pid_input<<" Output "<<pid_output" pTerm "<<pTerm<<" iTerm "<<iTerm<<" dTerm "<<dTerm); \r
+     \r
 #endif //PID_DEBUG\r
     analogWrite(HEATER_0_PIN, pid_output);\r
 #endif //PIDTEMP\r
@@ -452,7 +443,7 @@ ISR(TIMER0_COMPB_vect)
             temp_count++;\r
             break;\r
     default:\r
-            Serial.println("!! Temp measurement error !!");\r
+            SERIAL_ERRORLN("Temp measurement error!");\r
             break;\r
   }\r
     \r
@@ -486,7 +477,7 @@ ISR(TIMER0_COMPB_vect)
     if(current_raw[TEMPSENSOR_HOTEND_0] >= maxttemp_0) {\r
       target_raw[TEMPSENSOR_HOTEND_0] = 0;\r
       analogWrite(HEATER_0_PIN, 0);\r
-      Serial.println("!! Temperature extruder 0 switched off. MAXTEMP triggered !!");\r
+      SERIAL_ERRORLN("Temperature extruder 0 switched off. MAXTEMP triggered !!");\r
       kill();\r
     }\r
   #endif\r
@@ -497,7 +488,7 @@ ISR(TIMER0_COMPB_vect)
       target_raw[TEMPSENSOR_HOTEND_1] = 0;\r
     if(current_raw[2] >= maxttemp_1) {\r
       analogWrite(HEATER_2_PIN, 0);\r
-      Serial.println("!! Temperature extruder 1 switched off. MAXTEMP triggered !!");\r
+      SERIAL_ERRORLN("Temperature extruder 1 switched off. MAXTEMP triggered !!");\r
       kill()\r
     }\r
   #endif\r
@@ -507,7 +498,7 @@ ISR(TIMER0_COMPB_vect)
     if(current_raw[TEMPSENSOR_HOTEND_0] <= minttemp_0) {\r
       target_raw[TEMPSENSOR_HOTEND_0] = 0;\r
       analogWrite(HEATER_0_PIN, 0);\r
-      Serial.println("!! Temperature extruder 0 switched off. MINTEMP triggered !!");\r
+      SERIAL_ERRORLN("Temperature extruder 0 switched off. MINTEMP triggered !!");\r
       kill();\r
     }\r
   #endif\r
@@ -517,7 +508,7 @@ ISR(TIMER0_COMPB_vect)
     if(current_raw[TEMPSENSOR_HOTEND_1] <= minttemp_1) {\r
       target_raw[TEMPSENSOR_HOTEND_1] = 0;\r
       analogWrite(HEATER_2_PIN, 0);\r
-      Serial.println("!! Temperature extruder 1 switched off. MINTEMP triggered !!");\r
+      SERIAL_ERRORLN("Temperature extruder 1 switched off. MINTEMP triggered !!");\r
       kill();\r
     }\r
   #endif\r
@@ -527,7 +518,7 @@ ISR(TIMER0_COMPB_vect)
     if(current_raw[1] <= bed_minttemp) {\r
       target_raw[1] = 0;\r
       WRITE(HEATER_1_PIN, 0);\r
-      Serial.println("!! Temperatur heated bed switched off. MINTEMP triggered !!");\r
+      SERIAL_ERRORLN("Temperatur heated bed switched off. MINTEMP triggered !!");\r
       kill();\r
     }\r
   #endif\r
@@ -537,7 +528,7 @@ ISR(TIMER0_COMPB_vect)
     if(current_raw[1] >= bed_maxttemp) {\r
       target_raw[1] = 0;\r
       WRITE(HEATER_1_PIN, 0);\r
-      Serial.println("!! Temperature heated bed switched off. MAXTEMP triggered !!");\r
+      SERIAL_ERRORLN("Temperature heated bed switched off. MAXTEMP triggered !!");\r
       kill();\r
     }\r
   #endif\r

diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index 444020c228b8441069c9dfeae47d1744eeb4d4ef..bd256100ab4c9709214b6c4f4cd3cec260011e65 100644 (file)
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -1382,7 +1382,7 @@ void MainMenu::showMainMenu()
       }break;\r
 #endif\r
       default: \r
-        Serial.println('NEVER say never');\r
+        SERIAL_ERRORLN("Something is wrong in the MenuStructure.");\r
       break;\r
     }\r
   }\r
@@ -1414,7 +1414,7 @@ void MainMenu::update()
   {\r
     force_lcd_update=true;\r
     oldcardstatus=CARDINSERTED;\r
-    //Serial.println("SD CHANGE");\r
+    //Serial.println("echo: SD CHANGE");\r
     if(CARDINSERTED)\r
     {\r
       initsd();\r

diff --git a/Marlin/watchdog.pde b/Marlin/watchdog.pde
index 4c677e79e3782cbbdd705c11d0338299190d5370..09d881d1d0ecd34fdac356bb447cfe04e7e88c2e 100644 (file)
--- a/Marlin/watchdog.pde
+++ b/Marlin/watchdog.pde
@@ -15,7 +15,7 @@ ISR(WDT_vect)
  
     #ifdef RESET_MANUAL
       LCD_MESSAGE("Please Reset!");
-      ECHOLN("echo_: Something is wrong, please turn off the printer.");
+      SERIAL_ERRORLN("Something is wrong, please turn off the printer.");
     #else
       LCD_MESSAGE("Timeout, resetting!");
     #endif