MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🎨 misc. cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2022-04-21 07:08:26 -05:00 committed by Scott Lahteine
parent e667d4e6e4
commit a81fd009f0
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
View File

@ -38,13 +38,13 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void u8g_SetPinOutput(uint8_t internal_pin_number){SET_DIR_OUTPUT(internal_pin_number);}
void u8g_SetPinInput(uint8_t internal_pin_number){SET_DIR_INPUT(internal_pin_number);} void u8g_SetPinOutput(uint8_t internal_pin_number) { SET_DIR_OUTPUT(internal_pin_number); }
void u8g_SetPinLevel(uint8_t pin, uint8_t pin_status){WRITE_PIN(pin, pin_status);} void u8g_SetPinInput(uint8_t internal_pin_number) { SET_DIR_INPUT(internal_pin_number); }
uint8_t u8g_GetPinLevel(uint8_t pin){return READ_PIN(pin);} void u8g_SetPinLevel(uint8_t pin, uint8_t pin_status) { WRITE_PIN(pin, pin_status); }
void usleep(uint64_t microsec){ uint8_t u8g_GetPinLevel(uint8_t pin) { return READ_PIN(pin); }
assert(false); // why we here? void usleep(uint64_t microsec) { assert(false); /* why we here? */ }
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

10
Marlin/src/HAL/STM32/timers.cpp
View File

@ -303,16 +303,16 @@ enum TimerPurpose { TP_SERIAL, TP_TONE, TP_SERVO, TP_STEP, TP_TEMP };
// This cannot yet account for timers used for PWM output, such as for fans. // This cannot yet account for timers used for PWM output, such as for fans.
static constexpr struct { TimerPurpose p; int t; } timers_in_use[] = { static constexpr struct { TimerPurpose p; int t; } timers_in_use[] = {
#if HAS_TMC_SW_SERIAL #if HAS_TMC_SW_SERIAL
{TP_SERIAL, get_timer_num_from_base_address(timer_serial[0])}, // Set in variant.h, or as a define in platformio.h if not present in variant.h { TP_SERIAL, get_timer_num_from_base_address(timer_serial[0]) }, // Set in variant.h, or as a define in platformio.h if not present in variant.h
#endif #endif
#if ENABLED(SPEAKER) #if ENABLED(SPEAKER)
{TP_TONE, get_timer_num_from_base_address(timer_tone[0])}, // Set in variant.h, or as a define in platformio.h if not present in variant.h { TP_TONE, get_timer_num_from_base_address(timer_tone[0]) }, // Set in variant.h, or as a define in platformio.h if not present in variant.h
#endif #endif
#if HAS_SERVOS #if HAS_SERVOS
{TP_SERVO, get_timer_num_from_base_address(timer_servo[0])}, // Set in variant.h, or as a define in platformio.h if not present in variant.h { TP_SERVO, get_timer_num_from_base_address(timer_servo[0]) }, // Set in variant.h, or as a define in platformio.h if not present in variant.h
#endif #endif
{TP_STEP, STEP_TIMER}, { TP_STEP, STEP_TIMER },
{TP_TEMP, TEMP_TIMER}, { TP_TEMP, TEMP_TIMER },
}; };
static constexpr bool verify_no_timer_conflicts() { static constexpr bool verify_no_timer_conflicts() {

1
Marlin/src/module/motion.cpp
View File

@ -237,7 +237,6 @@ void report_current_position_projected() {
} }
#if ENABLED(AUTO_REPORT_POSITION) #if ENABLED(AUTO_REPORT_POSITION)
//struct PositionReport { void report() { report_current_position_projected(); } };
AutoReporter<PositionReport> position_auto_reporter; AutoReporter<PositionReport> position_auto_reporter;
#endif #endif