From ec91d5a1efb56377ed784a48377521332c0a7e3e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Mar 2023 03:01:15 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20fixes,=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-Authored-By: Martin Turski <turningtides@outlook.de>
---
Marlin/Marlin.ino | 2 +-
Marlin/src/HAL/ESP32/ota.cpp | 2 +-
Marlin/src/core/serial_base.h | 2 ++
Marlin/src/lcd/tft_io/tft_orientation.h | 7 +++----
Marlin/src/libs/numtostr.cpp | 2 +-
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 4 ++--
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Marlin/Marlin.ino b/Marlin/Marlin.ino
index 57c825445fb..744e98c2e31 100644
--- a/Marlin/Marlin.ino
+++ b/Marlin/Marlin.ino
@@ -27,7 +27,7 @@ Configuration
- https://github.com/MarlinFirmware/Configurations
Example configurations for several printer models.
- - https://www.youtube.com/watch?v=3gwWVFtdg-4
+ - https://youtu.be/3gwWVFtdg-4
A good 20-minute overview of Marlin configuration by Tom Sanladerer.
(Applies to Marlin 1.0.x, so Jerk and Acceleration should be halved.)
Also... https://www.google.com/search?tbs=vid%3A1&q=configure+marlin
diff --git a/Marlin/src/HAL/ESP32/ota.cpp b/Marlin/src/HAL/ESP32/ota.cpp
index 69a3e25e563..f31a78c2c51 100644
--- a/Marlin/src/HAL/ESP32/ota.cpp
+++ b/Marlin/src/HAL/ESP32/ota.cpp
@@ -50,7 +50,7 @@ void OTA_init() {
})
.onError([](ota_error_t error) {
Serial.printf("Error[%u]: ", error);
- char *str;
+ const char *str = "unknown";
switch (error) {
case OTA_AUTH_ERROR: str = "Auth Failed"; break;
case OTA_BEGIN_ERROR: str = "Begin Failed"; break;
diff --git a/Marlin/src/core/serial_base.h b/Marlin/src/core/serial_base.h
index a5abd67d872..059b4242849 100644
--- a/Marlin/src/core/serial_base.h
+++ b/Marlin/src/core/serial_base.h
@@ -23,6 +23,8 @@
#include "../inc/MarlinConfigPre.h"
+#include <stddef.h> // for size_t
+
#if ENABLED(EMERGENCY_PARSER)
#include "../feature/e_parser.h"
#endif
diff --git a/Marlin/src/lcd/tft_io/tft_orientation.h b/Marlin/src/lcd/tft_io/tft_orientation.h
index 7822fc6b04f..c2c86435b2c 100644
--- a/Marlin/src/lcd/tft_io/tft_orientation.h
+++ b/Marlin/src/lcd/tft_io/tft_orientation.h
@@ -59,9 +59,9 @@
#define TFT_COLOR_BGR _BV32(4)
// Each TFT Driver is responsible for its default color mode.
-// #ifndef TFT_COLOR
-// #define TFT_COLOR TFT_COLOR_RGB
-// #endif
+//#ifndef TFT_COLOR
+// #define TFT_COLOR TFT_COLOR_RGB
+//#endif
#define TOUCH_ORIENTATION_NONE 0
#define TOUCH_LANDSCAPE 1
@@ -82,4 +82,3 @@
#ifndef TOUCH_ORIENTATION
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif
-
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index c28d1246d69..4cc40a96d17 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -28,7 +28,7 @@
char conv[9] = { 0 };
#define DIGIT(n) ('0' + (n))
-#define DIGIMOD(n, f) DIGIT((n)/(f) % 10)
+#define DIGIMOD(n, f) DIGIT(((n)/(f)) % 10)
#define RJDIGIT(n, f) ((n) >= (f) ? DIGIMOD(n, f) : ' ')
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
#define INTFLOAT(V,N) (((V) * 10 * pow(10, N) + ((V) < 0 ? -5: 5)) / 10) // pow10?
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 0df70d72927..9c5836dc741 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -93,7 +93,7 @@
#define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN
// Reduce baud rate to improve software serial reliability
- #define TMC_BAUD_RATE 19200
+ #define TMC_BAUD_RATE 19200
#endif
//
@@ -214,7 +214,7 @@
#define FORCE_SOFT_SPI // SPI MODE3
- #define LED_PIN EXP1_06_PIN // red pwm
+ #define LED_PIN EXP1_06_PIN // red pwm
//#define LED_PIN EXP1_07_PIN // green
//#define LED_PIN EXP1_08_PIN // blue