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

🎨 Clean up after recent PRs

Browse Source
This commit is contained in:
Scott Lahteine
2024-04-22 18:58:53 -05:00
parent 31683ce35b
commit a955e06259
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/HC32/MarlinSerial.h
View File

@@ -31,8 +31,8 @@
struct MarlinSerial : public Usart { struct MarlinSerial : public Usart {
MarlinSerial( MarlinSerial(
struct usart_config_t *usart_device, struct usart_config_t *usart_device,
gpio_pin_t tx_pin, gpio_pin_t tx_pin,
gpio_pin_t rx_pin gpio_pin_t rx_pin
#if ENABLED(SERIAL_DMA) #if ENABLED(SERIAL_DMA)
, M4_DMA_TypeDef *dma_unit = nullptr, , M4_DMA_TypeDef *dma_unit = nullptr,

4
Marlin/src/HAL/HC32/app_config.h
View File

@@ -1,6 +1,6 @@
/** /**
* app_config.h is included by the hc32f460 arduino build script for every source file. * app_config.h is included by the hc32f460 arduino build script for every source file.
* it is used to configure the arduino core (and ddl) automatically according * it is used to configure the arduino core (and ddl) automatically according
* to the settings in Configuration.h and Configuration_adv.h. * to the settings in Configuration.h and Configuration_adv.h.
*/ */
#pragma once #pragma once
@@ -44,7 +44,7 @@
#define DISABLE_SERIAL_GLOBALS 1 #define DISABLE_SERIAL_GLOBALS 1
// increase the size of the Usart buffers (both RX and TX) // increase the size of the Usart buffers (both RX and TX)
// NOTE: // NOTE:
// the heap usage will increase by (SERIAL_BUFFER_SIZE - 64) * "number of serial ports used" // the heap usage will increase by (SERIAL_BUFFER_SIZE - 64) * "number of serial ports used"
// if running out of heap, the system may become unstable // if running out of heap, the system may become unstable
//#define SERIAL_BUFFER_SIZE 256 //#define SERIAL_BUFFER_SIZE 256

2
Marlin/src/HAL/HC32/inc/SanityCheck.h
View File

@@ -30,7 +30,7 @@
#endif #endif
#if ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 1, 0) #if ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 1, 0)
// because we use app_config.h introduced in arduino core version 1.1.0, the // because we use app_config.h introduced in arduino core version 1.1.0, the
// HAL is not compatible with older versions // HAL is not compatible with older versions
#error "The HC32 HAL is not compatible with Arduino Core versions < 1.1.0. Consider updating the Arduino Core." #error "The HC32 HAL is not compatible with Arduino Core versions < 1.1.0. Consider updating the Arduino Core."
#endif #endif

4
Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View File

@@ -377,10 +377,10 @@ void MarlinUI::draw_kill_screen() {
void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
#if HAS_DISPLAY_SLEEP #if HAS_DISPLAY_SLEEP
void MarlinUI::sleep_display(const bool sleep/*=true*/) { void MarlinUI::sleep_display(const bool sleep/*=true*/) {
static bool asleep = false; static bool asleep = false;
if (asleep != sleep){ if (asleep != sleep){
sleep ? u8g.sleepOn() : u8g.sleepOff(); sleep ? u8g.sleepOn() : u8g.sleepOff();
asleep = sleep; asleep = sleep;
} }
} }

2
Marlin/tests/core/test_macros.cpp
View File

@@ -557,7 +557,7 @@ MARLIN_TEST(macros_options, OPTITEM) {
MARLIN_TEST(macros_options, OPTARG) { MARLIN_TEST(macros_options, OPTARG) {
int enabledArgs[] = {0 OPTARG(OPTION_ENABLED, 1, 2)}; int enabledArgs[] = {0 OPTARG(OPTION_ENABLED, 1, 2)};
int disabledArgs[] = {0 OPTARG(OPTION_DISABLED, 1, 2)}; int disabledArgs[] = {0 OPTARG(OPTION_DISABLED, 1, 2)};
int sumEnabledArgs = 0; int sumEnabledArgs = 0;
for (const auto& arg : enabledArgs) { for (const auto& arg : enabledArgs) {
sumEnabledArgs += arg; sumEnabledArgs += arg;

2
ini/hc32.ini
View File

@@ -34,7 +34,7 @@ build_type = release
build_flags = build_flags =
-D ARDUINO_ARCH_HC32 -D ARDUINO_ARCH_HC32
-D PLATFORM_M997_SUPPORT # Enable M997 command -D PLATFORM_M997_SUPPORT # Enable M997 command
# note: ddl and arduino debug mode are # note: ddl and arduino debug mode are
# automatically enabled with MARLIN_DEV_MODE # automatically enabled with MARLIN_DEV_MODE
#-D __DEBUG # force DDL debug mode #-D __DEBUG # force DDL debug mode
#-D __CORE_DEBUG # force Arduino core debug mode #-D __CORE_DEBUG # force Arduino core debug mode

2
ini/native.ini
View File

@@ -32,7 +32,7 @@ extra_scripts = ${common.extra_scripts}
build_src_filter = ${env:linux_native.build_src_filter} +<tests> build_src_filter = ${env:linux_native.build_src_filter} +<tests>
lib_deps = throwtheswitch/Unity@^2.5.2 lib_deps = throwtheswitch/Unity@^2.5.2
test_build_src = true test_build_src = true
build_unflags = build_unflags =
build_flags = ${env:linux_native.build_flags} -Werror build_flags = ${env:linux_native.build_flags} -Werror
# #