bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Shorter paths to HAL, ExtUI (#17156)

Browse Source
This commit is contained in:
Scott Lahteine
2020-03-13 16:29:29 -05:00
committed by GitHub
parent ad980a72f7
commit 6bead0c1b0
600 changed files with 228 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/abl/abl.cpp
View File

@ -32,7 +32,7 @@
#include "../../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h"
#include "../../../lcd/extui/ui_api.h"
#endif
xy_pos_t bilinear_grid_spacing, bilinear_start;

2
Marlin/src/feature/bedlevel/bedlevel.cpp
View File

@ -43,7 +43,7 @@
#include "../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../lcd/extensible_ui/ui_api.h"
#include "../../lcd/extui/ui_api.h"
#endif
bool leveling_is_valid() {

2
Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
View File

@ -29,7 +29,7 @@
#include "../../../module/motion.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h"
#include "../../../lcd/extui/ui_api.h"
#endif
mesh_bed_leveling mbl;

2
Marlin/src/feature/bedlevel/ubl/ubl.cpp
View File

@ -37,7 +37,7 @@
#include "../../../module/probe.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h"
#include "../../../lcd/extui/ui_api.h"
#endif
#include "math.h"

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -46,7 +46,7 @@
#include "../../../core/debug_out.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../../lcd/extensible_ui/ui_api.h"
#include "../../../lcd/extui/ui_api.h"
#endif
#include <math.h>

2
Marlin/src/feature/emergency_parser.cpp → Marlin/src/feature/e_parser.cpp
View File

@ -28,7 +28,7 @@
#if ENABLED(EMERGENCY_PARSER)
#include "emergency_parser.h"
#include "e_parser.h"
// Static data members
bool EmergencyParser::killed_by_M112, // = false

5
Marlin/src/feature/emergency_parser.h → Marlin/src/feature/e_parser.h
View File

@ -75,6 +75,7 @@ public:
FORCE_INLINE static void disable() { enabled = false; }
FORCE_INLINE static void update(State &state, const uint8_t c) {
#define ISEOL(C) ((C) == '\n' || (C) == '\r')
switch (state) {
case EP_RESET:
switch (c) {
@ -164,11 +165,11 @@ public:
#endif
case EP_IGNORE:
if (c == '\n' || c == '\r') state = EP_RESET;
if (ISEOL(c)) state = EP_RESET;
break;
default:
if (c == '\n' || c == '\r') {
if (ISEOL(c)) {
if (enabled) switch (state) {
case EP_M108: wait_for_user = wait_for_heatup = false; break;
case EP_M112: killed_by_M112 = true; break;

2
Marlin/src/feature/I2CPositionEncoder.cpp → Marlin/src/feature/encoder_i2c.cpp
View File

@ -32,7 +32,7 @@
#if ENABLED(I2C_POSITION_ENCODERS)
#include "I2CPositionEncoder.h"
#include "encoder_i2c.h"
#include "../module/temperature.h"
#include "../module/stepper.h"

0
Marlin/src/feature/I2CPositionEncoder.h → Marlin/src/feature/encoder_i2c.h
View File

2
Marlin/src/feature/joystick.cpp
View File

@ -37,7 +37,7 @@
Joystick joystick;
#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extensible_ui/ui_api.h"
#include "../lcd/extui/ui_api.h"
#endif
#if HAS_JOY_ADC_X

2
Marlin/src/feature/Max7219_Debug_LEDs.cpp → Marlin/src/feature/max7219.cpp
View File

@ -41,7 +41,7 @@
#define MAX7219_ERRORS // Disable to save 406 bytes of Program Memory
#include "Max7219_Debug_LEDs.h"
#include "max7219.h"
#include "../module/planner.h"
#include "../module/stepper.h"

0
Marlin/src/feature/Max7219_Debug_LEDs.h → Marlin/src/feature/max7219.h
View File

2
Marlin/src/feature/prusa_MMU2/mmu2.cpp → Marlin/src/feature/mmu2/mmu2.cpp
View File

@ -43,7 +43,7 @@ MMU2 mmu2;
#endif
#if ENABLED(EXTENSIBLE_UI)
#include "../../lcd/extensible_ui/ui_api.h"
#include "../../lcd/extui/ui_api.h"
#endif
#define DEBUG_OUT ENABLED(MMU2_DEBUG)

0
Marlin/src/feature/prusa_MMU2/mmu2.h → Marlin/src/feature/mmu2/mmu2.h
View File

0
Marlin/src/feature/prusa_MMU2/serial-protocol.md → Marlin/src/feature/mmu2/serial-protocol.md
View File

2
Marlin/src/feature/pause.cpp
View File

@ -50,7 +50,7 @@
#endif
#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extensible_ui/ui_api.h"
#include "../lcd/extui/ui_api.h"
#endif
#include "../core/language.h"

2
Marlin/src/feature/power_loss_recovery.cpp → Marlin/src/feature/powerloss.cpp
View File

@ -28,7 +28,7 @@
#if ENABLED(POWER_LOSS_RECOVERY)
#include "power_loss_recovery.h"
#include "powerloss.h"
#include "../core/macros.h"
bool PrintJobRecovery::enabled; // Initialized by settings.load()

0
Marlin/src/feature/power_loss_recovery.h → Marlin/src/feature/powerloss.h
View File

2
Marlin/src/feature/probe_temp_compensation.cpp → Marlin/src/feature/probe_temp_comp.cpp
View File

@ -24,7 +24,7 @@
#if ENABLED(PROBE_TEMP_COMPENSATION)
#include "probe_temp_compensation.h"
#include "probe_temp_comp.h"
#include <math.h>
ProbeTempComp temp_comp;

0
Marlin/src/feature/probe_temp_compensation.h → Marlin/src/feature/probe_temp_comp.h
View File

2
Marlin/src/feature/runout.cpp
View File

@ -69,7 +69,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
#endif
#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extensible_ui/ui_api.h"
#include "../lcd/extui/ui_api.h"
#endif
void event_filament_runout() {

2
Marlin/src/feature/runout.h
View File

@ -34,7 +34,7 @@
#include "../inc/MarlinConfig.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extensible_ui/ui_api.h"
#include "../lcd/extui/ui_api.h"
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE)