sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 Misc. fixes, cleanup

Browse Source 
Co-Authored-By: Martin Turski <turningtides@outlook.de>
This commit is contained in:
Scott Lahteine
2023-03-24 03:01:15 -05:00
parent 8b6155deee
commit ec91d5a1ef
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.ino
View File

@@ -27,7 +27,7 @@ Configuration
- https://github.com/MarlinFirmware/Configurations - https://github.com/MarlinFirmware/Configurations
Example configurations for several printer models. 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. A good 20-minute overview of Marlin configuration by Tom Sanladerer.
(Applies to Marlin 1.0.x, so Jerk and Acceleration should be halved.) (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 Also... https://www.google.com/search?tbs=vid%3A1&q=configure+marlin

2
Marlin/src/HAL/ESP32/ota.cpp
View File

@@ -50,7 +50,7 @@ void OTA_init() {
}) })
.onError([](ota_error_t error) { .onError([](ota_error_t error) {
Serial.printf("Error[%u]: ", error); Serial.printf("Error[%u]: ", error);
char *str; const char *str = "unknown";
switch (error) { switch (error) {
case OTA_AUTH_ERROR: str = "Auth Failed"; break; case OTA_AUTH_ERROR: str = "Auth Failed"; break;
case OTA_BEGIN_ERROR: str = "Begin Failed"; break; case OTA_BEGIN_ERROR: str = "Begin Failed"; break;

2
Marlin/src/core/serial_base.h
View File

@@ -23,6 +23,8 @@
#include "../inc/MarlinConfigPre.h" #include "../inc/MarlinConfigPre.h"
#include <stddef.h> // for size_t
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)
#include "../feature/e_parser.h" #include "../feature/e_parser.h"
#endif #endif

5
Marlin/src/lcd/tft_io/tft_orientation.h
View File

@@ -59,9 +59,9 @@
#define TFT_COLOR_BGR _BV32(4) #define TFT_COLOR_BGR _BV32(4)
// Each TFT Driver is responsible for its default color mode. // Each TFT Driver is responsible for its default color mode.
// #ifndef TFT_COLOR //#ifndef TFT_COLOR
// #define TFT_COLOR TFT_COLOR_RGB // #define TFT_COLOR TFT_COLOR_RGB
// #endif //#endif
#define TOUCH_ORIENTATION_NONE 0 #define TOUCH_ORIENTATION_NONE 0
#define TOUCH_LANDSCAPE 1 #define TOUCH_LANDSCAPE 1
@@ -82,4 +82,3 @@
#ifndef TOUCH_ORIENTATION #ifndef TOUCH_ORIENTATION
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE #define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif #endif

2
Marlin/src/libs/numtostr.cpp
View File

@@ -28,7 +28,7 @@
char conv[9] = { 0 }; char conv[9] = { 0 };
#define DIGIT(n) ('0' + (n)) #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 RJDIGIT(n, f) ((n) >= (f) ? DIGIMOD(n, f) : ' ')
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-')) #define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
#define INTFLOAT(V,N) (((V) * 10 * pow(10, N) + ((V) < 0 ? -5: 5)) / 10) // pow10? #define INTFLOAT(V,N) (((V) * 10 * pow(10, N) + ((V) < 0 ? -5: 5)) / 10) // pow10?