Fixup after rebase onto MK3

Firmware/Filament_sensor.cpp

@@ -7,6 +7,7 @@
 #include "cardreader.h"
 #include "eeprom.h"
 #include "menu.h"
+#include "planner.h"
 #include "temperature.h"
 #include "ultralcd.h"
 

Firmware/Marlin_main.cpp

@@ -361,7 +361,8 @@ uint8_t saved_printing_type = PRINTING_TYPE_SD;
 static float saved_pos[4] = { X_COORD_INVALID, 0, 0, 0 };
 static uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float)
 static int saved_feedmultiply2 = 0;
-static float saved_extruder_temperature = 0.0; //!< Active extruder temperature
+float saved_extruder_temperature = 0.0; //!< Active extruder temperature
+float saved_bed_temperature = 0.0;
 static bool saved_extruder_relative_mode = false;
 int saved_fan_speed = 0; //!< Print fan speed
 //! @}
@@ -2096,7 +2097,7 @@ float raise_z(float delta)
     float travel_z = current_position[Z_AXIS];
 
     // Z needs raising
-    current_position[Z_AXIS] = target;
+    current_position[Z_AXIS] += travel_z;
     clamp_to_software_endstops(current_position);
 
 #if defined(Z_MIN_PIN) && (Z_MIN_PIN > -1) && !defined(DEBUG_DISABLE_ZMINLIMIT)
@@ -3675,7 +3676,7 @@ void gcode_M701(float fastLoadLength, uint8_t mmuSlotIndex){
 		plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence
         st_synchronize();
 
-		raise_z_above(MIN_Z_FOR_LOAD, false);
+		raise_z_above(MIN_Z_FOR_LOAD/*, false*/);
 		current_position[E_AXIS] += feed_mm_before_raising;
 		plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence
 
@@ -8770,7 +8771,7 @@ Sigma_Exit:
     case 999:
       Stopped = false;
       lcd_reset_alert_level();
-      gcode_LastN = Stopped_gcode_LastN;
+//@@TODO      gcode_LastN = Stopped_gcode_LastN;
       FlushSerialRequestResend();
     break;
 	/*!
@@ -10576,7 +10577,7 @@ void long_pause() //long pause print
     setAllTargetHotends(0);
 
     // Lift z
-    raise_z_above(current_position[Z_AXIS] + Z_PAUSE_LIFT, true);
+    raise_z_above(current_position[Z_AXIS] + Z_PAUSE_LIFT/*, true*/);
 
     // Move XY to side
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) {

Firmware/Prusa_farm.cpp

@@ -7,7 +7,7 @@
 #include "conv2str.h"
 #include "util.h"
 #include "ultralcd.h"
-#include "fsensor.h" //to be converted to Filament_sensor.h...
+#include "Filament_sensor.h"
 
 #ifdef PRUSA_FARM
 uint8_t farm_mode = 0;
@@ -405,7 +405,7 @@ void farm_mode_init() {
 #ifdef FILAMENT_SENSOR
         //to be converted to Filament_sensor.h...
         //disabled filament autoload (PFW360)
-        fsensor_autoload_set(false);
+        fsensor.setAutoLoadEnabled(false);
 #endif //FILAMENT_SENSOR
         // ~ FanCheck -> on
         eeprom_update_byte((uint8_t*)EEPROM_FAN_CHECK_ENABLED, true);

Firmware/adc.h

@@ -15,6 +15,8 @@ http://resnet.uoregon.edu/~gurney_j/jmpc/bitwise.html
 # error "ADC_CHAN_MSK oes not match ADC_CHAN_CNT"
 #endif
 
+#define VOLT_DIV_REF 5 //[V]
+
 extern volatile uint8_t adc_channel;
 extern volatile uint16_t adc_values[ADC_CHAN_CNT];
 

Firmware/messages.h

@@ -172,11 +172,9 @@ extern const char MSG_DIM[];
 extern const char MSG_AUTO[];
 extern const char MSG_FS_V_03_OR_OLDER[];
 extern const char MSG_FS_V_04_OR_NEWER[];
-#ifdef IR_SENSOR_ANALOG
 extern const char MSG_IR_04_OR_NEWER[];
 extern const char MSG_IR_03_OR_OLDER[];
 extern const char MSG_IR_UNKNOWN[];
-#endif
 extern const char MSG_PAUSED_THERMAL_ERROR[];
 #ifdef TEMP_MODEL
 extern const char MSG_THERMAL_ANOMALY[];

Firmware/ultralcd.cpp

@@ -6001,7 +6001,7 @@ void print_stop()
     save_statistics(total_filament_used, t);
 
     // lift Z
-    raise_z_above(current_position[Z_AXIS] + 10, true);
+    raise_z_above(current_position[Z_AXIS] + 10/*, true*/);
 
     // if axis are homed, move to parking position.
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) {

Firmware/util.cpp

@@ -436,7 +436,7 @@ pStrBegin[*nLength] = '\0';
 return pStrBegin;
 }
 
-void printer_smodel_check(char *pStrPos) {
+void printer_smodel_check(const char *pStrPos) {
 char* pResult;
 size_t nLength,nPrinterNameLength;