3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Robert Pelnar 2018-10-04 13:53:00 +02:00
commit ced74b7ec2
2 changed files with 4 additions and 2 deletions

4
Firmware/Configuration.h
View file

@ -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_VERSION "3.4.1-RC1"
#define FW_COMMIT_NR 1327 #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
Firmware/fsensor.cpp
View file

@ -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();