Skip to content

Commit 50a2c0b

Browse files
Djonker83thisiskeithbthinkyheadDejitaruJinEvilGremlin
authored
Bugfix 2.1.x (#2)
* 🩹 Update KEDI / GODI LCD_PINS_EN pin (MarlinFirmware#25886) * [cron] Bump distribution date (2023-05-29) * 🩹 Fix and improve GT2560 pins (MarlinFirmware#25890) Co-authored-by: Scott Lahteine <[email protected]> * 🔨 Install 'heatshrink' if needed (MarlinFirmware#25896) * [cron] Bump distribution date (2023-05-30) * 🔧 Default has Heated Bed (MarlinFirmware#25895) Co-authored-by: Scott Lahteine <[email protected]> * 🚸 Probe Wizard display fix * 🧑‍💻 ExtUI::onLevelingStart/Done for all leveling (MarlinFirmware#25913) * 🌐 Update Russian translation (MarlinFirmware#25840) * 🌐 Remove unused strings * 🔧 Update LCD with NeoPixel Contrast (MarlinFirmware#25893) * [cron] Bump distribution date (2023-06-02) * 📝 M122 comment * 🔨 Clarify env error (MarlinFirmware#25915) * 🔨 Fix pins debugging for Simulator * 🎨 Lowercase method / data member names (MarlinFirmware#25914) * 🧑‍💻 numtostr use functions * 🧑‍💻 Dump BOTH and EITHER macros (MarlinFirmware#25908) * 🧑‍💻 Remove LOOP macros (MarlinFirmware#25917) * [cron] Bump distribution date (2023-06-03) * 🎨 Lowercase followup (MarlinFirmware#25923) Followup to MarlinFirmware#25914 * 🔨 STM32H723VG (1024KB) (MarlinFirmware#25921) * 🩹 Endstop hit state followup (MarlinFirmware#25885) Followup to MarlinFirmware#25574 * 🧑‍💻 Fix narrowing conversions (MarlinFirmware#25924) * 🔧 BTT SKR 3 has onboard endstop pullups (MarlinFirmware#24876) * 🐛 Fix M25/M125 for LCDs with ui.resume_print (MarlinFirmware#24877) * [cron] Bump distribution date (2023-06-04) * ✏️ Fix LCD contrast typo (MarlinFirmware#25929) * 🩹 Fix D576 buffer underrun reporting (MarlinFirmware#25931) * [cron] Bump distribution date (2023-06-05) * 🔧 TMC Driver axis baud for Soft Serial (MarlinFirmware#25664) * 🎨 Detab C/C++ * 🧑‍💻 Dir change is AxisBits Followup to MarlinFirmware#25761 * 🩹 Wrap HAS_DISPLAY for if() Followup to MarlinFirmware#24877 * 🧑‍💻 Fix mfconfig trailing space * [cron] Bump distribution date (2023-06-06) * 🩹 Fix JyersUI corner pos Followup to MarlinFirmware#25631 * 🧑‍💻 Bypass error in build_example * 🧑‍💻 Suppress narrowing warnings Followup to MarlinFirmware#25924 * ⚡️ Mixer label in PROGMEM * 🩹 Conditional include probe.h * 🧑‍💻 Use Flags<> for runout (MarlinFirmware#25938) * [cron] Bump distribution date (2023-06-07) * 🌐 Update Italian language (MarlinFirmware#25940) * 🔨 Teensy 4.1 pins env check (MarlinFirmware#25937) * [cron] Bump distribution date (2023-06-08) * 🔧 Z-MIN as CREALITY V25 S1 probe * 🚸 Fix TFT menu positioning (MarlinFirmware#25942) Co-authored-by: Ed <[email protected]> * 🔨 Clean up some BTT envs, etc. (MarlinFirmware#25934) Followup to MarlinFirmware#25921 Co-authored-by: Scott Lahteine <[email protected]> * 🚸 General TFT cleanup * 🚸 Portrait TS35 move axis screen (MarlinFirmware#25945) * 🔨 Update STM32Hxx boards/variants Followup to MarlinFirmware#25934 * 🔨 Fix serial port #error text * [cron] Bump distribution date (2023-06-09) * 🐛 Fix _MINMAX_TEST typo (MarlinFirmware#25954) * 🩹 Conditional u8g for SAMD21 (MarlinFirmware#25947) * 🔨 Simpler distinct firmware rename (MarlinFirmware#25957) * 🐛 Fix dummy thermistors 998-999 (MarlinFirmware#25956) * [cron] Bump distribution date (2023-06-10) * 🔨 Firmware rename followup (MarlinFirmware#25966) Followup to MarlinFirmware#25957 * [cron] Bump distribution date (2023-06-11) * 🔨 SKR Mini E3 v3.0.1 XFER (MarlinFirmware#25955) * [cron] Bump distribution date (2023-06-12) * ♻️ Simplify SERIAL_ECHO (MarlinFirmware#25928) Since this increases AVR code size, try to optimize further. * 🔥 Remove VAkE 403D (MarlinFirmware#25969) * [cron] Bump distribution date (2023-06-13) * 🎨 Lowercase methods, functions, data members (MarlinFirmware#25939) For: TFT, DGUS, MarlinUI, Anycubic, JyersUI, CrealityUI * 🔧 Sanity check IA_CREALITY mesh size * [cron] Bump distribution date (2023-06-15) * 🎨 Lowercase followup Followup to MarlinFirmware#25939 * 🎨 Group STM32G0 pins includes (MarlinFirmware#25977) * 📝 Document Manta E3 EZ / E3V2 LCD custom wiring (MarlinFirmware#25976) * ✨ BTT RAMPS 1.6+ (MarlinFirmware#25970) * [cron] Bump distribution date (2023-06-16) --------- Co-authored-by: Keith Bennett <[email protected]> Co-authored-by: thinkyhead <[email protected]> Co-authored-by: DejitaruJin <[email protected]> Co-authored-by: EvilGremlin <[email protected]> Co-authored-by: I3DBeeTech <[email protected]> Co-authored-by: alextrical <[email protected]> Co-authored-by: ellensp <[email protected]> Co-authored-by: Manuel McLure <[email protected]> Co-authored-by: Giuliano Zaro <[email protected]> Co-authored-by: Andrew <[email protected]> Co-authored-by: kisslorand <[email protected]> Co-authored-by: Roi Rodríguez Huertas <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: Dmitry Plastinin <[email protected]> Co-authored-by: Miguel Risco-Castillo <[email protected]> Co-authored-by: Bart Meijer <[email protected]>
1 parent 4198916 commit 50a2c0b

File tree

190 files changed

+5171
-5364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+5171
-5364
lines changed

‎Marlin/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2023-06-06"
44+
//#define STRING_DISTRIBUTION_DATE "2023-06-16"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

‎Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,9 @@ bool PersistentStore::access_finish() {
9191
static void debug_rw(const bool write, int &pos, const uint8_t *value, const size_t size, const FRESULT s, const size_t total=0) {
9292
#if ENABLED(DEBUG_SD_EEPROM_EMULATION)
9393
FSTR_P const rw_str = write ? F("write") : F("read");
94-
SERIAL_CHAR(' ');
95-
SERIAL_ECHOF(rw_str);
96-
SERIAL_ECHOLNPGM("_data(", pos, ",", *value, ",", size, ", ...)");
97-
if (total) {
98-
SERIAL_ECHOPGM(" f_");
99-
SERIAL_ECHOF(rw_str);
100-
SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
101-
SERIAL_ECHOLNF(write ? F("written=") : F("read="), total);
102-
}
94+
SERIAL_ECHOLN(AS_CHAR(' '), rw_str, F("_data("), pos, AS_CHAR(','), *value, AS_CHAR(','), size, F(", ...)"));
95+
if (total)
96+
SERIAL_ECHOLN(F(" f_"), rw_str, F("()="), s, F("\n size="), size, F("\n bytes_"), write ? F("written=") : F("read="), total);
10397
else
10498
SERIAL_ECHOLNPGM(" f_lseek()=", s);
10599
#endif

‎Marlin/src/HAL/LPC1768/tft/tft_spi.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
SPIClass TFT_SPI::SPIx(TFT_SPI_DEVICE);
3232

33-
void TFT_SPI::Init() {
33+
void TFT_SPI::init() {
3434
#if PIN_EXISTS(TFT_RESET)
3535
OUT_WRITE(TFT_RESET_PIN, HIGH);
3636
delay(100);
@@ -49,21 +49,21 @@ void TFT_SPI::Init() {
4949
SPIx.setDataMode(SPI_MODE0);
5050
}
5151

52-
void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
53-
SPIx.setDataSize(DataSize);
52+
void TFT_SPI::dataTransferBegin(uint16_t dataSize) {
53+
SPIx.setDataSize(dataSize);
5454
SPIx.begin();
5555
WRITE(TFT_CS_PIN, LOW);
5656
}
5757

58-
uint32_t TFT_SPI::GetID() {
58+
uint32_t TFT_SPI::getID() {
5959
uint32_t id;
60-
id = ReadID(LCD_READ_ID);
60+
id = readID(LCD_READ_ID);
6161
if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
62-
id = ReadID(LCD_READ_ID4);
62+
id = readID(LCD_READ_ID4);
6363
return id;
6464
}
6565

66-
uint32_t TFT_SPI::ReadID(uint16_t Reg) {
66+
uint32_t TFT_SPI::readID(uint16_t reg) {
6767
uint32_t data = 0;
6868

6969
#if PIN_EXISTS(TFT_MISO)
@@ -72,14 +72,14 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
7272
SPIx.setClock(SPI_CLOCK_DIV64);
7373
SPIx.begin();
7474
WRITE(TFT_CS_PIN, LOW);
75-
WriteReg(Reg);
75+
writeReg(reg);
7676

7777
for (uint8_t i = 0; i < 4; ++i) {
7878
SPIx.read((uint8_t*)&d, 1);
7979
data = (data << 8) | d;
8080
}
8181

82-
DataTransferEnd();
82+
dataTransferEnd();
8383
SPIx.setClock(SPI_CLOCK_MAX_TFT);
8484
#endif
8585

@@ -103,11 +103,11 @@ bool TFT_SPI::isBusy() {
103103
if ((SSP_GetStatus(LPC_SSPx, SSP_STAT_TXFIFO_EMPTY) == RESET) || (SSP_GetStatus(LPC_SSPx, SSP_STAT_BUSY) == SET)) return true;
104104
}
105105

106-
Abort();
106+
abort();
107107
return false;
108108
}
109109

110-
void TFT_SPI::Abort() {
110+
void TFT_SPI::abort() {
111111
// DMA Channel 0 is hardcoded in dmaSendAsync() and dmaSend()
112112

113113
// Disable DMA
@@ -126,20 +126,20 @@ void TFT_SPI::Abort() {
126126
LPC_GPDMACH0->DMACCSrcAddr = 0U;
127127
LPC_GPDMACH0->DMACCDestAddr = 0U;
128128

129-
DataTransferEnd();
129+
dataTransferEnd();
130130
}
131131

132-
void TFT_SPI::Transmit(uint16_t Data) { SPIx.transfer(Data); }
132+
void TFT_SPI::transmit(uint16_t data) { SPIx.transfer(data); }
133133

134-
void TFT_SPI::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
135-
DataTransferBegin(DATASIZE_16BIT);
136-
SPIx.dmaSend(Data, Count, MemoryIncrease);
137-
Abort();
134+
void TFT_SPI::transmit(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {
135+
dataTransferBegin(DATASIZE_16BIT);
136+
SPIx.dmaSend(data, count, memoryIncrease);
137+
abort();
138138
}
139139

140-
void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
141-
DataTransferBegin(DATASIZE_16BIT);
142-
SPIx.dmaSendAsync(Data, Count, MemoryIncrease);
140+
void TFT_SPI::transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {
141+
dataTransferBegin(DATASIZE_16BIT);
142+
SPIx.dmaSendAsync(data, count, memoryIncrease);
143143

144144
TERN_(TFT_SHARED_IO, while (isBusy()));
145145
}

‎Marlin/src/HAL/LPC1768/tft/tft_spi.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,34 +56,34 @@
5656

5757
class TFT_SPI {
5858
private:
59-
static uint32_t ReadID(uint16_t Reg);
60-
static void Transmit(uint16_t Data);
61-
static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
62-
static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
59+
static uint32_t readID(uint16_t reg);
60+
static void transmit(uint16_t data);
61+
static void transmit(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
62+
static void transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
6363

6464
public:
6565
static SPIClass SPIx;
6666

67-
static void Init();
68-
static uint32_t GetID();
67+
static void init();
68+
static uint32_t getID();
6969
static bool isBusy();
70-
static void Abort();
70+
static void abort();
7171

72-
static void DataTransferBegin(uint16_t DataWidth=DATASIZE_16BIT);
73-
static void DataTransferEnd() { WRITE(TFT_CS_PIN, HIGH); SSP_Cmd(LPC_SSPx, DISABLE); };
74-
static void DataTransferAbort();
72+
static void dataTransferBegin(uint16_t dataWidth=DATASIZE_16BIT);
73+
static void dataTransferEnd() { WRITE(TFT_CS_PIN, HIGH); SSP_Cmd(LPC_SSPx, DISABLE); };
74+
static void dataTransferAbort();
7575

76-
static void WriteData(uint16_t Data) { Transmit(Data); }
77-
static void WriteReg(uint16_t Reg) { WRITE(TFT_DC_PIN, LOW); Transmit(Reg); WRITE(TFT_DC_PIN, HIGH); }
76+
static void writeData(uint16_t data) { transmit(data); }
77+
static void writeReg(uint16_t reg) { WRITE(TFT_DC_PIN, LOW); transmit(reg); WRITE(TFT_DC_PIN, HIGH); }
7878

79-
static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
80-
static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
79+
static void writeSequence_DMA(uint16_t *data, uint16_t count) { transmitDMA(DMA_MINC_ENABLE, data, count); }
80+
static void writeMultiple_DMA(uint16_t color, uint16_t count) { static uint16_t data; data = color; transmitDMA(DMA_MINC_DISABLE, &data, count); }
8181

82-
static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_MINC_ENABLE, Data, Count); }
83-
static void WriteMultiple(uint16_t Color, uint32_t Count) {
84-
while (Count > 0) {
85-
Transmit(DMA_MINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
86-
Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
82+
static void writeSequence(uint16_t *data, uint16_t count) { transmit(DMA_MINC_ENABLE, data, count); }
83+
static void writeMultiple(uint16_t color, uint32_t count) {
84+
while (count > 0) {
85+
transmit(DMA_MINC_DISABLE, &color, count > DMA_MAX_SIZE ? DMA_MAX_SIZE : count);
86+
count = count > DMA_MAX_SIZE ? count - DMA_MAX_SIZE : 0;
8787
}
8888
}
8989
};

‎Marlin/src/HAL/LPC1768/tft/xpt2046.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ uint16_t delta(uint16_t a, uint16_t b) { return a > b ? a - b : b - a; }
4545
}
4646
#endif
4747

48-
void XPT2046::Init() {
48+
void XPT2046::init() {
4949
#if DISABLED(TOUCH_BUTTONS_HW_SPI)
5050
SET_INPUT(TOUCH_MISO_PIN);
5151
SET_OUTPUT(TOUCH_MOSI_PIN);
@@ -85,7 +85,7 @@ bool XPT2046::getRawPoint(int16_t *x, int16_t *y) {
8585
uint16_t XPT2046::getRawData(const XPTCoordinate coordinate) {
8686
uint16_t data[3];
8787

88-
DataTransferBegin();
88+
dataTransferBegin();
8989
TERN_(TOUCH_BUTTONS_HW_SPI, SPIx.begin());
9090

9191
for (uint16_t i = 0; i < 3 ; i++) {
@@ -94,7 +94,7 @@ uint16_t XPT2046::getRawData(const XPTCoordinate coordinate) {
9494
}
9595

9696
TERN_(TOUCH_BUTTONS_HW_SPI, SPIx.end());
97-
DataTransferEnd();
97+
dataTransferEnd();
9898

9999
uint16_t delta01 = delta(data[0], data[1]),
100100
delta02 = delta(data[0], data[2]),
@@ -107,18 +107,18 @@ uint16_t XPT2046::getRawData(const XPTCoordinate coordinate) {
107107
}
108108

109109
uint16_t XPT2046::IO(uint16_t data) {
110-
return TERN(TOUCH_BUTTONS_HW_SPI, HardwareIO, SoftwareIO)(data);
110+
return TERN(TOUCH_BUTTONS_HW_SPI, hardwareIO, softwareIO)(data);
111111
}
112112

113113
extern uint8_t spiTransfer(uint8_t b);
114114

115115
#if ENABLED(TOUCH_BUTTONS_HW_SPI)
116-
uint16_t XPT2046::HardwareIO(uint16_t data) {
116+
uint16_t XPT2046::hardwareIO(uint16_t data) {
117117
return SPIx.transfer(data & 0xFF);
118118
}
119119
#endif
120120

121-
uint16_t XPT2046::SoftwareIO(uint16_t data) {
121+
uint16_t XPT2046::softwareIO(uint16_t data) {
122122
uint16_t result = 0;
123123

124124
for (uint8_t j = 0x80; j; j >>= 1) {

‎Marlin/src/HAL/LPC1768/tft/xpt2046.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ class XPT2046 {
6565
static uint16_t getRawData(const XPTCoordinate coordinate);
6666
static bool isTouched();
6767

68-
static void DataTransferBegin() { WRITE(TOUCH_CS_PIN, LOW); };
69-
static void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
68+
static void dataTransferBegin() { WRITE(TOUCH_CS_PIN, LOW); };
69+
static void dataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
7070
#if ENABLED(TOUCH_BUTTONS_HW_SPI)
71-
static uint16_t HardwareIO(uint16_t data);
71+
static uint16_t hardwareIO(uint16_t data);
7272
#endif
73-
static uint16_t SoftwareIO(uint16_t data);
73+
static uint16_t softwareIO(uint16_t data);
7474
static uint16_t IO(uint16_t data = 0);
7575

7676
public:
7777
#if ENABLED(TOUCH_BUTTONS_HW_SPI)
7878
static SPIClass SPIx;
7979
#endif
8080

81-
static void Init();
81+
static void init();
8282
static bool getRawPoint(int16_t *x, int16_t *y);
8383
};

‎Marlin/src/HAL/NATIVE_SIM/tft/tft_spi.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,28 @@
4040

4141
class TFT_SPI {
4242
private:
43-
static uint32_t ReadID(uint16_t Reg);
44-
static void Transmit(uint16_t Data);
45-
static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
43+
static uint32_t readID(uint16_t reg);
44+
static void transmit(uint16_t data);
45+
static void transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t count);
4646

4747
public:
4848
// static SPIClass SPIx;
4949

50-
static void Init();
51-
static uint32_t GetID();
50+
static void init();
51+
static uint32_t getID();
5252
static bool isBusy();
53-
static void Abort();
53+
static void abort();
5454

55-
static void DataTransferBegin(uint16_t DataWidth=DATASIZE_16BIT);
56-
static void DataTransferEnd();
57-
static void DataTransferAbort();
55+
static void dataTransferBegin(uint16_t dataWidth=DATASIZE_16BIT);
56+
static void dataTransferEnd();
57+
static void dataTransferAbort();
5858

59-
static void WriteData(uint16_t Data);
60-
static void WriteReg(uint16_t Reg);
59+
static void writeData(uint16_t data);
60+
static void writeReg(uint16_t reg);
6161

62-
static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { WriteSequence(Data, Count); }
63-
static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { WriteMultiple(Color, Count); }
62+
static void writeSequence_DMA(uint16_t *data, uint16_t count) { writeSequence(data, count); }
63+
static void writeMultiple_DMA(uint16_t color, uint16_t count) { writeMultiple(color, count); }
6464

65-
static void WriteSequence(uint16_t *Data, uint16_t Count);
66-
static void WriteMultiple(uint16_t Color, uint32_t Count);
65+
static void writeSequence(uint16_t *data, uint16_t count);
66+
static void writeMultiple(uint16_t color, uint32_t count);
6767
};

‎Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ class XPT2046 {
6262
static uint16_t getRawData(const XPTCoordinate coordinate);
6363
static bool isTouched();
6464

65-
static void DataTransferBegin();
66-
static void DataTransferEnd();
65+
static void dataTransferBegin();
66+
static void dataTransferEnd();
6767
#if ENABLED(TOUCH_BUTTONS_HW_SPI)
68-
static uint16_t HardwareIO(uint16_t data);
68+
static uint16_t hardwareIO(uint16_t data);
6969
#endif
70-
static uint16_t SoftwareIO(uint16_t data);
70+
static uint16_t softwareIO(uint16_t data);
7171
static uint16_t IO(uint16_t data = 0);
7272

7373
public:
7474
#if ENABLED(TOUCH_BUTTONS_HW_SPI)
7575
static SPIClass SPIx;
7676
#endif
7777

78-
static void Init();
78+
static void init();
7979
static bool getRawPoint(int16_t *x, int16_t *y);
8080
};

‎Marlin/src/HAL/SAMD21/u8g/u8g_com_HAL_samd21_shared_hw_spi.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060

6161
#ifdef __SAMD21__
6262

63+
#include "../../../inc/MarlinConfigPre.h"
64+
65+
#if HAS_MARLINUI_U8GLIB
66+
6367
#include <U8glib-HAL.h>
6468
#include "SPI.h"
6569

@@ -151,4 +155,6 @@ uint8_t u8g_com_samd21_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val
151155
return 1;
152156
}
153157

158+
#endif // HAS_MARLINUI_U8GLIB
159+
154160
#endif // __SAMD21__

‎Marlin/src/HAL/STM32/HAL.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
#if WITHIN(SERIAL_PORT_2, 1, 6)
7272
#define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
7373
#elif !defined(USBCON)
74-
#error "SERIAL_PORT must be from 1 to 6."
74+
#error "SERIAL_PORT_2 must be from 1 to 6."
7575
#elif SERIAL_PORT_2 == -1
7676
#define MYSERIAL2 MSerialUSB
7777
#else
@@ -83,7 +83,7 @@
8383
#if WITHIN(SERIAL_PORT_3, 1, 6)
8484
#define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
8585
#elif !defined(USBCON)
86-
#error "SERIAL_PORT must be from 1 to 6."
86+
#error "SERIAL_PORT_3 must be from 1 to 6."
8787
#elif SERIAL_PORT_3 == -1
8888
#define MYSERIAL3 MSerialUSB
8989
#else
@@ -95,7 +95,7 @@
9595
#if WITHIN(MMU2_SERIAL_PORT, 1, 6)
9696
#define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
9797
#elif !defined(USBCON)
98-
#error "SERIAL_PORT must be from 1 to 6."
98+
#error "MMU2_SERIAL_PORT must be from 1 to 6."
9999
#elif MMU2_SERIAL_PORT == -1
100100
#define MMU2_SERIAL MSerialUSB
101101
#else
@@ -107,7 +107,7 @@
107107
#if WITHIN(LCD_SERIAL_PORT, 1, 6)
108108
#define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
109109
#elif !defined(USBCON)
110-
#error "SERIAL_PORT must be from 1 to 6."
110+
#error "LCD_SERIAL_PORT must be from 1 to 6."
111111
#elif LCD_SERIAL_PORT == -1
112112
#define LCD_SERIAL MSerialUSB
113113
#else

0 commit comments

Comments
 (0)