josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cmake build

This commit is contained in:
D.R.racer 2023-01-25 10:35:39 +01:00 committed by DRracer
parent 528abcb8d8
commit 43ae2c78e5
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -151,6 +151,7 @@ set(FW_SOURCES
mmu2_error_converter.cpp mmu2_error_converter.cpp
mmu2_fsensor.cpp mmu2_fsensor.cpp
mmu2_log.cpp mmu2_log.cpp
mmu2_marlin1.cpp
mmu2_power.cpp mmu2_power.cpp
mmu2_progress_converter.cpp mmu2_progress_converter.cpp
mmu2_protocol.cpp mmu2_protocol.cpp

2
Firmware/mmu2.cpp
View File

@ -577,7 +577,7 @@ void MMU2::SaveAndPark(bool move_axes) {
resume_position = planner_current_position(); // save current pos resume_position = planner_current_position(); // save current pos
// lift Z // lift Z
raise_z(MMU_ERR_Z_PAUSE_LIFT); MoveRaiseZ(MMU_ERR_Z_PAUSE_LIFT);
// move XY aside // move XY aside
if (all_axes_homed()) { if (all_axes_homed()) {

6
Firmware/mmu2_log.h
View File

@ -25,21 +25,21 @@ void LogEchoEvent_P(const char *msg);
#define MMU2_ECHO_MSGLN(S) \ #define MMU2_ECHO_MSGLN(S) \
do { \ do { \
SERIAL_ECHO_START(); \ SERIAL_ECHO_START; \
SERIAL_MMU2(); \ SERIAL_MMU2(); \
SERIAL_ECHOLN(S); \ SERIAL_ECHOLN(S); \
} while (0) } while (0)
#define MMU2_ERROR_MSGLN(S) MMU2_ECHO_MSGLN(S) //!@todo Decide MMU2 errors on serial line #define MMU2_ERROR_MSGLN(S) MMU2_ECHO_MSGLN(S) //!@todo Decide MMU2 errors on serial line
#define MMU2_ECHO_MSGRPGM(S) \ #define MMU2_ECHO_MSGRPGM(S) \
do { \ do { \
SERIAL_ECHO_START(); \ SERIAL_ECHO_START; \
SERIAL_MMU2(); \ SERIAL_MMU2(); \
SERIAL_ECHO(S); \ SERIAL_ECHO(S); \
} while (0) } while (0)
#define MMU2_ERROR_MSGRPGM(S) MMU2_ECHO_MSGRPGM(S) //!@todo Decide MMU2 errors on serial line #define MMU2_ERROR_MSGRPGM(S) MMU2_ECHO_MSGRPGM(S) //!@todo Decide MMU2 errors on serial line
#define MMU2_ECHO_MSG(S) \ #define MMU2_ECHO_MSG(S) \
do { \ do { \
SERIAL_ECHO_START(); \ SERIAL_ECHO_START; \
SERIAL_MMU2(); \ SERIAL_MMU2(); \
SERIAL_ECHO(S); \ SERIAL_ECHO(S); \
} while (0) } while (0)

2
Firmware/mmu2_marlin.h
View File

@ -24,7 +24,7 @@ struct pos3d {
void MoveE(float delta, float feedRate); void MoveE(float delta, float feedRate);
float raise_z(float delta); float MoveRaiseZ(float delta);
void planner_synchronize(); void planner_synchronize();
bool planner_any_moves(); bool planner_any_moves();

10
Firmware/mmu2_marlin1.cpp
View File

@ -1,5 +1,6 @@
/// @file /// @file
/// MK3 / Marlin1 implementation of support routines for the MMU2 /// MK3 / Marlin1 implementation of support routines for the MMU2
#include "mmu2_marlin.h"
#include "Marlin.h" #include "Marlin.h"
#include "stepper.h" #include "stepper.h"
#include "planner.h" #include "planner.h"
@ -13,9 +14,8 @@ void MoveE(float delta, float feedRate) {
plan_buffer_line_curposXYZE(feedRate); plan_buffer_line_curposXYZE(feedRate);
} }
float raise_z(float delta) { float MoveRaiseZ(float delta) {
// @@TODO return raise_z(delta);
return 0.0F;
} }
void planner_synchronize() { void planner_synchronize() {
@ -27,7 +27,7 @@ bool planner_any_moves() {
} }
float planner_get_machine_position_E_mm(){ float planner_get_machine_position_E_mm(){
// @@TODO return Planner::get_machine_position_mm()[3]; return current_position[E_AXIS];
} }
float planner_get_current_position_E(){ float planner_get_current_position_E(){
@ -82,7 +82,7 @@ void marlin_manage_inactivity(bool b){
void marlin_idle(bool b){ void marlin_idle(bool b){
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(b);
} }
int16_t thermal_degTargetHotend() { int16_t thermal_degTargetHotend() {