Merge pull request #89 from XPila/MK3

Build 109

Firmware/BlinkM.cpp

@@ -1,29 +0,0 @@
-/*
-  BlinkM.cpp - Library for controlling a BlinkM over i2c
-  Created by Tim Koster, August 21 2013.
-*/
-#include "Marlin.h"
-#ifdef BLINKM
-
-#if (ARDUINO >= 100)
-  # include "Arduino.h"
-#else
-  # include "WProgram.h"
-#endif
-
-#include "BlinkM.h"
-
-void SendColors(byte red, byte grn, byte blu)
-{
-  Wire.begin(); 
-  Wire.beginTransmission(0x09);
-  Wire.write('o');                    //to disable ongoing script, only needs to be used once
-  Wire.write('n');
-  Wire.write(red);
-  Wire.write(grn);
-  Wire.write(blu);
-  Wire.endTransmission();
-}
-
-#endif //BLINKM
-

Firmware/BlinkM.h

@@ -1,14 +0,0 @@
-/*
-  BlinkM.h
-  Library header file for BlinkM library
- */
-#if (ARDUINO >= 100)
-  # include "Arduino.h"
-#else
-  # include "WProgram.h"
-#endif
-
-#include "Wire.h"
-
-void SendColors(byte red, byte grn, byte blu);
-

Firmware/Configuration.h

@@ -9,7 +9,7 @@
 
 // Firmware version
 #define FW_version "3.0.12-RC2"
-#define FW_build   108
+#define FW_build   109
 //#define FW_build   --BUILD-NUMBER--
 #define FW_version_build FW_version " b" STR(FW_build)
 

Firmware/Configuration_prusa.h

@@ -82,9 +82,9 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 
 //DEBUG
 //#define _NO_ASM
-#define DEBUG_DCODES //D codes
+//#define DEBUG_DCODES //D codes
 #if 1
-#define DEBUG_FSENSOR_LOG          //Reports fsensor status to serial
+//#define DEBUG_FSENSOR_LOG          //Reports fsensor status to serial
 //#define DEBUG_CRASHDET_COUNTERS  //Display crash-detection counters on LCD
 //#define DEBUG_RESUME_PRINT       //Resume/save print debug enable 
 //#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output 

Firmware/Dcodes.cpp

@@ -1,6 +1,8 @@
 #include "Dcodes.h"
 #include "Marlin.h"
-#
+
+#ifdef DEBUG_DCODES
+
 #include "ConfigurationStore.h"
 #include "cmdqueue.h"
 #include "pat9125.h"
@@ -421,3 +423,5 @@ void dcode_9125()
 		fsensor_log = (int)code_value();
 	}
 }
+
+#endif //DEBUG_DCODES

Firmware/Marlin.h

@@ -389,17 +389,24 @@ extern void print_mesh_bed_leveling_table();
 
 // States for managing Marlin and host communication
 // Marlin sends messages if blocked or busy
-enum MarlinBusyState {
+/*enum MarlinBusyState {
 	NOT_BUSY,           // Not in a handler
 	IN_HANDLER,         // Processing a GCode
 	IN_PROCESS,         // Known to be blocking command input (as in G29)
 	PAUSED_FOR_USER,    // Blocking pending any input
 	PAUSED_FOR_INPUT    // Blocking pending text input (concept)
-};
+};*/
+
+#define NOT_BUSY          1
+#define IN_HANDLER        2
+#define IN_PROCESS        3
+#define PAUSED_FOR_USER   4
+#define PAUSED_FOR_INPUT  5
 
 #define KEEPALIVE_STATE(n) do { busy_state = n;} while (0)
 extern void host_keepalive();
-extern MarlinBusyState busy_state;
+//extern MarlinBusyState busy_state;
+extern int busy_state;
 
 #endif //HOST_KEEPALIVE_FEATURE
 

Firmware/Marlin_main.cpp

@@ -399,7 +399,7 @@ bool cancel_heatup = false ;
 
 #ifdef HOST_KEEPALIVE_FEATURE
   
-  MarlinBusyState busy_state = NOT_BUSY;
+  int busy_state = NOT_BUSY;
   static long prev_busy_signal_ms = -1;
   uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL;
 #else
@@ -4490,7 +4490,7 @@ Sigma_Exit:
 	case 113: // M113 - Get or set Host Keepalive interval
 		if (code_seen('S')) {
 			host_keepalive_interval = (uint8_t)code_value_short();
-			NOMORE(host_keepalive_interval, 60);
+//			NOMORE(host_keepalive_interval, 60);
 		}
 		else {
 			SERIAL_ECHO_START;