浏览代码

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

Robert Pelnar 6 年之前
父节点
当前提交
ced74b7ec2
共有 2 个文件被更改,包括 4 次插入2 次删除
  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)
 #define STR(x) STR_HELPER(x)
 
 
 // Firmware version
 // 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.
 // FW_VERSION_UNKNOWN means this is an unofficial build.
 // The firmware should only be checked into github with this symbol.
 // The firmware should only be checked into github with this symbol.
 #define FW_DEV_VERSION FW_VERSION_UNKNOWN
 #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")));
         enquecommand_front_P((PSTR("G1 E-3 F200")));
         process_commands();
         process_commands();
+		KEEPALIVE_STATE(IN_HANDLER);
         cmdqueue_pop_front();
         cmdqueue_pop_front();
         st_synchronize();
         st_synchronize();
 
 
         enquecommand_front_P((PSTR("G1 E3 F200")));
         enquecommand_front_P((PSTR("G1 E3 F200")));
         process_commands();
         process_commands();
+		KEEPALIVE_STATE(IN_HANDLER);
         cmdqueue_pop_front();
         cmdqueue_pop_front();
         st_synchronize();
         st_synchronize();