Browse Source

Merge remote-tracking branch 'upstream/MK3' into MK3

Robert Pelnar 5 years ago
parent
commit
ced74b7ec2
2 changed files with 4 additions and 2 deletions
  1. 2 2
      Firmware/Configuration.h
  2. 2 0
      Firmware/fsensor.cpp

+ 2 - 2
Firmware/Configuration.h

@@ -7,8 +7,8 @@
 #define STR(x) STR_HELPER(x)
 
 // Firmware version
-#define FW_VERSION "3.4.0"
-#define FW_COMMIT_NR   1327
+#define FW_VERSION "3.4.1-RC1"
+#define FW_COMMIT_NR   1354
 // FW_VERSION_UNKNOWN means this is an unofficial build.
 // The firmware should only be checked into github with this symbol.
 #define FW_DEV_VERSION FW_VERSION_UNKNOWN

+ 2 - 0
Firmware/fsensor.cpp

@@ -453,11 +453,13 @@ void fsensor_update(void)
 
         enquecommand_front_P((PSTR("G1 E-3 F200")));
         process_commands();
+		KEEPALIVE_STATE(IN_HANDLER);
         cmdqueue_pop_front();
         st_synchronize();
 
         enquecommand_front_P((PSTR("G1 E3 F200")));
         process_commands();
+		KEEPALIVE_STATE(IN_HANDLER);
         cmdqueue_pop_front();
         st_synchronize();