Merge remote-tracking branch 'origin/master'

Conflicts: src/modules/utils/panel/screens/3dprinter/MainMenuScreen.cpp
Deltaprintr · Dec 19, 2017 · 0a7ca50 · 0a7ca50
2 parents d2e4680 + 301ff7d
commit 0a7ca50
Show file tree

Hide file tree

Showing 180 changed files with 12 additions and 192,325 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/LPC1768/configdefault.o b/LPC1768/configdefault.o
diff --git a/LPC1768/libs/ADC/adc.o b/LPC1768/libs/ADC/adc.o
diff --git a/LPC1768/libs/Adc.o b/LPC1768/libs/Adc.o
diff --git a/LPC1768/libs/AppendFileStream.o b/LPC1768/libs/AppendFileStream.o
diff --git a/LPC1768/libs/ChaNFS/CHAN_FS/diskio.o b/LPC1768/libs/ChaNFS/CHAN_FS/diskio.o
diff --git a/LPC1768/libs/ChaNFS/CHAN_FS/ff.o b/LPC1768/libs/ChaNFS/CHAN_FS/ff.o
diff --git a/LPC1768/libs/ChaNFS/CHAN_FS/option/ccsbcs.o b/LPC1768/libs/ChaNFS/CHAN_FS/option/ccsbcs.o
diff --git a/LPC1768/libs/ChaNFS/FATDirHandle.o b/LPC1768/libs/ChaNFS/FATDirHandle.o
diff --git a/LPC1768/libs/ChaNFS/FATFileHandle.o b/LPC1768/libs/ChaNFS/FATFileHandle.o
diff --git a/LPC1768/libs/ChaNFS/FATFileSystem.o b/LPC1768/libs/ChaNFS/FATFileSystem.o
diff --git a/LPC1768/libs/Config.o b/LPC1768/libs/Config.o
diff --git a/LPC1768/libs/ConfigCache.o b/LPC1768/libs/ConfigCache.o
diff --git a/LPC1768/libs/ConfigSource.o b/LPC1768/libs/ConfigSource.o
diff --git a/LPC1768/libs/ConfigSources/FileConfigSource.o b/LPC1768/libs/ConfigSources/FileConfigSource.o
diff --git a/LPC1768/libs/ConfigSources/FirmConfigSource.o b/LPC1768/libs/ConfigSources/FirmConfigSource.o
diff --git a/LPC1768/libs/ConfigValue.o b/LPC1768/libs/ConfigValue.o
diff --git a/LPC1768/libs/Hook.o b/LPC1768/libs/Hook.o
diff --git a/LPC1768/libs/Kernel.o b/LPC1768/libs/Kernel.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_adc.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_adc.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_can.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_can.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_clkpwr.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_clkpwr.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_dac.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_dac.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_debug_frmwrk.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_debug_frmwrk.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_emac.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_emac.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_exti.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_exti.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_gpdma.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_gpdma.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_gpio.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_gpio.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_i2c.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_i2c.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_i2s.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_i2s.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_libcfg_default.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_libcfg_default.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_mcpwm.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_mcpwm.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_nvic.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_nvic.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_pinsel.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_pinsel.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_pwm.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_pwm.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_qei.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_qei.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_rit.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_rit.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_rtc.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_rtc.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_spi.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_spi.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_ssp.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_ssp.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_systick.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_systick.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_timer.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_timer.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_uart.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_uart.o
diff --git a/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_wdt.o b/LPC1768/libs/LPC17xx/LPC17xxLib/src/lpc17xx_wdt.o
diff --git a/LPC1768/libs/MRI_Hooks.o b/LPC1768/libs/MRI_Hooks.o
diff --git a/LPC1768/libs/MemoryPool.o b/LPC1768/libs/MemoryPool.o
diff --git a/LPC1768/libs/Module.o b/LPC1768/libs/Module.o
diff --git a/LPC1768/libs/Network/Drivers/LPC17XX_Ethernet.o b/LPC1768/libs/Network/Drivers/LPC17XX_Ethernet.o
diff --git a/LPC1768/libs/Network/net_util.o b/LPC1768/libs/Network/net_util.o
diff --git a/LPC1768/libs/Network/uip/CallbackStream.o b/LPC1768/libs/Network/uip/CallbackStream.o
diff --git a/LPC1768/libs/Network/uip/CommandQueue.o b/LPC1768/libs/Network/uip/CommandQueue.o
diff --git a/LPC1768/libs/Network/uip/Network.o b/LPC1768/libs/Network/uip/Network.o
diff --git a/LPC1768/libs/Network/uip/clock-arch.o b/LPC1768/libs/Network/uip/clock-arch.o
diff --git a/LPC1768/libs/Network/uip/dhcpc/dhcpc.o b/LPC1768/libs/Network/uip/dhcpc/dhcpc.o
diff --git a/LPC1768/libs/Network/uip/fifo.o b/LPC1768/libs/Network/uip/fifo.o
diff --git a/LPC1768/libs/Network/uip/lib/memb.o b/LPC1768/libs/Network/uip/lib/memb.o
diff --git a/LPC1768/libs/Network/uip/sftp/sftpd.o b/LPC1768/libs/Network/uip/sftp/sftpd.o
diff --git a/LPC1768/libs/Network/uip/telnetd/shell.o b/LPC1768/libs/Network/uip/telnetd/shell.o
diff --git a/LPC1768/libs/Network/uip/telnetd/telnetd.o b/LPC1768/libs/Network/uip/telnetd/telnetd.o
diff --git a/LPC1768/libs/Network/uip/uip/psock.o b/LPC1768/libs/Network/uip/uip/psock.o
diff --git a/LPC1768/libs/Network/uip/uip/timer.o b/LPC1768/libs/Network/uip/uip/timer.o
diff --git a/LPC1768/libs/Network/uip/uip/uip-fw.o b/LPC1768/libs/Network/uip/uip/uip-fw.o
diff --git a/LPC1768/libs/Network/uip/uip/uip-neighbor.o b/LPC1768/libs/Network/uip/uip/uip-neighbor.o
diff --git a/LPC1768/libs/Network/uip/uip/uip-split.o b/LPC1768/libs/Network/uip/uip/uip-split.o
diff --git a/LPC1768/libs/Network/uip/uip/uip.o b/LPC1768/libs/Network/uip/uip/uip.o
diff --git a/LPC1768/libs/Network/uip/uip/uip_arp.o b/LPC1768/libs/Network/uip/uip/uip_arp.o
diff --git a/LPC1768/libs/Network/uip/uip/uiplib.o b/LPC1768/libs/Network/uip/uip/uiplib.o
diff --git a/LPC1768/libs/Network/uip/webserver/http-strings.o b/LPC1768/libs/Network/uip/webserver/http-strings.o
diff --git a/LPC1768/libs/Network/uip/webserver/httpd-fs.o b/LPC1768/libs/Network/uip/webserver/httpd-fs.o
diff --git a/LPC1768/libs/Network/uip/webserver/httpd.o b/LPC1768/libs/Network/uip/webserver/httpd.o
diff --git a/LPC1768/libs/Pin.o b/LPC1768/libs/Pin.o
diff --git a/LPC1768/libs/PublicData.o b/LPC1768/libs/PublicData.o
diff --git a/LPC1768/libs/Pwm.o b/LPC1768/libs/Pwm.o
diff --git a/LPC1768/libs/SDFAT.o b/LPC1768/libs/SDFAT.o
diff --git a/LPC1768/libs/SlowTicker.o b/LPC1768/libs/SlowTicker.o
diff --git a/LPC1768/libs/StepTicker.o b/LPC1768/libs/StepTicker.o
diff --git a/LPC1768/libs/StepperMotor.o b/LPC1768/libs/StepperMotor.o
diff --git a/LPC1768/libs/StreamOutput.o b/LPC1768/libs/StreamOutput.o
diff --git a/LPC1768/libs/USBDevice/DFU.o b/LPC1768/libs/USBDevice/DFU.o
diff --git a/LPC1768/libs/USBDevice/USB.o b/LPC1768/libs/USBDevice/USB.o
diff --git a/LPC1768/libs/USBDevice/USBDevice/USBDevice.o b/LPC1768/libs/USBDevice/USBDevice/USBDevice.o
diff --git a/LPC1768/libs/USBDevice/USBDevice/USBHAL_LPC11U.o b/LPC1768/libs/USBDevice/USBDevice/USBHAL_LPC11U.o
diff --git a/LPC1768/libs/USBDevice/USBDevice/USBHAL_LPC17.o b/LPC1768/libs/USBDevice/USBDevice/USBHAL_LPC17.o
diff --git a/LPC1768/libs/USBDevice/USBMSD/SDCard.o b/LPC1768/libs/USBDevice/USBMSD/SDCard.o
diff --git a/LPC1768/libs/USBDevice/USBMSD/USBMSD.o b/LPC1768/libs/USBDevice/USBMSD/USBMSD.o
diff --git a/LPC1768/libs/USBDevice/USBSerial/USBCDC.o b/LPC1768/libs/USBDevice/USBSerial/USBCDC.o
diff --git a/LPC1768/libs/USBDevice/USBSerial/USBSerial.o b/LPC1768/libs/USBDevice/USBSerial/USBSerial.o
diff --git a/LPC1768/libs/Vector3.o b/LPC1768/libs/Vector3.o
diff --git a/LPC1768/libs/Watchdog.o b/LPC1768/libs/Watchdog.o
diff --git a/LPC1768/libs/ahbmalloc.o b/LPC1768/libs/ahbmalloc.o
diff --git a/LPC1768/libs/gpio.o b/LPC1768/libs/gpio.o
diff --git a/LPC1768/libs/md5.o b/LPC1768/libs/md5.o
diff --git a/LPC1768/libs/platform_memory.o b/LPC1768/libs/platform_memory.o
diff --git a/LPC1768/libs/utils.o b/LPC1768/libs/utils.o
diff --git a/LPC1768/main.bin b/LPC1768/main.bin
diff --git a/LPC1768/main.disasm b/LPC1768/main.disasm
diff --git a/LPC1768/main.elf b/LPC1768/main.elf
diff --git a/LPC1768/main.hex b/LPC1768/main.hex
diff --git a/LPC1768/main.map b/LPC1768/main.map
diff --git a/LPC1768/main.o b/LPC1768/main.o
diff --git a/LPC1768/mbed_custom.d b/LPC1768/mbed_custom.d
diff --git a/LPC1768/mbed_custom.o b/LPC1768/mbed_custom.o
diff --git a/LPC1768/modules/communication/GcodeDispatch.o b/LPC1768/modules/communication/GcodeDispatch.o
diff --git a/LPC1768/modules/communication/SerialConsole.o b/LPC1768/modules/communication/SerialConsole.o
diff --git a/LPC1768/modules/communication/utils/Gcode.o b/LPC1768/modules/communication/utils/Gcode.o
diff --git a/LPC1768/modules/robot/Block.o b/LPC1768/modules/robot/Block.o
diff --git a/LPC1768/modules/robot/BlockQueue.o b/LPC1768/modules/robot/BlockQueue.o
diff --git a/LPC1768/modules/robot/Conveyor.o b/LPC1768/modules/robot/Conveyor.o
diff --git a/LPC1768/modules/robot/Planner.o b/LPC1768/modules/robot/Planner.o
diff --git a/LPC1768/modules/robot/Robot.o b/LPC1768/modules/robot/Robot.o
diff --git a/LPC1768/modules/robot/arm_solutions/CartesianSolution.o b/LPC1768/modules/robot/arm_solutions/CartesianSolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/CoreXZSolution.o b/LPC1768/modules/robot/arm_solutions/CoreXZSolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/ExperimentalDeltaSolution.o b/LPC1768/modules/robot/arm_solutions/ExperimentalDeltaSolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/HBotSolution.o b/LPC1768/modules/robot/arm_solutions/HBotSolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/LinearDeltaSolution.o b/LPC1768/modules/robot/arm_solutions/LinearDeltaSolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/MorganSCARASolution.o b/LPC1768/modules/robot/arm_solutions/MorganSCARASolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/RotaryDeltaSolution.o b/LPC1768/modules/robot/arm_solutions/RotaryDeltaSolution.o
diff --git a/LPC1768/modules/robot/arm_solutions/RotatableCartesianSolution.o b/LPC1768/modules/robot/arm_solutions/RotatableCartesianSolution.o
diff --git a/LPC1768/modules/tools/endstops/Endstops.o b/LPC1768/modules/tools/endstops/Endstops.o
diff --git a/LPC1768/modules/tools/extruder/Extruder.o b/LPC1768/modules/tools/extruder/Extruder.o
diff --git a/LPC1768/modules/tools/extruder/ExtruderMaker.o b/LPC1768/modules/tools/extruder/ExtruderMaker.o
diff --git a/LPC1768/modules/tools/filamentdetector/FilamentDetector.o b/LPC1768/modules/tools/filamentdetector/FilamentDetector.o
diff --git a/LPC1768/modules/tools/laser/Laser.o b/LPC1768/modules/tools/laser/Laser.o
diff --git a/LPC1768/modules/tools/rotarydeltacalibration/RotaryDeltaCalibration.o b/LPC1768/modules/tools/rotarydeltacalibration/RotaryDeltaCalibration.o
diff --git a/LPC1768/modules/tools/scaracal/SCARAcal.o b/LPC1768/modules/tools/scaracal/SCARAcal.o
diff --git a/LPC1768/modules/tools/switch/Switch.o b/LPC1768/modules/tools/switch/Switch.o
diff --git a/LPC1768/modules/tools/switch/SwitchPool.o b/LPC1768/modules/tools/switch/SwitchPool.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/AD8495.o b/LPC1768/modules/tools/temperaturecontrol/AD8495.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/PID_Autotuner.o b/LPC1768/modules/tools/temperaturecontrol/PID_Autotuner.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/PT100_E3D.o b/LPC1768/modules/tools/temperaturecontrol/PT100_E3D.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/TemperatureControl.o b/LPC1768/modules/tools/temperaturecontrol/TemperatureControl.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/TemperatureControlPool.o b/LPC1768/modules/tools/temperaturecontrol/TemperatureControlPool.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/Thermistor.o b/LPC1768/modules/tools/temperaturecontrol/Thermistor.o
diff --git a/LPC1768/modules/tools/temperaturecontrol/max31855.o b/LPC1768/modules/tools/temperaturecontrol/max31855.o
diff --git a/LPC1768/modules/tools/temperatureswitch/TemperatureSwitch.o b/LPC1768/modules/tools/temperatureswitch/TemperatureSwitch.o
diff --git a/LPC1768/modules/tools/toolmanager/ToolManager.o b/LPC1768/modules/tools/toolmanager/ToolManager.o
diff --git a/LPC1768/modules/tools/zprobe/CartGridStrategy.o b/LPC1768/modules/tools/zprobe/CartGridStrategy.o
diff --git a/LPC1768/modules/tools/zprobe/DeltaCalibrationStrategy.o b/LPC1768/modules/tools/zprobe/DeltaCalibrationStrategy.o
diff --git a/LPC1768/modules/tools/zprobe/DeltaGridStrategy.o b/LPC1768/modules/tools/zprobe/DeltaGridStrategy.o
diff --git a/LPC1768/modules/tools/zprobe/Plane3D.o b/LPC1768/modules/tools/zprobe/Plane3D.o
diff --git a/LPC1768/modules/tools/zprobe/ThreePointStrategy.o b/LPC1768/modules/tools/zprobe/ThreePointStrategy.o
diff --git a/LPC1768/modules/tools/zprobe/ZProbe.o b/LPC1768/modules/tools/zprobe/ZProbe.o
diff --git a/LPC1768/modules/utils/PlayLed/PlayLed.o b/LPC1768/modules/utils/PlayLed/PlayLed.o
diff --git a/LPC1768/modules/utils/configurator/Configurator.o b/LPC1768/modules/utils/configurator/Configurator.o
diff --git a/LPC1768/modules/utils/currentcontrol/CurrentControl.o b/LPC1768/modules/utils/currentcontrol/CurrentControl.o
diff --git a/LPC1768/modules/utils/killbutton/KillButton.o b/LPC1768/modules/utils/killbutton/KillButton.o
diff --git a/LPC1768/modules/utils/led_ring/LedRing.o b/LPC1768/modules/utils/led_ring/LedRing.o
diff --git a/LPC1768/modules/utils/motordrivercontrol/MotorDriverControl.o b/LPC1768/modules/utils/motordrivercontrol/MotorDriverControl.o
diff --git a/LPC1768/modules/utils/motordrivercontrol/drivers/DRV8711/drv8711.o b/LPC1768/modules/utils/motordrivercontrol/drivers/DRV8711/drv8711.o
diff --git a/LPC1768/modules/utils/motordrivercontrol/drivers/TMC26X/TMC26X.o b/LPC1768/modules/utils/motordrivercontrol/drivers/TMC26X/TMC26X.o
diff --git a/LPC1768/modules/utils/panel/Button.o b/LPC1768/modules/utils/panel/Button.o
diff --git a/LPC1768/modules/utils/panel/Panel.o b/LPC1768/modules/utils/panel/Panel.o
diff --git a/LPC1768/modules/utils/panel/PanelScreen.o b/LPC1768/modules/utils/panel/PanelScreen.o
diff --git a/LPC1768/modules/utils/panel/panels/LcdBase.o b/LPC1768/modules/utils/panel/panels/LcdBase.o
diff --git a/LPC1768/modules/utils/panel/panels/ReprapDiscountGLCD.o b/LPC1768/modules/utils/panel/panels/ReprapDiscountGLCD.o
diff --git a/LPC1768/modules/utils/panel/panels/ST7565.o b/LPC1768/modules/utils/panel/panels/ST7565.o
diff --git a/LPC1768/modules/utils/panel/panels/UniversalAdapter.o b/LPC1768/modules/utils/panel/panels/UniversalAdapter.o
diff --git a/LPC1768/modules/utils/panel/panels/rrdglcd/RrdGlcd.o b/LPC1768/modules/utils/panel/panels/rrdglcd/RrdGlcd.o
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/ExtruderScreen.o b/LPC1768/modules/utils/panel/screens/3dprinter/ExtruderScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/JogScreen.o b/LPC1768/modules/utils/panel/screens/3dprinter/JogScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/MainMenuScreen.o b/LPC1768/modules/utils/panel/screens/3dprinter/MainMenuScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/PrepareScreen.o b/LPC1768/modules/utils/panel/screens/3dprinter/PrepareScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/ProbeScreen.o b/LPC1768/modules/utils/panel/screens/3dprinter/ProbeScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/WatchScreen.d b/LPC1768/modules/utils/panel/screens/3dprinter/WatchScreen.d
diff --git a/LPC1768/modules/utils/panel/screens/3dprinter/WatchScreen.o b/LPC1768/modules/utils/panel/screens/3dprinter/WatchScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/ControlScreen.o b/LPC1768/modules/utils/panel/screens/ControlScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/CustomScreen.o b/LPC1768/modules/utils/panel/screens/CustomScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/DynMenuScreen.o b/LPC1768/modules/utils/panel/screens/DynMenuScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/FileScreen.o b/LPC1768/modules/utils/panel/screens/FileScreen.o
diff --git a/LPC1768/modules/utils/panel/screens/ModifyValuesScreen.o b/LPC1768/modules/utils/panel/screens/ModifyValuesScreen.o
diff --git a/LPC1768/modules/utils/player/Player.o b/LPC1768/modules/utils/player/Player.o
diff --git a/LPC1768/modules/utils/simpleshell/SimpleShell.o b/LPC1768/modules/utils/simpleshell/SimpleShell.o
diff --git a/LPC1768/version.o b/LPC1768/version.o
diff --git a/mbed/drop/LPC11U24/GCC_ARM/Debug/libmbed.a b/mbed/drop/LPC11U24/GCC_ARM/Debug/libmbed.a
diff --git a/mbed/drop/LPC11U24/GCC_ARM/libmbed.a b/mbed/drop/LPC11U24/GCC_ARM/libmbed.a
diff --git a/mbed/drop/LPC1768/GCC_ARM/Debug/libmbed.a b/mbed/drop/LPC1768/GCC_ARM/Debug/libmbed.a
diff --git a/mbed/drop/LPC1768/GCC_ARM/libmbed.a b/mbed/drop/LPC1768/GCC_ARM/libmbed.a
diff --git a/src/modules/utils/panel/screens/3dprinter/MainMenuScreen.cpp b/src/modules/utils/panel/screens/3dprinter/MainMenuScreen.cpp
@@ -93,8 +93,8 @@ void MainMenuScreen::display_menu_line(uint16_t line)
         case 4: THEPANEL->lcd->printf("Load filament"); break;
         case 5: THEPANEL->lcd->printf("Unload filament"); break;
         case 6: THEPANEL->lcd->printf("Custom"); break;
-        case 7: THEPANEL->lcd->printf("Settings"); break;
-        case 8: THEPANEL->lcd->printf("Calibration"); break;
+        case 7: THEPANEL->lcd->printf("Calibration"); break;
+        case 8: THEPANEL->lcd->printf("Settings"); break;
     }
 }
 
@@ -110,11 +110,11 @@ void MainMenuScreen::clicked_menu_entry(uint16_t line)
              else THEPANEL->enter_screen(this->file_screen); break;
         case 2: THEPANEL->enter_screen(this->jog_screen     ); break;
         case 3: THEPANEL->enter_screen(this->prepare_screen ); break;
-        case 4: send_command("M84"); break;
-        case 5: send_command("M84"); break;
+        case 4: send_command("G1 E600 F1200"); break;
+        case 5: send_command("G1 E-600 F1200"); break;
         case 6: THEPANEL->enter_screen(THEPANEL->custom_screen ); break;
-        case 7: setupConfigureScreen(); break;
-        case 8: THEPANEL->enter_screen((new ProbeScreen())->set_parent(this)); break;
+        case 7: THEPANEL->enter_screen((new ProbeScreen())->set_parent(this)); break;
+        case 8: setupConfigureScreen(); break;
     }
 }
 

diff --git a/src/modules/utils/panel/screens/3dprinter/ProbeScreen.cpp b/src/modules/utils/panel/screens/3dprinter/ProbeScreen.cpp
@@ -63,8 +63,9 @@ void ProbeScreen::display_menu_line(uint16_t line)
 {
     switch ( line ) {
         case 0: THEPANEL->lcd->printf("Back");  break;
-        case 1: THEPANEL->lcd->printf("Status");  break;
-        case 2: THEPANEL->lcd->printf("Z Probe");  break;
+        case 1: THEPANEL->lcd->printf("Check probe");  break;
+        case 2: THEPANEL->lcd->printf("Autolevel bed");  break;
+        case 3: THEPANEL->lcd->printf("Autotune hotend heater");  break;
     }
 }
 
@@ -75,6 +76,7 @@ void ProbeScreen::clicked_menu_entry(uint16_t line)
         case 0: THEPANEL->enter_screen(this->parent); return;
         case 1: this->do_status= true; this->tcnt= 1; break;
         case 2: this->do_probe= true; break;
+        case 3: send_command("M303 E0 S220"); break;
     }
 }
 

diff --git a/src/modules/utils/panel/screens/3dprinter/WatchScreen.cpp b/src/modules/utils/panel/screens/3dprinter/WatchScreen.cpp
@@ -260,7 +260,7 @@ void WatchScreen::display_menu_line(uint16_t line)
                 THEPANEL->lcd->setCursor(12, line);
                 THEPANEL->lcd->printf("Z%7.2f", this->pos[2]);
             } else {
-                THEPANEL->lcd->printf("X%4d| Y%4d| Z%7.2f", (int)round(this->pos[0]), (int)round(this->pos[1]), this->pos[2]);
+                THEPANEL->lcd->printf("X%4d Y%4d Z%7.2f", (int)round(this->pos[0]), (int)round(this->pos[1]), this->pos[2]);
             }
             break;
         }
@@ -275,7 +275,7 @@ const char *WatchScreen::get_status()
         return THEPANEL->getMessage().c_str();
 
     if (THEKERNEL->is_halted())
-        return "Printer HALTED. Reset power.";
+        return "Printer HALTED.\rReset power.";
 
     if (THEPANEL->is_suspended())
         return "Suspended";