Remove Temptone

Documentation/GCodes.md

@@ -85,7 +85,6 @@
 *  M221 Sfactor in percent- set extrude factor override percentage
 *  M240 - Trigger a camera to take a photograph
 *  M280 - Position an RC Servo Pindex Sangle/microseconds, ommit S to report back current angle
-*  M299 - Turn on/off beep sound temperature
 *  M300 - Play beepsound Sfrequency Hz Pduration ms
 *  M301 - Set PID parameters P I and D
 *  M302 - Allow cold extrudes

MarlinKimbra/Marlin.h

@@ -211,7 +211,6 @@ void prepare_move();
 void kill();
 void pause();
 void Stop();
-void temptone();
 
 bool IsStopped();
 

MarlinKimbra/Marlin_main.cpp

@@ -65,7 +65,7 @@
 #include "firmware_test.h"
 #endif
 
-#define VERSION_STRING  "4.0.2"
+#define VERSION_STRING  " 4.0.2"
 
 // look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html
 // http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
@@ -162,7 +162,6 @@
 // M240 - Trigger a camera to take a photograph
 // M250 - Set LCD contrast C<contrast value> (value 0..63)
 // M280 - set servo position absolute. P: servo index, S: angle or microseconds
-// M299 - Beep sound for temperature on/off
 // M300 - Play beep sound S<frequency Hz> P<duration ms>
 // M301 - Set PID parameters P I and D
 // M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
@@ -462,9 +461,6 @@ unsigned long starttime=0;
 unsigned long stoptime=0;
 
 static uint8_t tmp_extruder;
-static boolean beeptemponoff = true;
-static boolean beeptemphe = false;
-static boolean beeptemphb = false;
 
 #ifdef NPR2
 static float color_position[] = COLOR_STEP;  //variabile per la scelta del colore
@@ -3567,7 +3563,6 @@ Sigma_Exit:
         setTargetHotend1(code_value() == 0.0 ? 0.0 : code_value() + duplicate_extruder_temp_offset);
 #endif
       setWatch();
-      beeptemphe=true;
       break;
     case 111: // M111 - Debug mode
       if (code_seen('S')) debugLevel = code_value();
@@ -3585,7 +3580,6 @@ Sigma_Exit:
     case 140: // M140 set bed temp
       if(debugDryrun()) break;
       if (code_seen('S')) setTargetBed(code_value());
-      beeptemphb=true;
       break;
     case 105 : // M105
       if(setTargetedHotend(105)) break;
@@ -4465,11 +4459,6 @@ Sigma_Exit:
 #endif // NUM_SERVOS > 0
 
 #if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
-    case 299: // M299 turn on/off beep sound temp
-      {
-        beeptemponoff = !beeptemponoff;
-      }
-      break;
     case 300: // M300
       {
         int beepS = code_seen('S') ? code_value() : 110;
@@ -5845,10 +5834,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
     }
   }
   
-#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
-  if (beeptemponoff) temptone();
-#endif
-
   #ifdef CHDK //Check if pin should be set to LOW after M240 set it to HIGH
     if (chdkActive && (millis() - chdkHigh > CHDK_DELAY))
     {
@@ -5970,50 +5955,6 @@ void kill()
   while(1) { /* Intentionally left empty */ } // Wait for reset
 }
 
-#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
-void temptone()
-{
-  if (!isHeatingHotend(active_extruder) && degTargetHotend(active_extruder)!=0 && beeptemphe) {
-    int beepS = 200;
-    int beepP = 500;
-    int beepN = 3;
-    for (int i = 0; i < beepN; ++i)
-    {
-#if BEEPER > 0
-      tone(BEEPER, beepS);
-      delay(beepP);
-      noTone(BEEPER);
-#elif defined(ULTRALCD)
-      lcd_buzz(beepS, beepP);
-#elif defined(LCD_USE_I2C_BUZZER)
-      lcd_buzz(beepP, beepS);
-#endif
-      delay(beepP);
-    }
-    beeptemphe=false;
-  }
-  else if (!isHeatingBed() && degTargetBed()!=0 && beeptemphb) {
-    int beepS = 100;
-    int beepP = 500;
-    int beepN = 2;
-    for (int i = 0; i < beepN; ++i) {
-#if BEEPER > 0
-      tone(BEEPER, beepS);
-      delay(beepP);
-      noTone(BEEPER);
-#elif defined(ULTRALCD)
-      lcd_buzz(beepS, beepP);
-#elif defined(LCD_USE_I2C_BUZZER)
-      lcd_buzz(beepP, beepS);
-#endif
-      delay(beepP);
-    }
-    beeptemphb=false;
-  }
-}
-#endif // (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
-
-
 void pause()
 {
   #if defined(PAUSE_PIN) && PAUSE_PIN > -1

MarlinKimbra/language.h

@@ -102,7 +102,7 @@
 #define MSG_HEATING_COMPLETE                "Heating done."
 #define MSG_BED_HEATING                     "Bed Heating."
 #define MSG_BED_DONE                        "Bed done."
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
+#define MSG_M115_REPORT                     "FIRMWARE_NAME:MarlinKimbra V4; FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define MSG_COUNT_X                         " Count X: "
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"