SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Drop C-style 'void' argument

Browse source
This commit is contained in:
Scott Lahteine 2019-09-16 20:31:08 -05:00
parent 7d8c38693f
commit f01f0d1956
174 changed files with 864 additions and 864 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HAL_AVR/HAL.cpp
View file

@ -35,7 +35,7 @@
// Public functions // Public functions
// ------------------------ // ------------------------
void HAL_init(void) { void HAL_init() {
// Init Servo Pins // Init Servo Pins
#define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW) #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
#if HAS_SERVO_0 #if HAS_SERVO_0

28
Marlin/src/HAL/HAL_AVR/HAL.h
View file

@ -105,19 +105,19 @@ typedef int8_t pin_t;
// Public functions // Public functions
// ------------------------ // ------------------------
void HAL_init(void); void HAL_init();
//void cli(void); //void cli();
//void _delay_ms(const int delay); //void _delay_ms(const int delay);
inline void HAL_clear_reset_source(void) { MCUSR = 0; } inline void HAL_clear_reset_source() { MCUSR = 0; }
inline uint8_t HAL_get_reset_source(void) { return MCUSR; } inline uint8_t HAL_get_reset_source() { return MCUSR; }
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
extern "C" { extern "C" {
int freeMemory(void); int freeMemory();
} }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
@ -199,9 +199,9 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t freque
/* 18 cycles maximum latency */ /* 18 cycles maximum latency */
#define HAL_STEP_TIMER_ISR() \ #define HAL_STEP_TIMER_ISR() \
extern "C" void TIMER1_COMPA_vect(void) __attribute__ ((signal, naked, used, externally_visible)); \ extern "C" void TIMER1_COMPA_vect() __attribute__ ((signal, naked, used, externally_visible)); \
extern "C" void TIMER1_COMPA_vect_bottom(void) asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \ extern "C" void TIMER1_COMPA_vect_bottom() asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
void TIMER1_COMPA_vect(void) { \ void TIMER1_COMPA_vect() { \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
A("push r16") /* 2 Save R16 */ \ A("push r16") /* 2 Save R16 */ \
A("in r16, __SREG__") /* 1 Get SREG */ \ A("in r16, __SREG__") /* 1 Get SREG */ \
@ -268,13 +268,13 @@ void TIMER1_COMPA_vect(void) { \
: \ : \
); \ ); \
} \ } \
void TIMER1_COMPA_vect_bottom(void) void TIMER1_COMPA_vect_bottom()
/* 14 cycles maximum latency */ /* 14 cycles maximum latency */
#define HAL_TEMP_TIMER_ISR() \ #define HAL_TEMP_TIMER_ISR() \
extern "C" void TIMER0_COMPB_vect(void) __attribute__ ((signal, naked, used, externally_visible)); \ extern "C" void TIMER0_COMPB_vect() __attribute__ ((signal, naked, used, externally_visible)); \
extern "C" void TIMER0_COMPB_vect_bottom(void) asm ("TIMER0_COMPB_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \ extern "C" void TIMER0_COMPB_vect_bottom() asm ("TIMER0_COMPB_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
void TIMER0_COMPB_vect(void) { \ void TIMER0_COMPB_vect() { \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
A("push r16") /* 2 Save R16 */ \ A("push r16") /* 2 Save R16 */ \
A("in r16, __SREG__") /* 1 Get SREG */ \ A("in r16, __SREG__") /* 1 Get SREG */ \
@ -334,7 +334,7 @@ void TIMER0_COMPB_vect(void) { \
: \ : \
); \ ); \
} \ } \
void TIMER0_COMPB_vect_bottom(void) void TIMER0_COMPB_vect_bottom()
// ADC // ADC
#ifdef DIDR2 #ifdef DIDR2
@ -343,7 +343,7 @@ void TIMER0_COMPB_vect_bottom(void)
#define HAL_ANALOG_SELECT(pin) do{ SBI(DIDR0, pin); }while(0) #define HAL_ANALOG_SELECT(pin) do{ SBI(DIDR0, pin); }while(0)
#endif #endif
inline void HAL_adc_init(void) { inline void HAL_adc_init() {
ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07; ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
DIDR0 = 0; DIDR0 = 0;
#ifdef DIDR2 #ifdef DIDR2

4
Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
View file

@ -33,7 +33,7 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
void spiBegin(void) { void spiBegin() {
OUT_WRITE(SS_PIN, HIGH); OUT_WRITE(SS_PIN, HIGH);
SET_OUTPUT(SCK_PIN); SET_OUTPUT(SCK_PIN);
SET_INPUT(MISO_PIN); SET_INPUT(MISO_PIN);
@ -81,7 +81,7 @@ void spiBegin(void) {
} }
/** SPI receive a byte */ /** SPI receive a byte */
uint8_t spiRec(void) { uint8_t spiRec() {
SPDR = 0xFF; SPDR = 0xFF;
while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ } while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
return SPDR; return SPDR;

14
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
View file

@ -271,7 +271,7 @@
// (called with TX irqs disabled) // (called with TX irqs disabled)
template<typename Cfg> template<typename Cfg>
FORCE_INLINE void MarlinSerial<Cfg>::_tx_udr_empty_irq(void) { FORCE_INLINE void MarlinSerial<Cfg>::_tx_udr_empty_irq() {
if (Cfg::TX_SIZE > 0) { if (Cfg::TX_SIZE > 0) {
// Read positions // Read positions
uint8_t t = tx_buffer.tail; uint8_t t = tx_buffer.tail;
@ -363,13 +363,13 @@
} }
template<typename Cfg> template<typename Cfg>
int MarlinSerial<Cfg>::peek(void) { int MarlinSerial<Cfg>::peek() {
const ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail; const ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail;
return h == t ? -1 : rx_buffer.buffer[t]; return h == t ? -1 : rx_buffer.buffer[t];
} }
template<typename Cfg> template<typename Cfg>
int MarlinSerial<Cfg>::read(void) { int MarlinSerial<Cfg>::read() {
const ring_buffer_pos_t h = atomic_read_rx_head(); const ring_buffer_pos_t h = atomic_read_rx_head();
// Read the tail. Main thread owns it, so it is safe to directly read it // Read the tail. Main thread owns it, so it is safe to directly read it
@ -412,13 +412,13 @@
} }
template<typename Cfg> template<typename Cfg>
typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::available(void) { typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::available() {
const ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail; const ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail;
return (ring_buffer_pos_t)(Cfg::RX_SIZE + h - t) & (Cfg::RX_SIZE - 1); return (ring_buffer_pos_t)(Cfg::RX_SIZE + h - t) & (Cfg::RX_SIZE - 1);
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::flush(void) { void MarlinSerial<Cfg>::flush() {
// Set the tail to the head: // Set the tail to the head:
// - Read the RX head index in a safe way. (See atomic_read_rx_head.) // - Read the RX head index in a safe way. (See atomic_read_rx_head.)
@ -505,7 +505,7 @@
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::flushTX(void) { void MarlinSerial<Cfg>::flushTX() {
if (Cfg::TX_SIZE == 0) { if (Cfg::TX_SIZE == 0) {
// No bytes written, no need to flush. This special case is needed since there's // No bytes written, no need to flush. This special case is needed since there's
@ -595,7 +595,7 @@
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::println(void) { void MarlinSerial<Cfg>::println() {
print('\r'); print('\r');
print('\n'); print('\n');
} }

14
Marlin/src/HAL/HAL_AVR/MarlinSerial.h
View file

@ -205,18 +205,18 @@
public: public:
FORCE_INLINE static void store_rxd_char(); FORCE_INLINE static void store_rxd_char();
FORCE_INLINE static void _tx_udr_empty_irq(void); FORCE_INLINE static void _tx_udr_empty_irq();
public: public:
MarlinSerial() {}; MarlinSerial() {};
static void begin(const long); static void begin(const long);
static void end(); static void end();
static int peek(void); static int peek();
static int read(void); static int read();
static void flush(void); static void flush();
static ring_buffer_pos_t available(void); static ring_buffer_pos_t available();
static void write(const uint8_t c); static void write(const uint8_t c);
static void flushTX(void); static void flushTX();
FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; } FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; }
FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; } FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; }
@ -245,7 +245,7 @@
static void println(long, int = DEC); static void println(long, int = DEC);
static void println(unsigned long, int = DEC); static void println(unsigned long, int = DEC);
static void println(double, int = 2); static void println(double, int = 2);
static void println(void); static void println();
operator bool() { return true; } operator bool() { return true; }
private: private:

4
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
View file

@ -41,7 +41,7 @@
#include <stdint.h> #include <stdint.h>
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
/** /**
* Patch for pins_arduino.h (...\Arduino\hardware\arduino\avr\variants\mega\pins_arduino.h) * Patch for pins_arduino.h (...\Arduino\hardware\arduino\avr\variants\mega\pins_arduino.h)
@ -102,7 +102,7 @@ void pciSetup(const int8_t pin) {
ISR(PCINT3_vect, ISR_ALIASOF(PCINT0_vect)); ISR(PCINT3_vect, ISR_ALIASOF(PCINT0_vect));
#endif #endif
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE) #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
#if HAS_X_MAX #if HAS_X_MAX
#if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT) #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT)

18
Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
View file

@ -42,7 +42,7 @@
#define sw_barrier() __asm__ volatile("": : :"memory"); #define sw_barrier() __asm__ volatile("": : :"memory");
// (re)initialize UART0 as a monitor output to 250000,n,8,1 // (re)initialize UART0 as a monitor output to 250000,n,8,1
static void TXBegin(void) { static void TXBegin() {
// Disable UART interrupt in NVIC // Disable UART interrupt in NVIC
NVIC_DisableIRQ( UART_IRQn ); NVIC_DisableIRQ( UART_IRQn );
@ -235,7 +235,7 @@ void HardFault_HandlerC(unsigned long *sp, unsigned long lr, unsigned long cause
for (;;) WDT_Restart(WDT); for (;;) WDT_Restart(WDT);
} }
__attribute__((naked)) void NMI_Handler(void) { __attribute__((naked)) void NMI_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -248,7 +248,7 @@ __attribute__((naked)) void NMI_Handler(void) {
); );
} }
__attribute__((naked)) void HardFault_Handler(void) { __attribute__((naked)) void HardFault_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -261,7 +261,7 @@ __attribute__((naked)) void HardFault_Handler(void) {
); );
} }
__attribute__((naked)) void MemManage_Handler(void) { __attribute__((naked)) void MemManage_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -274,7 +274,7 @@ __attribute__((naked)) void MemManage_Handler(void) {
); );
} }
__attribute__((naked)) void BusFault_Handler(void) { __attribute__((naked)) void BusFault_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -287,7 +287,7 @@ __attribute__((naked)) void BusFault_Handler(void) {
); );
} }
__attribute__((naked)) void UsageFault_Handler(void) { __attribute__((naked)) void UsageFault_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -300,7 +300,7 @@ __attribute__((naked)) void UsageFault_Handler(void) {
); );
} }
__attribute__((naked)) void DebugMon_Handler(void) { __attribute__((naked)) void DebugMon_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -314,7 +314,7 @@ __attribute__((naked)) void DebugMon_Handler(void) {
} }
/* This is NOT an exception, it is an interrupt handler - Nevertheless, the framing is the same */ /* This is NOT an exception, it is an interrupt handler - Nevertheless, the framing is the same */
__attribute__((naked)) void WDT_Handler(void) { __attribute__((naked)) void WDT_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -327,7 +327,7 @@ __attribute__((naked)) void WDT_Handler(void) {
); );
} }
__attribute__((naked)) void RSTC_Handler(void) { __attribute__((naked)) void RSTC_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")

2
Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
View file

@ -993,7 +993,7 @@ void eeprom_read_block(void* __dst, const void* __src, size_t __n) {
} }
} }
void eeprom_flush(void) { void eeprom_flush() {
ee_Flush(); ee_Flush();
} }

14
Marlin/src/HAL/HAL_DUE/HAL.cpp
View file

@ -42,7 +42,7 @@ uint16_t HAL_adc_result;
// ------------------------ // ------------------------
// HAL initialization task // HAL initialization task
void HAL_init(void) { void HAL_init() {
// Initialize the USB stack // Initialize the USB stack
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up
@ -51,20 +51,20 @@ void HAL_init(void) {
} }
// HAL idle task // HAL idle task
void HAL_idletask(void) { void HAL_idletask() {
// Perform USB stack housekeeping // Perform USB stack housekeeping
usb_task_idle(); usb_task_idle();
} }
// Disable interrupts // Disable interrupts
void cli(void) { noInterrupts(); } void cli() { noInterrupts(); }
// Enable interrupts // Enable interrupts
void sei(void) { interrupts(); } void sei() { interrupts(); }
void HAL_clear_reset_source(void) { } void HAL_clear_reset_source() { }
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
switch ((RSTC->RSTC_SR >> 8) & 0x07) { switch ((RSTC->RSTC_SR >> 8) & 0x07) {
case 0: return RST_POWER_ON; case 0: return RST_POWER_ON;
case 1: return RST_BACKUP; case 1: return RST_BACKUP;
@ -98,7 +98,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
HAL_adc_result = analogRead(adc_pin); HAL_adc_result = analogRead(adc_pin);
} }
uint16_t HAL_adc_get_result(void) { uint16_t HAL_adc_get_result() {
// nop // nop
return HAL_adc_result; return HAL_adc_result;
} }

18
Marlin/src/HAL/HAL_DUE/HAL.h
View file

@ -88,11 +88,11 @@ typedef int8_t pin_t;
#define ENABLE_ISRS() __enable_irq() #define ENABLE_ISRS() __enable_irq()
#define DISABLE_ISRS() __disable_irq() #define DISABLE_ISRS() __disable_irq()
void cli(void); // Disable interrupts void cli(); // Disable interrupts
void sei(void); // Enable interrupts void sei(); // Enable interrupts
void HAL_clear_reset_source(void); // clear reset reason void HAL_clear_reset_source(); // clear reset reason
uint8_t HAL_get_reset_source(void); // get reset reason uint8_t HAL_get_reset_source(); // get reset reason
// //
// EEPROM // EEPROM
@ -113,14 +113,14 @@ extern uint16_t HAL_adc_result; // result of last ADC conversion
#define HAL_ANALOG_SELECT(pin) #define HAL_ANALOG_SELECT(pin)
inline void HAL_adc_init(void) {}//todo inline void HAL_adc_init() {}//todo
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin) #define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result #define HAL_READ_ADC() HAL_adc_result
#define HAL_ADC_READY() true #define HAL_ADC_READY() true
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
// //
// Pin Map // Pin Map
@ -138,8 +138,8 @@ void noTone(const pin_t _pin);
// Enable hooks into idle and setup for HAL // Enable hooks into idle and setup for HAL
#define HAL_IDLETASK 1 #define HAL_IDLETASK 1
void HAL_idletask(void); void HAL_idletask();
void HAL_init(void); void HAL_init();
// //
// Utility functions // Utility functions
@ -148,7 +148,7 @@ void _delay_ms(const int delay);
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
int freeMemory(void); int freeMemory();
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#ifdef __cplusplus #ifdef __cplusplus

2
Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
View file

@ -48,7 +48,7 @@ static DeviceVectors ram_tab = { nullptr };
* If it is not, then it copies the ROM table to the SRAM and relocates the table * If it is not, then it copies the ROM table to the SRAM and relocates the table
* by reprogramming the NVIC registers * by reprogramming the NVIC registers
*/ */
static pfnISR_Handler* get_relocated_table_addr(void) { static pfnISR_Handler* get_relocated_table_addr() {
// Get the address of the interrupt/exception table // Get the address of the interrupt/exception table
uint32_t isrtab = SCB->VTOR; uint32_t isrtab = SCB->VTOR;

2
Marlin/src/HAL/HAL_DUE/InterruptVectors.h
View file

@ -37,7 +37,7 @@
#ifdef ARDUINO_ARCH_SAM #ifdef ARDUINO_ARCH_SAM
// ISR handler type // ISR handler type
typedef void (*pfnISR_Handler)(void); typedef void (*pfnISR_Handler)();
// Install a new interrupt vector handler for the given irq, returning the old one // Install a new interrupt vector handler for the given irq, returning the old one
pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler); pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler);

16
Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
View file

@ -178,7 +178,7 @@ FORCE_INLINE void MarlinSerial<Cfg>::store_rxd_char() {
} }
template<typename Cfg> template<typename Cfg>
FORCE_INLINE void MarlinSerial<Cfg>::_tx_thr_empty_irq(void) { FORCE_INLINE void MarlinSerial<Cfg>::_tx_thr_empty_irq() {
if (Cfg::TX_SIZE > 0) { if (Cfg::TX_SIZE > 0) {
// Read positions // Read positions
uint8_t t = tx_buffer.tail; uint8_t t = tx_buffer.tail;
@ -221,7 +221,7 @@ FORCE_INLINE void MarlinSerial<Cfg>::_tx_thr_empty_irq(void) {
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::UART_ISR(void) { void MarlinSerial<Cfg>::UART_ISR() {
const uint32_t status = HWUART->UART_SR; const uint32_t status = HWUART->UART_SR;
// Data received? // Data received?
@ -308,13 +308,13 @@ void MarlinSerial<Cfg>::end() {
} }
template<typename Cfg> template<typename Cfg>
int MarlinSerial<Cfg>::peek(void) { int MarlinSerial<Cfg>::peek() {
const int v = rx_buffer.head == rx_buffer.tail ? -1 : rx_buffer.buffer[rx_buffer.tail]; const int v = rx_buffer.head == rx_buffer.tail ? -1 : rx_buffer.buffer[rx_buffer.tail];
return v; return v;
} }
template<typename Cfg> template<typename Cfg>
int MarlinSerial<Cfg>::read(void) { int MarlinSerial<Cfg>::read() {
const ring_buffer_pos_t h = rx_buffer.head; const ring_buffer_pos_t h = rx_buffer.head;
ring_buffer_pos_t t = rx_buffer.tail; ring_buffer_pos_t t = rx_buffer.tail;
@ -354,13 +354,13 @@ int MarlinSerial<Cfg>::read(void) {
} }
template<typename Cfg> template<typename Cfg>
typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::available(void) { typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::available() {
const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail; const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail;
return (ring_buffer_pos_t)(Cfg::RX_SIZE + h - t) & (Cfg::RX_SIZE - 1); return (ring_buffer_pos_t)(Cfg::RX_SIZE + h - t) & (Cfg::RX_SIZE - 1);
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::flush(void) { void MarlinSerial<Cfg>::flush() {
rx_buffer.tail = rx_buffer.head; rx_buffer.tail = rx_buffer.head;
if (Cfg::XONOFF) { if (Cfg::XONOFF) {
@ -431,7 +431,7 @@ void MarlinSerial<Cfg>::write(const uint8_t c) {
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::flushTX(void) { void MarlinSerial<Cfg>::flushTX() {
// TX // TX
if (Cfg::TX_SIZE == 0) { if (Cfg::TX_SIZE == 0) {
@ -520,7 +520,7 @@ void MarlinSerial<Cfg>::print(double n, int digits) {
} }
template<typename Cfg> template<typename Cfg>
void MarlinSerial<Cfg>::println(void) { void MarlinSerial<Cfg>::println() {
print('\r'); print('\r');
print('\n'); print('\n');
} }

16
Marlin/src/HAL/HAL_DUE/MarlinSerial.h
View file

@ -108,19 +108,19 @@ protected:
static ring_buffer_pos_t rx_max_enqueued; static ring_buffer_pos_t rx_max_enqueued;
FORCE_INLINE static void store_rxd_char(); FORCE_INLINE static void store_rxd_char();
FORCE_INLINE static void _tx_thr_empty_irq(void); FORCE_INLINE static void _tx_thr_empty_irq();
static void UART_ISR(void); static void UART_ISR();
public: public:
MarlinSerial() {}; MarlinSerial() {};
static void begin(const long); static void begin(const long);
static void end(); static void end();
static int peek(void); static int peek();
static int read(void); static int read();
static void flush(void); static void flush();
static ring_buffer_pos_t available(void); static ring_buffer_pos_t available();
static void write(const uint8_t c); static void write(const uint8_t c);
static void flushTX(void); static void flushTX();
FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; } FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; }
FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; } FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; }
@ -149,7 +149,7 @@ public:
static void println(long, int = DEC); static void println(long, int = DEC);
static void println(unsigned long, int = DEC); static void println(unsigned long, int = DEC);
static void println(double, int = 2); static void println(double, int = 2);
static void println(void); static void println();
operator bool() { return true; } operator bool() { return true; }
private: private:

22
Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
View file

@ -39,11 +39,11 @@
// Imports from Atmel USB Stack/CDC implementation // Imports from Atmel USB Stack/CDC implementation
extern "C" { extern "C" {
bool usb_task_cdc_isenabled(void); bool usb_task_cdc_isenabled();
bool usb_task_cdc_dtr_active(void); bool usb_task_cdc_dtr_active();
bool udi_cdc_is_rx_ready(void); bool udi_cdc_is_rx_ready();
int udi_cdc_getc(void); int udi_cdc_getc();
bool udi_cdc_is_tx_ready(void); bool udi_cdc_is_tx_ready();
int udi_cdc_putc(int value); int udi_cdc_putc(int value);
}; };
@ -62,7 +62,7 @@ void MarlinSerialUSB::begin(const long baud_setting) {
void MarlinSerialUSB::end() { void MarlinSerialUSB::end() {
} }
int MarlinSerialUSB::peek(void) { int MarlinSerialUSB::peek() {
if (pending_char >= 0) if (pending_char >= 0)
return pending_char; return pending_char;
@ -83,7 +83,7 @@ int MarlinSerialUSB::peek(void) {
return pending_char; return pending_char;
} }
int MarlinSerialUSB::read(void) { int MarlinSerialUSB::read() {
if (pending_char >= 0) { if (pending_char >= 0) {
int ret = pending_char; int ret = pending_char;
pending_char = -1; pending_char = -1;
@ -107,7 +107,7 @@ int MarlinSerialUSB::read(void) {
return c; return c;
} }
bool MarlinSerialUSB::available(void) { bool MarlinSerialUSB::available() {
/* If Pending chars */ /* If Pending chars */
return pending_char >= 0 || return pending_char >= 0 ||
/* or USB CDC enumerated and configured on the PC side and some /* or USB CDC enumerated and configured on the PC side and some
@ -115,8 +115,8 @@ bool MarlinSerialUSB::available(void) {
(usb_task_cdc_isenabled() && udi_cdc_is_rx_ready()); (usb_task_cdc_isenabled() && udi_cdc_is_rx_ready());
} }
void MarlinSerialUSB::flush(void) { } void MarlinSerialUSB::flush() { }
void MarlinSerialUSB::flushTX(void) { } void MarlinSerialUSB::flushTX() { }
void MarlinSerialUSB::write(const uint8_t c) { void MarlinSerialUSB::write(const uint8_t c) {
@ -186,7 +186,7 @@ void MarlinSerialUSB::print(double n, int digits) {
printFloat(n, digits); printFloat(n, digits);
} }
void MarlinSerialUSB::println(void) { void MarlinSerialUSB::println() {
print('\r'); print('\r');
print('\n'); print('\n');
} }

12
Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
View file

@ -43,11 +43,11 @@ public:
MarlinSerialUSB() {}; MarlinSerialUSB() {};
static void begin(const long); static void begin(const long);
static void end(); static void end();
static int peek(void); static int peek();
static int read(void); static int read();
static void flush(void); static void flush();
static void flushTX(void); static void flushTX();
static bool available(void); static bool available();
static void write(const uint8_t c); static void write(const uint8_t c);
#if ENABLED(SERIAL_STATS_DROPPED_RX) #if ENABLED(SERIAL_STATS_DROPPED_RX)
@ -80,7 +80,7 @@ public:
static void println(long, int = DEC); static void println(long, int = DEC);
static void println(unsigned long, int = DEC); static void println(unsigned long, int = DEC);
static void println(double, int = 2); static void println(double, int = 2);
static void println(void); static void println();
operator bool() { return true; } operator bool() { return true; }
private: private:

10
Marlin/src/HAL/HAL_DUE/Servo.cpp
View file

@ -56,19 +56,19 @@ static volatile int8_t Channel[_Nbr_16timers]; // counter for the s
void Servo_Handler(timer16_Sequence_t timer, Tc *pTc, uint8_t channel); void Servo_Handler(timer16_Sequence_t timer, Tc *pTc, uint8_t channel);
#ifdef _useTimer1 #ifdef _useTimer1
void HANDLER_FOR_TIMER1(void) { Servo_Handler(_timer1, TC_FOR_TIMER1, CHANNEL_FOR_TIMER1); } void HANDLER_FOR_TIMER1() { Servo_Handler(_timer1, TC_FOR_TIMER1, CHANNEL_FOR_TIMER1); }
#endif #endif
#ifdef _useTimer2 #ifdef _useTimer2
void HANDLER_FOR_TIMER2(void) { Servo_Handler(_timer2, TC_FOR_TIMER2, CHANNEL_FOR_TIMER2); } void HANDLER_FOR_TIMER2() { Servo_Handler(_timer2, TC_FOR_TIMER2, CHANNEL_FOR_TIMER2); }
#endif #endif
#ifdef _useTimer3 #ifdef _useTimer3
void HANDLER_FOR_TIMER3(void) { Servo_Handler(_timer3, TC_FOR_TIMER3, CHANNEL_FOR_TIMER3); } void HANDLER_FOR_TIMER3() { Servo_Handler(_timer3, TC_FOR_TIMER3, CHANNEL_FOR_TIMER3); }
#endif #endif
#ifdef _useTimer4 #ifdef _useTimer4
void HANDLER_FOR_TIMER4(void) { Servo_Handler(_timer4, TC_FOR_TIMER4, CHANNEL_FOR_TIMER4); } void HANDLER_FOR_TIMER4() { Servo_Handler(_timer4, TC_FOR_TIMER4, CHANNEL_FOR_TIMER4); }
#endif #endif
#ifdef _useTimer5 #ifdef _useTimer5
void HANDLER_FOR_TIMER5(void) { Servo_Handler(_timer5, TC_FOR_TIMER5, CHANNEL_FOR_TIMER5); } void HANDLER_FOR_TIMER5() { Servo_Handler(_timer5, TC_FOR_TIMER5, CHANNEL_FOR_TIMER5); }
#endif #endif
void Servo_Handler(timer16_Sequence_t timer, Tc *tc, uint8_t channel) { void Servo_Handler(timer16_Sequence_t timer, Tc *tc, uint8_t channel) {

4
Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
View file

@ -38,14 +38,14 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
/** /**
* Endstop interrupts for Due based targets. * Endstop interrupts for Due based targets.
* On Due, all pins support external interrupt capability. * On Due, all pins support external interrupt capability.
*/ */
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE) #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
#if HAS_X_MAX #if HAS_X_MAX
_ATTACH(X_MAX_PIN); _ATTACH(X_MAX_PIN);

2
Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
View file

@ -33,7 +33,7 @@
#define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp) #define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
#endif #endif
extern void eeprom_flush(void); extern void eeprom_flush();
bool PersistentStore::access_start() { return true; } bool PersistentStore::access_start() { return true; }

4
Marlin/src/HAL/HAL_DUE/usb/compiler.h
View file

@ -216,7 +216,7 @@
} }
# endif # endif
#else #else
# define Assert(expr) ((void) 0) # define Assert(expr) (() 0)
#endif #endif
/* Define WEAK attribute */ /* Define WEAK attribute */
@ -796,7 +796,7 @@ typedef struct
* *
* \note It may be used as a long jump opcode in some special cases. * \note It may be used as a long jump opcode in some special cases.
*/ */
#define Long_call(addr) ((*(void (*)(void))(addr))()) #define Long_call(addr) ((*(void (*)())(addr))())
/*! \name MCU Endianism Handling /*! \name MCU Endianism Handling

14
Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c
View file

@ -174,11 +174,11 @@ static xSemaphoreHandle ctrl_access_semphr = NULL;
//! LUN descriptor table. //! LUN descriptor table.
static const struct static const struct
{ {
Ctrl_status (*test_unit_ready)(void); Ctrl_status (*test_unit_ready)();
Ctrl_status (*read_capacity)(U32 *); Ctrl_status (*read_capacity)(U32 *);
bool (*unload)(bool); bool (*unload)(bool);
bool (*wr_protect)(void); bool (*wr_protect)();
bool (*removal)(void); bool (*removal)();
#if ACCESS_USB == true #if ACCESS_USB == true
Ctrl_status (*usb_read_10)(U32, U16); Ctrl_status (*usb_read_10)(U32, U16);
Ctrl_status (*usb_write_10)(U32, U16); Ctrl_status (*usb_write_10)(U32, U16);
@ -255,7 +255,7 @@ bool g_wr_protect;
#ifdef FREERTOS_USED #ifdef FREERTOS_USED
bool ctrl_access_init(void) bool ctrl_access_init()
{ {
// If the handle to the protecting semaphore is not valid, // If the handle to the protecting semaphore is not valid,
if (!ctrl_access_semphr) if (!ctrl_access_semphr)
@ -275,7 +275,7 @@ bool ctrl_access_init(void)
* *
* \return \c true if the access was successfully locked, else \c false. * \return \c true if the access was successfully locked, else \c false.
*/ */
static bool ctrl_access_lock(void) static bool ctrl_access_lock()
{ {
// If the semaphore could not be created, there is no backup solution. // If the semaphore could not be created, there is no backup solution.
if (!ctrl_access_semphr) return false; if (!ctrl_access_semphr) return false;
@ -289,7 +289,7 @@ static bool ctrl_access_lock(void)
#endif // FREERTOS_USED #endif // FREERTOS_USED
U8 get_nb_lun(void) U8 get_nb_lun()
{ {
#if MEM_USB == ENABLE #if MEM_USB == ENABLE
# ifndef Lun_usb_get_lun # ifndef Lun_usb_get_lun
@ -310,7 +310,7 @@ U8 get_nb_lun(void)
} }
U8 get_cur_lun(void) U8 get_cur_lun()
{ {
return LUN_ID_0; return LUN_ID_0;
} }

6
Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h
View file

@ -191,7 +191,7 @@ extern bool g_wr_protect;
* *
* \return \c true if the locker was successfully initialized, else \c false. * \return \c true if the locker was successfully initialized, else \c false.
*/ */
extern bool ctrl_access_init(void); extern bool ctrl_access_init();
#endif // FREERTOS_USED #endif // FREERTOS_USED
@ -199,7 +199,7 @@ extern bool ctrl_access_init(void);
* *
* \return Number of LUNs in the system. * \return Number of LUNs in the system.
*/ */
extern U8 get_nb_lun(void); extern U8 get_nb_lun();
/*! \brief Returns the current LUN. /*! \brief Returns the current LUN.
* *
@ -207,7 +207,7 @@ extern U8 get_nb_lun(void);
* *
* \todo Implement. * \todo Implement.
*/ */
extern U8 get_cur_lun(void); extern U8 get_cur_lun();
/*! \brief Tests the memory state and initializes the memory if required. /*! \brief Tests the memory state and initializes the memory if required.
* *

8
Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp
View file

@ -15,10 +15,10 @@ extern "C" {
#define SD_MMC_BLOCK_SIZE 512 #define SD_MMC_BLOCK_SIZE 512
void sd_mmc_spi_mem_init(void) { void sd_mmc_spi_mem_init() {
} }
Ctrl_status sd_mmc_spi_test_unit_ready(void) { Ctrl_status sd_mmc_spi_test_unit_ready() {
if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted()) if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
return CTRL_NO_PRESENT; return CTRL_NO_PRESENT;
return CTRL_GOOD; return CTRL_GOOD;
@ -38,11 +38,11 @@ bool sd_mmc_spi_unload(bool unload) {
return true; return true;
} }
bool sd_mmc_spi_wr_protect(void) { bool sd_mmc_spi_wr_protect() {
return false; return false;
} }
bool sd_mmc_spi_removal(void) { bool sd_mmc_spi_removal() {
if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted()) if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
return true; return true;
return false; return false;

8
Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h
View file

@ -78,7 +78,7 @@
//! //!
//! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI. //! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
//!/ //!/
extern void sd_mmc_spi_mem_init(void); extern void sd_mmc_spi_mem_init();
//! //!
//! @brief This function tests the state of the SD_MMC memory and sends it to the Host. //! @brief This function tests the state of the SD_MMC memory and sends it to the Host.
@ -91,7 +91,7 @@ extern void sd_mmc_spi_mem_init(void);
//! Media not present -> CTRL_NO_PRESENT //! Media not present -> CTRL_NO_PRESENT
//! Media has changed -> CTRL_BUSY //! Media has changed -> CTRL_BUSY
//!/ //!/
extern Ctrl_status sd_mmc_spi_test_unit_ready(void); extern Ctrl_status sd_mmc_spi_test_unit_ready();
//! //!
//! @brief This function gives the address of the last valid sector. //! @brief This function gives the address of the last valid sector.
@ -124,14 +124,14 @@ extern bool sd_mmc_spi_unload(bool unload);
//! //!
//! @return false -> the memory is not write-protected (always) //! @return false -> the memory is not write-protected (always)
//!/ //!/
extern bool sd_mmc_spi_wr_protect(void); extern bool sd_mmc_spi_wr_protect();
//! //!
//! @brief This function tells if the memory has been removed or not. //! @brief This function tells if the memory has been removed or not.
//! //!
//! @return false -> The memory isn't removed //! @return false -> The memory isn't removed
//! //!
extern bool sd_mmc_spi_removal(void); extern bool sd_mmc_spi_removal();
//---- ACCESS DATA FONCTIONS ---- //---- ACCESS DATA FONCTIONS ----

4
Marlin/src/HAL/HAL_DUE/usb/sysclk.c
View file

@ -71,7 +71,7 @@ extern "C" {
* \param pll_id Source of the USB clock. * \param pll_id Source of the USB clock.
* \param div Actual clock divisor. Must be superior to 0. * \param div Actual clock divisor. Must be superior to 0.
*/ */
void sysclk_enable_usb(void) void sysclk_enable_usb()
{ {
Assert(CONFIG_USBCLK_DIV > 0); Assert(CONFIG_USBCLK_DIV > 0);
@ -103,7 +103,7 @@ void sysclk_enable_usb(void)
* *
* \note This implementation does not switch off the PLL, it just turns off the USB clock. * \note This implementation does not switch off the PLL, it just turns off the USB clock.
*/ */
void sysclk_disable_usb(void) void sysclk_disable_usb()
{ {
pmc_disable_udpck(); pmc_disable_udpck();
} }

4
Marlin/src/HAL/HAL_DUE/usb/sysclk.h
View file

@ -213,8 +213,8 @@ extern "C" {
#endif #endif
extern void sysclk_enable_usb(void); extern void sysclk_enable_usb();
extern void sysclk_disable_usb(void); extern void sysclk_disable_usb();
//! @} //! @}

52
Marlin/src/HAL/HAL_DUE/usb/udc.c
View file

@ -132,14 +132,14 @@ static uint8_t udc_string_product_name[] = USB_DEVICE_PRODUCT_NAME;
* define USB_DEVICE_GET_SERIAL_NAME_LENGTH. * define USB_DEVICE_GET_SERIAL_NAME_LENGTH.
*/ */
#if defined USB_DEVICE_GET_SERIAL_NAME_POINTER #if defined USB_DEVICE_GET_SERIAL_NAME_POINTER
static const uint8_t *udc_get_string_serial_name(void) static const uint8_t *udc_get_string_serial_name()
{ {
return (const uint8_t *)USB_DEVICE_GET_SERIAL_NAME_POINTER; return (const uint8_t *)USB_DEVICE_GET_SERIAL_NAME_POINTER;
} }
# define USB_DEVICE_SERIAL_NAME_SIZE \ # define USB_DEVICE_SERIAL_NAME_SIZE \
USB_DEVICE_GET_SERIAL_NAME_LENGTH USB_DEVICE_GET_SERIAL_NAME_LENGTH
#elif defined USB_DEVICE_SERIAL_NAME #elif defined USB_DEVICE_SERIAL_NAME
static const uint8_t *udc_get_string_serial_name(void) static const uint8_t *udc_get_string_serial_name()
{ {
return (const uint8_t *)USB_DEVICE_SERIAL_NAME; return (const uint8_t *)USB_DEVICE_SERIAL_NAME;
} }
@ -164,7 +164,7 @@ static UDC_DESC_STORAGE struct udc_string_desc_t udc_string_desc = {
}; };
//! @} //! @}
usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void) usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc()
{ {
return udc_ptr_iface; return udc_ptr_iface;
} }
@ -174,7 +174,7 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void)
* *
* \return address after the last byte of USB Configuration descriptor * \return address after the last byte of USB Configuration descriptor
*/ */
static usb_conf_desc_t UDC_DESC_STORAGE *udc_get_eof_conf(void) static usb_conf_desc_t UDC_DESC_STORAGE *udc_get_eof_conf()
{ {
return (UDC_DESC_STORAGE usb_conf_desc_t *) ((uint8_t *) return (UDC_DESC_STORAGE usb_conf_desc_t *) ((uint8_t *)
udc_ptr_conf->desc + udc_ptr_conf->desc +
@ -360,14 +360,14 @@ static bool udc_iface_enable(uint8_t iface_num, uint8_t setting_num)
/*! \brief Start the USB Device stack /*! \brief Start the USB Device stack
*/ */
void udc_start(void) void udc_start()
{ {
udd_enable(); udd_enable();
} }
/*! \brief Stop the USB Device stack /*! \brief Stop the USB Device stack
*/ */
void udc_stop(void) void udc_stop()
{ {
udd_disable(); udd_disable();
udc_reset(); udc_reset();
@ -377,7 +377,7 @@ void udc_stop(void)
* \brief Reset the current configuration of the USB device, * \brief Reset the current configuration of the USB device,
* This routines can be called by UDD when a RESET on the USB line occurs. * This routines can be called by UDD when a RESET on the USB line occurs.
*/ */
void udc_reset(void) void udc_reset()
{ {
uint8_t iface_num; uint8_t iface_num;
@ -404,7 +404,7 @@ void udc_reset(void)
#endif #endif
} }
void udc_sof_notify(void) void udc_sof_notify()
{ {
uint8_t iface_num; uint8_t iface_num;
@ -424,7 +424,7 @@ void udc_sof_notify(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_get_status(void) static bool udc_req_std_dev_get_status()
{ {
if (udd_g_ctrlreq.req.wLength != sizeof(udc_device_status)) { if (udd_g_ctrlreq.req.wLength != sizeof(udc_device_status)) {
return false; return false;
@ -441,7 +441,7 @@ static bool udc_req_std_dev_get_status(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_ep_get_status(void) static bool udc_req_std_ep_get_status()
{ {
static le16_t udc_ep_status; static le16_t udc_ep_status;
@ -463,7 +463,7 @@ static bool udc_req_std_ep_get_status(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_clear_feature(void) static bool udc_req_std_dev_clear_feature()
{ {
if (udd_g_ctrlreq.req.wLength) { if (udd_g_ctrlreq.req.wLength) {
return false; return false;
@ -486,7 +486,7 @@ static bool udc_req_std_dev_clear_feature(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_ep_clear_feature(void) static bool udc_req_std_ep_clear_feature()
{ {
if (udd_g_ctrlreq.req.wLength) { if (udd_g_ctrlreq.req.wLength) {
return false; return false;
@ -504,7 +504,7 @@ static bool udc_req_std_ep_clear_feature(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_set_feature(void) static bool udc_req_std_dev_set_feature()
{ {
if (udd_g_ctrlreq.req.wLength) { if (udd_g_ctrlreq.req.wLength) {
return false; return false;
@ -567,7 +567,7 @@ static bool udc_req_std_dev_set_feature(void)
* \return true if success * \return true if success
*/ */
#if (0!=USB_DEVICE_MAX_EP) #if (0!=USB_DEVICE_MAX_EP)
static bool udc_req_std_ep_set_feature(void) static bool udc_req_std_ep_set_feature()
{ {
if (udd_g_ctrlreq.req.wLength) { if (udd_g_ctrlreq.req.wLength) {
return false; return false;
@ -584,7 +584,7 @@ static bool udc_req_std_ep_set_feature(void)
* \brief Change the address of device * \brief Change the address of device
* Callback called at the end of request set address * Callback called at the end of request set address
*/ */
static void udc_valid_address(void) static void udc_valid_address()
{ {
udd_set_address(udd_g_ctrlreq.req.wValue & 0x7F); udd_set_address(udd_g_ctrlreq.req.wValue & 0x7F);
} }
@ -594,7 +594,7 @@ static void udc_valid_address(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_set_address(void) static bool udc_req_std_dev_set_address()
{ {
if (udd_g_ctrlreq.req.wLength) { if (udd_g_ctrlreq.req.wLength) {
return false; return false;
@ -611,7 +611,7 @@ static bool udc_req_std_dev_set_address(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_get_str_desc(void) static bool udc_req_std_dev_get_str_desc()
{ {
uint8_t i; uint8_t i;
const uint8_t *str; const uint8_t *str;
@ -670,7 +670,7 @@ static bool udc_req_std_dev_get_str_desc(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_get_descriptor(void) static bool udc_req_std_dev_get_descriptor()
{ {
uint8_t conf_num; uint8_t conf_num;
@ -787,7 +787,7 @@ static bool udc_req_std_dev_get_descriptor(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_get_configuration(void) static bool udc_req_std_dev_get_configuration()
{ {
if (udd_g_ctrlreq.req.wLength != 1) { if (udd_g_ctrlreq.req.wLength != 1) {
return false; return false;
@ -802,7 +802,7 @@ static bool udc_req_std_dev_get_configuration(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_dev_set_configuration(void) static bool udc_req_std_dev_set_configuration()
{ {
uint8_t iface_num; uint8_t iface_num;
@ -867,7 +867,7 @@ static bool udc_req_std_dev_set_configuration(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_iface_get_setting(void) static bool udc_req_std_iface_get_setting()
{ {
uint8_t iface_num; uint8_t iface_num;
udi_api_t UDC_DESC_STORAGE *udi_api; udi_api_t UDC_DESC_STORAGE *udi_api;
@ -905,7 +905,7 @@ static bool udc_req_std_iface_get_setting(void)
* *
* \return true if success * \return true if success
*/ */
static bool udc_req_std_iface_set_setting(void) static bool udc_req_std_iface_set_setting()
{ {
uint8_t iface_num, setting_num; uint8_t iface_num, setting_num;
@ -933,7 +933,7 @@ static bool udc_req_std_iface_set_setting(void)
* *
* \return true if the request is supported * \return true if the request is supported
*/ */
static bool udc_reqstd(void) static bool udc_reqstd()
{ {
if (Udd_setup_is_in()) { if (Udd_setup_is_in()) {
// GET Standard Requests // GET Standard Requests
@ -1027,7 +1027,7 @@ static bool udc_reqstd(void)
* *
* \return true if the request is supported * \return true if the request is supported
*/ */
static bool udc_req_iface(void) static bool udc_req_iface()
{ {
uint8_t iface_num; uint8_t iface_num;
udi_api_t UDC_DESC_STORAGE *udi_api; udi_api_t UDC_DESC_STORAGE *udi_api;
@ -1062,7 +1062,7 @@ static bool udc_req_iface(void)
* *
* \return true if the request is supported * \return true if the request is supported
*/ */
static bool udc_req_ep(void) static bool udc_req_ep()
{ {
uint8_t iface_num; uint8_t iface_num;
udi_api_t UDC_DESC_STORAGE *udi_api; udi_api_t UDC_DESC_STORAGE *udi_api;
@ -1101,7 +1101,7 @@ static bool udc_req_ep(void)
* *
* \return true if the request is supported, else the request is stalled by UDD * \return true if the request is supported, else the request is stalled by UDD
*/ */
bool udc_process_setup(void) bool udc_process_setup()
{ {
// By default no data (receive/send) and no callbacks registered // By default no data (receive/send) and no callbacks registered
udd_g_ctrlreq.payload_size = 0; udd_g_ctrlreq.payload_size = 0;

48
Marlin/src/HAL/HAL_DUE/usb/udc.h
View file

@ -172,18 +172,18 @@ extern "C" {
} }
\endcode \endcode
*/ */
static inline bool udc_include_vbus_monitoring(void) static inline bool udc_include_vbus_monitoring()
{ {
return udd_include_vbus_monitoring(); return udd_include_vbus_monitoring();
} }
/*! \brief Start the USB Device stack /*! \brief Start the USB Device stack
*/ */
void udc_start(void); void udc_start();
/*! \brief Stop the USB Device stack /*! \brief Stop the USB Device stack
*/ */
void udc_stop(void); void udc_stop();
/** /**
* \brief Attach device to the bus when possible * \brief Attach device to the bus when possible
@ -192,7 +192,7 @@ void udc_stop(void);
* then it will attach device when an acceptable Vbus * then it will attach device when an acceptable Vbus
* level from the host is detected. * level from the host is detected.
*/ */
static inline void udc_attach(void) static inline void udc_attach()
{ {
udd_attach(); udd_attach();
} }
@ -203,7 +203,7 @@ static inline void udc_attach(void)
* *
* The driver must remove pull-up on USB line D- or D+. * The driver must remove pull-up on USB line D- or D+.
*/ */
static inline void udc_detach(void) static inline void udc_detach()
{ {
udd_detach(); udd_detach();
} }
@ -212,7 +212,7 @@ static inline void udc_detach(void)
/*! \brief The USB driver sends a resume signal called \e "Upstream Resume" /*! \brief The USB driver sends a resume signal called \e "Upstream Resume"
* This is authorized only when the remote wakeup feature is enabled by host. * This is authorized only when the remote wakeup feature is enabled by host.
*/ */
static inline void udc_remotewakeup(void) static inline void udc_remotewakeup()
{ {
udd_send_remotewakeup(); udd_send_remotewakeup();
} }
@ -223,7 +223,7 @@ static inline void udc_remotewakeup(void)
* *
* \return pointer on the current interface descriptor. * \return pointer on the current interface descriptor.
*/ */
usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void); usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc();
//@} //@}
@ -334,7 +334,7 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
* *
* Add to application C-file: * Add to application C-file:
* \code * \code
void usb_init(void) void usb_init()
{ {
udc_start(); udc_start();
} }
@ -551,23 +551,23 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
#define USB_DEVICE_ATTR \ #define USB_DEVICE_ATTR \
(USB_CONFIG_ATTR_REMOTE_WAKEUP | USB_CONFIG_ATTR_..._POWERED) (USB_CONFIG_ATTR_REMOTE_WAKEUP | USB_CONFIG_ATTR_..._POWERED)
#define UDC_REMOTEWAKEUP_ENABLE() my_callback_remotewakeup_enable() #define UDC_REMOTEWAKEUP_ENABLE() my_callback_remotewakeup_enable()
extern void my_callback_remotewakeup_enable(void); extern void my_callback_remotewakeup_enable();
#define UDC_REMOTEWAKEUP_DISABLE() my_callback_remotewakeup_disable() #define UDC_REMOTEWAKEUP_DISABLE() my_callback_remotewakeup_disable()
extern void my_callback_remotewakeup_disable(void); extern void my_callback_remotewakeup_disable();
\endcode \endcode
* *
* Add to application C-file: * Add to application C-file:
* \code * \code
void my_callback_remotewakeup_enable(void) void my_callback_remotewakeup_enable()
{ {
// Enable application wakeup events (e.g. enable GPIO interrupt) // Enable application wakeup events (e.g. enable GPIO interrupt)
} }
void my_callback_remotewakeup_disable(void) void my_callback_remotewakeup_disable()
{ {
// Disable application wakeup events (e.g. disable GPIO interrupt) // Disable application wakeup events (e.g. disable GPIO interrupt)
} }
void my_interrupt_event(void) void my_interrupt_event()
{ {
udc_remotewakeup(); udc_remotewakeup();
} }
@ -580,10 +580,10 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
#define USB_DEVICE_ATTR (USB_CONFIG_ATTR_REMOTE_WAKEUP | USB_CONFIG_ATTR_..._POWERED) \endcode #define USB_DEVICE_ATTR (USB_CONFIG_ATTR_REMOTE_WAKEUP | USB_CONFIG_ATTR_..._POWERED) \endcode
* - \code // Define callback called when the host enables the remotewakeup feature * - \code // Define callback called when the host enables the remotewakeup feature
#define UDC_REMOTEWAKEUP_ENABLE() my_callback_remotewakeup_enable() #define UDC_REMOTEWAKEUP_ENABLE() my_callback_remotewakeup_enable()
extern void my_callback_remotewakeup_enable(void); \endcode extern void my_callback_remotewakeup_enable(); \endcode
* - \code // Define callback called when the host disables the remotewakeup feature * - \code // Define callback called when the host disables the remotewakeup feature
#define UDC_REMOTEWAKEUP_DISABLE() my_callback_remotewakeup_disable() #define UDC_REMOTEWAKEUP_DISABLE() my_callback_remotewakeup_disable()
extern void my_callback_remotewakeup_disable(void); \endcode extern void my_callback_remotewakeup_disable(); \endcode
* -# Send a remote wakeup (USB upstream): * -# Send a remote wakeup (USB upstream):
* - \code udc_remotewakeup(); \endcode * - \code udc_remotewakeup(); \endcode
*/ */
@ -605,18 +605,18 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
* \code * \code
#define USB_DEVICE_ATTR (USB_CONFIG_ATTR_BUS_POWERED) #define USB_DEVICE_ATTR (USB_CONFIG_ATTR_BUS_POWERED)
#define UDC_SUSPEND_EVENT() user_callback_suspend_action() #define UDC_SUSPEND_EVENT() user_callback_suspend_action()
extern void user_callback_suspend_action(void) extern void user_callback_suspend_action()
#define UDC_RESUME_EVENT() user_callback_resume_action() #define UDC_RESUME_EVENT() user_callback_resume_action()
extern void user_callback_resume_action(void) extern void user_callback_resume_action()
\endcode \endcode
* *
* Add to application C-file: * Add to application C-file:
* \code * \code
void user_callback_suspend_action(void) void user_callback_suspend_action()
{ {
// Disable hardware component to reduce power consumption // Disable hardware component to reduce power consumption
} }
void user_callback_resume_action(void) void user_callback_resume_action()
{ {
// Re-enable hardware component // Re-enable hardware component
} }
@ -628,12 +628,12 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
#define USB_DEVICE_ATTR (USB_CONFIG_ATTR_BUS_POWERED) \endcode #define USB_DEVICE_ATTR (USB_CONFIG_ATTR_BUS_POWERED) \endcode
* - \code // Define callback called when the host suspend the USB line * - \code // Define callback called when the host suspend the USB line
#define UDC_SUSPEND_EVENT() user_callback_suspend_action() #define UDC_SUSPEND_EVENT() user_callback_suspend_action()
extern void user_callback_suspend_action(void); \endcode extern void user_callback_suspend_action(); \endcode
* - \code // Define callback called when the host or device resume the USB line * - \code // Define callback called when the host or device resume the USB line
#define UDC_RESUME_EVENT() user_callback_resume_action() #define UDC_RESUME_EVENT() user_callback_resume_action()
extern void user_callback_resume_action(void); \endcode extern void user_callback_resume_action(); \endcode
* -# Reduce power consumption in suspend mode (max. 2.5mA on Vbus): * -# Reduce power consumption in suspend mode (max. 2.5mA on Vbus):
* - \code void user_callback_suspend_action(void) * - \code void user_callback_suspend_action()
{ {
turn_off_components(); turn_off_components();
} \endcode } \endcode
@ -664,7 +664,7 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
* \code * \code
uint8_t serial_number[USB_DEVICE_GET_SERIAL_NAME_LENGTH]; uint8_t serial_number[USB_DEVICE_GET_SERIAL_NAME_LENGTH];
void init_build_usb_serial_number(void) void init_build_usb_serial_number()
{ {
serial_number[0] = 'A'; serial_number[0] = 'A';
serial_number[1] = 'B'; serial_number[1] = 'B';
@ -683,7 +683,7 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
* - \code * - \code
uint8_t serial_number[USB_DEVICE_GET_SERIAL_NAME_LENGTH]; uint8_t serial_number[USB_DEVICE_GET_SERIAL_NAME_LENGTH];
void init_build_usb_serial_number(void) void init_build_usb_serial_number()
{ {
serial_number[0] = 'A'; serial_number[0] = 'A';
serial_number[1] = 'B'; serial_number[1] = 'B';

40
Marlin/src/HAL/HAL_DUE/usb/udd.h
View file

@ -94,11 +94,11 @@ typedef struct {
uint16_t payload_size; uint16_t payload_size;
//! Callback called after reception of ZLP from setup request //! Callback called after reception of ZLP from setup request
void (*callback)(void); void (*callback)();
//! Callback called when the buffer given (.payload) is full or empty. //! Callback called when the buffer given (.payload) is full or empty.
//! This one return false to abort data transfer, or true with a new buffer in .payload. //! This one return false to abort data transfer, or true with a new buffer in .payload.
bool (*over_under_run)(void); bool (*over_under_run)();
} udd_ctrl_request_t; } udd_ctrl_request_t;
extern udd_ctrl_request_t udd_g_ctrlreq; extern udd_ctrl_request_t udd_g_ctrlreq;
@ -123,7 +123,7 @@ extern udd_ctrl_request_t udd_g_ctrlreq;
* Registered by routine udd_ep_wait_stall_clear() * Registered by routine udd_ep_wait_stall_clear()
* Callback called when endpoint stall is cleared. * Callback called when endpoint stall is cleared.
*/ */
typedef void (*udd_callback_halt_cleared_t)(void); typedef void (*udd_callback_halt_cleared_t)();
/** /**
* \brief End of transfer callback function type. * \brief End of transfer callback function type.
@ -142,17 +142,17 @@ typedef void (*udd_callback_trans_t) (udd_ep_status_t status,
* *
* \return true, if the VBUS monitoring is possible. * \return true, if the VBUS monitoring is possible.
*/ */
bool udd_include_vbus_monitoring(void); bool udd_include_vbus_monitoring();
/** /**
* \brief Enables the USB Device mode * \brief Enables the USB Device mode
*/ */
void udd_enable(void); void udd_enable();
/** /**
* \brief Disables the USB Device mode * \brief Disables the USB Device mode
*/ */
void udd_disable(void); void udd_disable();
/** /**
* \brief Attach device to the bus when possible * \brief Attach device to the bus when possible
@ -161,14 +161,14 @@ void udd_disable(void);
* then it will attach device when an acceptable Vbus * then it will attach device when an acceptable Vbus
* level from the host is detected. * level from the host is detected.
*/ */
void udd_attach(void); void udd_attach();
/** /**
* \brief Detaches the device from the bus * \brief Detaches the device from the bus
* *
* The driver must remove pull-up on USB line D- or D+. * The driver must remove pull-up on USB line D- or D+.
*/ */
void udd_detach(void); void udd_detach();
/** /**
* \brief Test whether the USB Device Controller is running at high * \brief Test whether the USB Device Controller is running at high
@ -176,7 +176,7 @@ void udd_detach(void);
* *
* \return \c true if the Device is running at high speed mode, otherwise \c false. * \return \c true if the Device is running at high speed mode, otherwise \c false.
*/ */
bool udd_is_high_speed(void); bool udd_is_high_speed();
/** /**
* \brief Changes the USB address of device * \brief Changes the USB address of device
@ -190,25 +190,25 @@ void udd_set_address(uint8_t address);
* *
* \return USB address * \return USB address
*/ */
uint8_t udd_getaddress(void); uint8_t udd_getaddress();
/** /**
* \brief Returns the current start of frame number * \brief Returns the current start of frame number
* *
* \return current start of frame number. * \return current start of frame number.
*/ */
uint16_t udd_get_frame_number(void); uint16_t udd_get_frame_number();
/** /**
* \brief Returns the current micro start of frame number * \brief Returns the current micro start of frame number
* *
* \return current micro start of frame number required in high speed mode. * \return current micro start of frame number required in high speed mode.
*/ */
uint16_t udd_get_micro_frame_number(void); uint16_t udd_get_micro_frame_number();
/*! \brief The USB driver sends a resume signal called Upstream Resume /*! \brief The USB driver sends a resume signal called Upstream Resume
*/ */
void udd_send_remotewakeup(void); void udd_send_remotewakeup();
/** /**
* \brief Load setup payload * \brief Load setup payload
@ -346,10 +346,10 @@ void udd_ep_abort(udd_ep_id_t ep);
* The following functions allow the device to jump to a specific test mode required in high speed mode. * The following functions allow the device to jump to a specific test mode required in high speed mode.
*/ */
//@{ //@{
void udd_test_mode_j(void); void udd_test_mode_j();
void udd_test_mode_k(void); void udd_test_mode_k();
void udd_test_mode_se0_nak(void); void udd_test_mode_se0_nak();
void udd_test_mode_packet(void); void udd_test_mode_packet();
//@} //@}
@ -370,21 +370,21 @@ void udd_test_mode_packet(void);
* *
* \return \c 1 if the request is accepted, otherwise \c 0. * \return \c 1 if the request is accepted, otherwise \c 0.
*/ */
extern bool udc_process_setup(void); extern bool udc_process_setup();
/** /**
* \brief Reset the UDC * \brief Reset the UDC
* *
* The UDC must reset all configuration. * The UDC must reset all configuration.
*/ */
extern void udc_reset(void); extern void udc_reset();
/** /**
* \brief To signal that a SOF is occurred * \brief To signal that a SOF is occurred
* *
* The UDC must send the signal to all UDIs enabled * The UDC must send the signal to all UDIs enabled
*/ */
extern void udc_sof_notify(void); extern void udc_sof_notify();
//@} //@}

10
Marlin/src/HAL/HAL_DUE/usb/udi.h
View file

@ -82,7 +82,7 @@ typedef struct {
* *
* \return \c 1 if function was successfully done, otherwise \c 0. * \return \c 1 if function was successfully done, otherwise \c 0.
*/ */
bool (*enable)(void); bool (*enable)();
/** /**
* \brief Disable the interface. * \brief Disable the interface.
@ -95,7 +95,7 @@ typedef struct {
* - the device is detached from the host (i.e. Vbus is no * - the device is detached from the host (i.e. Vbus is no
* longer present) * longer present)
*/ */
void (*disable)(void); void (*disable)();
/** /**
* \brief Handle a control request directed at an interface. * \brief Handle a control request directed at an interface.
@ -108,7 +108,7 @@ typedef struct {
* *
* \return \c 1 if this interface supports the SETUP request, otherwise \c 0. * \return \c 1 if this interface supports the SETUP request, otherwise \c 0.
*/ */
bool (*setup)(void); bool (*setup)();
/** /**
* \brief Returns the current setting of the selected interface. * \brief Returns the current setting of the selected interface.
@ -117,12 +117,12 @@ typedef struct {
* *
* \return alternate setting of selected interface * \return alternate setting of selected interface
*/ */
uint8_t (*getsetting)(void); uint8_t (*getsetting)();
/** /**
* \brief To signal that a SOF is occurred * \brief To signal that a SOF is occurred
*/ */
void (*sof_notify)(void); void (*sof_notify)();
} udi_api_t; } udi_api_t;
//@} //@}

56
Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c
View file

@ -84,14 +84,14 @@
* *
* @{ * @{
*/ */
bool udi_cdc_comm_enable(void); bool udi_cdc_comm_enable();
void udi_cdc_comm_disable(void); void udi_cdc_comm_disable();
bool udi_cdc_comm_setup(void); bool udi_cdc_comm_setup();
bool udi_cdc_data_enable(void); bool udi_cdc_data_enable();
void udi_cdc_data_disable(void); void udi_cdc_data_disable();
bool udi_cdc_data_setup(void); bool udi_cdc_data_setup();
uint8_t udi_cdc_getsetting(void); uint8_t udi_cdc_getsetting();
void udi_cdc_data_sof_notify(void); void udi_cdc_data_sof_notify();
UDC_DESC_STORAGE udi_api_t udi_api_cdc_comm = { UDC_DESC_STORAGE udi_api_t udi_api_cdc_comm = {
.enable = udi_cdc_comm_enable, .enable = udi_cdc_comm_enable,
.disable = udi_cdc_comm_disable, .disable = udi_cdc_comm_disable,
@ -130,14 +130,14 @@ UDC_DESC_STORAGE udi_api_t udi_api_cdc_data = {
* *
* \return port number * \return port number
*/ */
static uint8_t udi_cdc_setup_to_port(void); static uint8_t udi_cdc_setup_to_port();
/** /**
* \brief Sends line coding to application * \brief Sends line coding to application
* *
* Called after SETUP request when line coding data is received. * Called after SETUP request when line coding data is received.
*/ */
static void udi_cdc_line_coding_received(void); static void udi_cdc_line_coding_received();
/** /**
* \brief Records new state * \brief Records new state
@ -267,7 +267,7 @@ static volatile bool udi_cdc_tx_both_buf_to_send[UDI_CDC_PORT_NB];
//@} //@}
bool udi_cdc_comm_enable(void) bool udi_cdc_comm_enable()
{ {
uint8_t port; uint8_t port;
uint8_t iface_comm_num; uint8_t iface_comm_num;
@ -321,7 +321,7 @@ bool udi_cdc_comm_enable(void)
return true; return true;
} }
bool udi_cdc_data_enable(void) bool udi_cdc_data_enable()
{ {
uint8_t port; uint8_t port;
@ -360,13 +360,13 @@ bool udi_cdc_data_enable(void)
return true; return true;
} }
void udi_cdc_comm_disable(void) void udi_cdc_comm_disable()
{ {
Assert(udi_cdc_nb_comm_enabled != 0); Assert(udi_cdc_nb_comm_enabled != 0);
udi_cdc_nb_comm_enabled--; udi_cdc_nb_comm_enabled--;
} }
void udi_cdc_data_disable(void) void udi_cdc_data_disable()
{ {
uint8_t port; uint8_t port;
@ -377,7 +377,7 @@ void udi_cdc_data_disable(void)
udi_cdc_data_running = false; udi_cdc_data_running = false;
} }
bool udi_cdc_comm_setup(void) bool udi_cdc_comm_setup()
{ {
uint8_t port = udi_cdc_setup_to_port(); uint8_t port = udi_cdc_setup_to_port();
@ -433,17 +433,17 @@ bool udi_cdc_comm_setup(void)
return false; // request Not supported return false; // request Not supported
} }
bool udi_cdc_data_setup(void) bool udi_cdc_data_setup()
{ {
return false; // request Not supported return false; // request Not supported
} }
uint8_t udi_cdc_getsetting(void) uint8_t udi_cdc_getsetting()
{ {
return 0; // CDC don't have multiple alternate setting return 0; // CDC don't have multiple alternate setting
} }
void udi_cdc_data_sof_notify(void) void udi_cdc_data_sof_notify()
{ {
static uint8_t port_notify = 0; static uint8_t port_notify = 0;
@ -461,7 +461,7 @@ void udi_cdc_data_sof_notify(void)
// ------------------------ // ------------------------
//------- Internal routines to control serial line //------- Internal routines to control serial line
static uint8_t udi_cdc_setup_to_port(void) static uint8_t udi_cdc_setup_to_port()
{ {
uint8_t port; uint8_t port;
@ -479,7 +479,7 @@ static uint8_t udi_cdc_setup_to_port(void)
return port; return port;
} }
static void udi_cdc_line_coding_received(void) static void udi_cdc_line_coding_received()
{ {
uint8_t port = udi_cdc_setup_to_port(); uint8_t port = udi_cdc_setup_to_port();
UNUSED(port); UNUSED(port);
@ -797,17 +797,17 @@ void udi_cdc_ctrl_signal_dsr(bool b_set)
udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DSR); udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DSR);
} }
void udi_cdc_signal_framing_error(void) void udi_cdc_signal_framing_error()
{ {
udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_FRAMING); udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_FRAMING);
} }
void udi_cdc_signal_parity_error(void) void udi_cdc_signal_parity_error()
{ {
udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_PARITY); udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_PARITY);
} }
void udi_cdc_signal_overrun(void) void udi_cdc_signal_overrun()
{ {
udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_OVERRUN); udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_OVERRUN);
} }
@ -853,7 +853,7 @@ iram_size_t udi_cdc_multi_get_nb_received_data(uint8_t port)
return nb_received; return nb_received;
} }
iram_size_t udi_cdc_get_nb_received_data(void) iram_size_t udi_cdc_get_nb_received_data()
{ {
return udi_cdc_multi_get_nb_received_data(0); return udi_cdc_multi_get_nb_received_data(0);
} }
@ -863,7 +863,7 @@ bool udi_cdc_multi_is_rx_ready(uint8_t port)
return (udi_cdc_multi_get_nb_received_data(port) > 0); return (udi_cdc_multi_get_nb_received_data(port) > 0);
} }
bool udi_cdc_is_rx_ready(void) bool udi_cdc_is_rx_ready()
{ {
return udi_cdc_multi_is_rx_ready(0); return udi_cdc_multi_is_rx_ready(0);
} }
@ -912,7 +912,7 @@ udi_cdc_getc_process_one_byte:
return rx_data; return rx_data;
} }
int udi_cdc_getc(void) int udi_cdc_getc()
{ {
return udi_cdc_multi_getc(0); return udi_cdc_multi_getc(0);
} }
@ -1041,7 +1041,7 @@ iram_size_t __attribute__((optimize("O0"))) udi_cdc_multi_get_free_tx_buffer(uin
return retval; return retval;
} }
iram_size_t udi_cdc_get_free_tx_buffer(void) iram_size_t udi_cdc_get_free_tx_buffer()
{ {
return udi_cdc_multi_get_free_tx_buffer(0); return udi_cdc_multi_get_free_tx_buffer(0);
} }
@ -1051,7 +1051,7 @@ bool udi_cdc_multi_is_tx_ready(uint8_t port)
return (udi_cdc_multi_get_free_tx_buffer(port) != 0); return (udi_cdc_multi_get_free_tx_buffer(port) != 0);
} }
bool udi_cdc_is_tx_ready(void) bool udi_cdc_is_tx_ready()
{ {
return udi_cdc_multi_is_tx_ready(0); return udi_cdc_multi_is_tx_ready(0);
} }

32
Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h
View file

@ -366,38 +366,38 @@ void udi_cdc_ctrl_signal_dsr(bool b_set);
/** /**
* \brief Notify a framing error * \brief Notify a framing error
*/ */
void udi_cdc_signal_framing_error(void); void udi_cdc_signal_framing_error();
/** /**
* \brief Notify a parity error * \brief Notify a parity error
*/ */
void udi_cdc_signal_parity_error(void); void udi_cdc_signal_parity_error();
/** /**
* \brief Notify a overrun * \brief Notify a overrun
*/ */
void udi_cdc_signal_overrun(void); void udi_cdc_signal_overrun();
/** /**
* \brief Gets the number of byte received * \brief Gets the number of byte received
* *
* \return the number of data available * \return the number of data available
*/ */
iram_size_t udi_cdc_get_nb_received_data(void); iram_size_t udi_cdc_get_nb_received_data();
/** /**
* \brief This function checks if a character has been received on the CDC line * \brief This function checks if a character has been received on the CDC line
* *
* \return \c 1 if a byte is ready to be read. * \return \c 1 if a byte is ready to be read.
*/ */
bool udi_cdc_is_rx_ready(void); bool udi_cdc_is_rx_ready();
/** /**
* \brief Waits and gets a value on CDC line * \brief Waits and gets a value on CDC line
* *
* \return value read on CDC line * \return value read on CDC line
*/ */
int udi_cdc_getc(void); int udi_cdc_getc();
/** /**
* \brief Reads a RAM buffer on CDC line * \brief Reads a RAM buffer on CDC line
@ -425,7 +425,7 @@ iram_size_t udi_cdc_read_no_polling(void* buf, iram_size_t size);
* *
* \return the number of free byte in TX buffer * \return the number of free byte in TX buffer
*/ */
iram_size_t udi_cdc_get_free_tx_buffer(void); iram_size_t udi_cdc_get_free_tx_buffer();
/** /**
* \brief This function checks if a new character sent is possible * \brief This function checks if a new character sent is possible
@ -433,7 +433,7 @@ iram_size_t udi_cdc_get_free_tx_buffer(void);
* *
* \return \c 1 if a new character can be sent * \return \c 1 if a new character can be sent
*/ */
bool udi_cdc_is_tx_ready(void); bool udi_cdc_is_tx_ready();
/** /**
* \brief Puts a byte on CDC line * \brief Puts a byte on CDC line
@ -611,9 +611,9 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
* Content of conf_usb.h: * Content of conf_usb.h:
* \code * \code
#define UDI_CDC_ENABLE_EXT(port) my_callback_cdc_enable() #define UDI_CDC_ENABLE_EXT(port) my_callback_cdc_enable()
extern bool my_callback_cdc_enable(void); extern bool my_callback_cdc_enable();
#define UDI_CDC_DISABLE_EXT(port) my_callback_cdc_disable() #define UDI_CDC_DISABLE_EXT(port) my_callback_cdc_disable()
extern void my_callback_cdc_disable(void); extern void my_callback_cdc_disable();
#define UDI_CDC_LOW_RATE #define UDI_CDC_LOW_RATE
#define UDI_CDC_DEFAULT_RATE 115200 #define UDI_CDC_DEFAULT_RATE 115200
@ -627,17 +627,17 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
* Add to application C-file: * Add to application C-file:
* \code * \code
static bool my_flag_autorize_cdc_transfert = false; static bool my_flag_autorize_cdc_transfert = false;
bool my_callback_cdc_enable(void) bool my_callback_cdc_enable()
{ {
my_flag_autorize_cdc_transfert = true; my_flag_autorize_cdc_transfert = true;
return true; return true;
} }
void my_callback_cdc_disable(void) void my_callback_cdc_disable()
{ {
my_flag_autorize_cdc_transfert = false; my_flag_autorize_cdc_transfert = false;
} }
void task(void) void task()
{ {
if (my_flag_autorize_cdc_transfert) { if (my_flag_autorize_cdc_transfert) {
udi_cdc_putc('A'); udi_cdc_putc('A');
@ -652,14 +652,14 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
* - \code #define USB_DEVICE_SERIAL_NAME "12...EF" // Disk SN for CDC \endcode * - \code #define USB_DEVICE_SERIAL_NAME "12...EF" // Disk SN for CDC \endcode
* \note The USB serial number is mandatory when a CDC interface is used. * \note The USB serial number is mandatory when a CDC interface is used.
* - \code #define UDI_CDC_ENABLE_EXT(port) my_callback_cdc_enable() * - \code #define UDI_CDC_ENABLE_EXT(port) my_callback_cdc_enable()
extern bool my_callback_cdc_enable(void); \endcode extern bool my_callback_cdc_enable(); \endcode
* \note After the device enumeration (detecting and identifying USB devices), * \note After the device enumeration (detecting and identifying USB devices),
* the USB host starts the device configuration. When the USB CDC interface * the USB host starts the device configuration. When the USB CDC interface
* from the device is accepted by the host, the USB host enables this interface and the * from the device is accepted by the host, the USB host enables this interface and the
* UDI_CDC_ENABLE_EXT() callback function is called and return true. * UDI_CDC_ENABLE_EXT() callback function is called and return true.
* Thus, when this event is received, the data transfer on CDC interface are authorized. * Thus, when this event is received, the data transfer on CDC interface are authorized.
* - \code #define UDI_CDC_DISABLE_EXT(port) my_callback_cdc_disable() * - \code #define UDI_CDC_DISABLE_EXT(port) my_callback_cdc_disable()
extern void my_callback_cdc_disable(void); \endcode extern void my_callback_cdc_disable(); \endcode
* \note When the USB device is unplugged or is reset by the USB host, the USB * \note When the USB device is unplugged or is reset by the USB host, the USB
* interface is disabled and the UDI_CDC_DISABLE_EXT() callback function * interface is disabled and the UDI_CDC_DISABLE_EXT() callback function
* is called. Thus, the data transfer must be stopped on CDC interface. * is called. Thus, the data transfer must be stopped on CDC interface.
@ -673,7 +673,7 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
* \note Default configuration of communication port at startup. * \note Default configuration of communication port at startup.
* -# Send or wait data on CDC line: * -# Send or wait data on CDC line:
* - \code // Waits and gets a value on CDC line * - \code // Waits and gets a value on CDC line
int udi_cdc_getc(void); int udi_cdc_getc();
// Reads a RAM buffer on CDC line // Reads a RAM buffer on CDC line
iram_size_t udi_cdc_read_buf(int* buf, iram_size_t size); iram_size_t udi_cdc_read_buf(int* buf, iram_size_t size);
// Puts a byte on CDC line // Puts a byte on CDC line

98
Marlin/src/HAL/HAL_DUE/usb/udi_msc.c
View file

@ -71,10 +71,10 @@
* *
* @{ * @{
*/ */
bool udi_msc_enable(void); bool udi_msc_enable();
void udi_msc_disable(void); void udi_msc_disable();
bool udi_msc_setup(void); bool udi_msc_setup();
uint8_t udi_msc_getsetting(void); uint8_t udi_msc_getsetting();
//! Global structure which contains standard UDI API for UDC //! Global structure which contains standard UDI API for UDC
UDC_DESC_STORAGE udi_api_t udi_api_msc = { UDC_DESC_STORAGE udi_api_t udi_api_msc = {
@ -151,12 +151,12 @@ volatile bool udi_msc_b_reset_trans = true;
/** /**
* \brief Stall CBW request * \brief Stall CBW request
*/ */
static void udi_msc_cbw_invalid(void); static void udi_msc_cbw_invalid();
/** /**
* \brief Stall CSW request * \brief Stall CSW request
*/ */
static void udi_msc_csw_invalid(void); static void udi_msc_csw_invalid();
/** /**
* \brief Links a callback and buffer on endpoint OUT reception * \brief Links a callback and buffer on endpoint OUT reception
@ -165,7 +165,7 @@ static void udi_msc_csw_invalid(void);
* - enable interface * - enable interface
* - at the end of previous command after sending the CSW * - at the end of previous command after sending the CSW
*/ */
static void udi_msc_cbw_wait(void); static void udi_msc_cbw_wait();
/** /**
* \brief Callback called after CBW reception * \brief Callback called after CBW reception
@ -228,7 +228,7 @@ static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
* *
* Called at the end of SCSI command * Called at the end of SCSI command
*/ */
static void udi_msc_csw_process(void); static void udi_msc_csw_process();
/** /**
* \brief Sends CSW * \brief Sends CSW
@ -236,7 +236,7 @@ static void udi_msc_csw_process(void);
* Called by #udi_msc_csw_process() * Called by #udi_msc_csw_process()
* or UDD callback when endpoint halt is cleared * or UDD callback when endpoint halt is cleared
*/ */
void udi_msc_csw_send(void); void udi_msc_csw_send();
/** /**
* \brief Callback called after CSW sent * \brief Callback called after CSW sent
@ -259,7 +259,7 @@ static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
/** /**
* \brief Reinitialize sense data. * \brief Reinitialize sense data.
*/ */
static void udi_msc_clear_sense(void); static void udi_msc_clear_sense();
/** /**
* \brief Update sense data with new value to signal a fail * \brief Update sense data with new value to signal a fail
@ -274,37 +274,37 @@ static void udi_msc_sense_fail(uint8_t sense_key, uint16_t add_sense,
/** /**
* \brief Update sense data with new value to signal success * \brief Update sense data with new value to signal success
*/ */
static void udi_msc_sense_pass(void); static void udi_msc_sense_pass();
/** /**
* \brief Update sense data to signal that memory is not present * \brief Update sense data to signal that memory is not present
*/ */
static void udi_msc_sense_fail_not_present(void); static void udi_msc_sense_fail_not_present();
/** /**
* \brief Update sense data to signal that memory is busy * \brief Update sense data to signal that memory is busy
*/ */
static void udi_msc_sense_fail_busy_or_change(void); static void udi_msc_sense_fail_busy_or_change();
/** /**
* \brief Update sense data to signal a hardware error on memory * \brief Update sense data to signal a hardware error on memory
*/ */
static void udi_msc_sense_fail_hardware(void); static void udi_msc_sense_fail_hardware();
/** /**
* \brief Update sense data to signal that memory is protected * \brief Update sense data to signal that memory is protected
*/ */
static void udi_msc_sense_fail_protected(void); static void udi_msc_sense_fail_protected();
/** /**
* \brief Update sense data to signal that CDB fields are not valid * \brief Update sense data to signal that CDB fields are not valid
*/ */
static void udi_msc_sense_fail_cdb_invalid(void); static void udi_msc_sense_fail_cdb_invalid();
/** /**
* \brief Update sense data to signal that command is not supported * \brief Update sense data to signal that command is not supported
*/ */
static void udi_msc_sense_command_invalid(void); static void udi_msc_sense_command_invalid();
//@} //@}
@ -317,31 +317,31 @@ static void udi_msc_sense_command_invalid(void);
* \brief Process SPC Request Sense command * \brief Process SPC Request Sense command
* Returns error information about last command * Returns error information about last command
*/ */
static void udi_msc_spc_requestsense(void); static void udi_msc_spc_requestsense();
/** /**
* \brief Process SPC Inquiry command * \brief Process SPC Inquiry command
* Returns information (name,version) about disk * Returns information (name,version) about disk
*/ */
static void udi_msc_spc_inquiry(void); static void udi_msc_spc_inquiry();
/** /**
* \brief Checks state of disk * \brief Checks state of disk
* *
* \retval true if disk is ready, otherwise false and updates sense data * \retval true if disk is ready, otherwise false and updates sense data
*/ */
static bool udi_msc_spc_testunitready_global(void); static bool udi_msc_spc_testunitready_global();
/** /**
* \brief Process test unit ready command * \brief Process test unit ready command
* Returns state of logical unit * Returns state of logical unit
*/ */
static void udi_msc_spc_testunitready(void); static void udi_msc_spc_testunitready();
/** /**
* \brief Process prevent allow medium removal command * \brief Process prevent allow medium removal command
*/ */
static void udi_msc_spc_prevent_allow_medium_removal(void); static void udi_msc_spc_prevent_allow_medium_removal();
/** /**
* \brief Process mode sense command * \brief Process mode sense command
@ -354,12 +354,12 @@ static void udi_msc_spc_mode_sense(bool b_sense10);
/** /**
* \brief Process start stop command * \brief Process start stop command
*/ */
static void udi_msc_sbc_start_stop(void); static void udi_msc_sbc_start_stop();
/** /**
* \brief Process read capacity command * \brief Process read capacity command
*/ */
static void udi_msc_sbc_read_capacity(void); static void udi_msc_sbc_read_capacity();
/** /**
* \brief Process read10 or write10 command * \brief Process read10 or write10 command
@ -373,7 +373,7 @@ static void udi_msc_sbc_trans(bool b_read);
//@} //@}
bool udi_msc_enable(void) bool udi_msc_enable()
{ {
uint8_t lun; uint8_t lun;
udi_msc_b_trans_req = false; udi_msc_b_trans_req = false;
@ -398,7 +398,7 @@ bool udi_msc_enable(void)
} }
void udi_msc_disable(void) void udi_msc_disable()
{ {
udi_msc_b_trans_req = false; udi_msc_b_trans_req = false;
udi_msc_b_ack_trans = true; udi_msc_b_ack_trans = true;
@ -407,7 +407,7 @@ void udi_msc_disable(void)
} }
bool udi_msc_setup(void) bool udi_msc_setup()
{ {
if (Udd_setup_is_in()) { if (Udd_setup_is_in()) {
// Requests Interface GET // Requests Interface GET
@ -451,7 +451,7 @@ bool udi_msc_setup(void)
return false; // Not supported request return false; // Not supported request
} }
uint8_t udi_msc_getsetting(void) uint8_t udi_msc_getsetting()
{ {
return 0; // MSC don't have multiple alternate setting return 0; // MSC don't have multiple alternate setting
} }
@ -460,7 +460,7 @@ uint8_t udi_msc_getsetting(void)
// ------------------------ // ------------------------
//------- Routines to process CBW packet //------- Routines to process CBW packet
static void udi_msc_cbw_invalid(void) static void udi_msc_cbw_invalid()
{ {
if (!udi_msc_b_cbw_invalid) if (!udi_msc_b_cbw_invalid)
return; // Don't re-stall endpoint if error reseted by setup return; // Don't re-stall endpoint if error reseted by setup
@ -469,7 +469,7 @@ static void udi_msc_cbw_invalid(void)
udd_ep_wait_stall_clear(UDI_MSC_EP_OUT, udi_msc_cbw_invalid); udd_ep_wait_stall_clear(UDI_MSC_EP_OUT, udi_msc_cbw_invalid);
} }
static void udi_msc_csw_invalid(void) static void udi_msc_csw_invalid()
{ {
if (!udi_msc_b_cbw_invalid) if (!udi_msc_b_cbw_invalid)
return; // Don't re-stall endpoint if error reseted by setup return; // Don't re-stall endpoint if error reseted by setup
@ -478,7 +478,7 @@ static void udi_msc_csw_invalid(void)
udd_ep_wait_stall_clear(UDI_MSC_EP_IN, udi_msc_csw_invalid); udd_ep_wait_stall_clear(UDI_MSC_EP_IN, udi_msc_csw_invalid);
} }
static void udi_msc_cbw_wait(void) static void udi_msc_cbw_wait()
{ {
// Register buffer and callback on OUT endpoint // Register buffer and callback on OUT endpoint
if (!udd_ep_run(UDI_MSC_EP_OUT, true, if (!udd_ep_run(UDI_MSC_EP_OUT, true,
@ -648,7 +648,7 @@ static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
// ------------------------ // ------------------------
//------- Routines to process CSW packet //------- Routines to process CSW packet
static void udi_msc_csw_process(void) static void udi_msc_csw_process()
{ {
if (0 != udi_msc_csw.dCSWDataResidue) { if (0 != udi_msc_csw.dCSWDataResidue) {
// Residue not NULL // Residue not NULL
@ -665,7 +665,7 @@ static void udi_msc_csw_process(void)
} }
void udi_msc_csw_send(void) void udi_msc_csw_send()
{ {
// Sends CSW on IN endpoint // Sends CSW on IN endpoint
if (!udd_ep_run(UDI_MSC_EP_IN, false, if (!udd_ep_run(UDI_MSC_EP_IN, false,
@ -694,7 +694,7 @@ static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
// ------------------------ // ------------------------
//------- Routines manage sense data //------- Routines manage sense data
static void udi_msc_clear_sense(void) static void udi_msc_clear_sense()
{ {
memset((uint8_t*)&udi_msc_sense, 0, sizeof(struct scsi_request_sense_data)); memset((uint8_t*)&udi_msc_sense, 0, sizeof(struct scsi_request_sense_data));
udi_msc_sense.valid_reponse_code = SCSI_SENSE_VALID | SCSI_SENSE_CURRENT; udi_msc_sense.valid_reponse_code = SCSI_SENSE_VALID | SCSI_SENSE_CURRENT;
@ -715,42 +715,42 @@ static void udi_msc_sense_fail(uint8_t sense_key, uint16_t add_sense,
udi_msc_sense.AddSnsCodeQlfr = add_sense; udi_msc_sense.AddSnsCodeQlfr = add_sense;
} }
static void udi_msc_sense_pass(void) static void udi_msc_sense_pass()
{ {
udi_msc_clear_sense(); udi_msc_clear_sense();
udi_msc_csw.bCSWStatus = USB_CSW_STATUS_PASS; udi_msc_csw.bCSWStatus = USB_CSW_STATUS_PASS;
} }
static void udi_msc_sense_fail_not_present(void) static void udi_msc_sense_fail_not_present()
{ {
udi_msc_sense_fail(SCSI_SK_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT, 0); udi_msc_sense_fail(SCSI_SK_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT, 0);
} }
static void udi_msc_sense_fail_busy_or_change(void) static void udi_msc_sense_fail_busy_or_change()
{ {
udi_msc_sense_fail(SCSI_SK_UNIT_ATTENTION, udi_msc_sense_fail(SCSI_SK_UNIT_ATTENTION,
SCSI_ASC_NOT_READY_TO_READY_CHANGE, 0); SCSI_ASC_NOT_READY_TO_READY_CHANGE, 0);
} }
static void udi_msc_sense_fail_hardware(void) static void udi_msc_sense_fail_hardware()
{ {
udi_msc_sense_fail(SCSI_SK_HARDWARE_ERROR, udi_msc_sense_fail(SCSI_SK_HARDWARE_ERROR,
SCSI_ASC_NO_ADDITIONAL_SENSE_INFO, 0); SCSI_ASC_NO_ADDITIONAL_SENSE_INFO, 0);
} }
static void udi_msc_sense_fail_protected(void) static void udi_msc_sense_fail_protected()
{ {
udi_msc_sense_fail(SCSI_SK_DATA_PROTECT, SCSI_ASC_WRITE_PROTECTED, 0); udi_msc_sense_fail(SCSI_SK_DATA_PROTECT, SCSI_ASC_WRITE_PROTECTED, 0);
} }
static void udi_msc_sense_fail_cdb_invalid(void) static void udi_msc_sense_fail_cdb_invalid()
{ {
udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST, udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST,
SCSI_ASC_INVALID_FIELD_IN_CDB, 0); SCSI_ASC_INVALID_FIELD_IN_CDB, 0);
} }
static void udi_msc_sense_command_invalid(void) static void udi_msc_sense_command_invalid()
{ {
udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST, udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST,
SCSI_ASC_INVALID_COMMAND_OPERATION_CODE, 0); SCSI_ASC_INVALID_COMMAND_OPERATION_CODE, 0);
@ -760,7 +760,7 @@ static void udi_msc_sense_command_invalid(void)
// ------------------------ // ------------------------
//------- Routines manage SCSI Commands //------- Routines manage SCSI Commands
static void udi_msc_spc_requestsense(void) static void udi_msc_spc_requestsense()
{ {
uint8_t length = udi_msc_cbw.CDB[4]; uint8_t length = udi_msc_cbw.CDB[4];
@ -775,7 +775,7 @@ static void udi_msc_spc_requestsense(void)
} }
static void udi_msc_spc_inquiry(void) static void udi_msc_spc_inquiry()
{ {
uint8_t length, i; uint8_t length, i;
UDC_DATA(4) UDC_DATA(4)
@ -836,7 +836,7 @@ static void udi_msc_spc_inquiry(void)
} }
static bool udi_msc_spc_testunitready_global(void) static bool udi_msc_spc_testunitready_global()
{ {
switch (mem_test_unit_ready(udi_msc_cbw.bCBWLUN)) { switch (mem_test_unit_ready(udi_msc_cbw.bCBWLUN)) {
case CTRL_GOOD: case CTRL_GOOD:
@ -856,7 +856,7 @@ static bool udi_msc_spc_testunitready_global(void)
} }
static void udi_msc_spc_testunitready(void) static void udi_msc_spc_testunitready()
{ {
if (udi_msc_spc_testunitready_global()) { if (udi_msc_spc_testunitready_global()) {
// LUN ready, then update sense data with status pass // LUN ready, then update sense data with status pass
@ -944,7 +944,7 @@ static void udi_msc_spc_mode_sense(bool b_sense10)
} }
static void udi_msc_spc_prevent_allow_medium_removal(void) static void udi_msc_spc_prevent_allow_medium_removal()
{ {
uint8_t prevent = udi_msc_cbw.CDB[4]; uint8_t prevent = udi_msc_cbw.CDB[4];
if (0 == prevent) { if (0 == prevent) {
@ -956,7 +956,7 @@ static void udi_msc_spc_prevent_allow_medium_removal(void)
} }
static void udi_msc_sbc_start_stop(void) static void udi_msc_sbc_start_stop()
{ {
bool start = 0x1 & udi_msc_cbw.CDB[4]; bool start = 0x1 & udi_msc_cbw.CDB[4];
bool loej = 0x2 & udi_msc_cbw.CDB[4]; bool loej = 0x2 & udi_msc_cbw.CDB[4];
@ -968,7 +968,7 @@ static void udi_msc_sbc_start_stop(void)
} }
static void udi_msc_sbc_read_capacity(void) static void udi_msc_sbc_read_capacity()
{ {
UDC_BSS(4) static struct sbc_read_capacity10_data udi_msc_capacity; UDC_BSS(4) static struct sbc_read_capacity10_data udi_msc_capacity;
@ -1039,7 +1039,7 @@ static void udi_msc_sbc_trans(bool b_read)
} }
bool udi_msc_process_trans(void) bool udi_msc_process_trans()
{ {
Ctrl_status status; Ctrl_status status;

20
Marlin/src/HAL/HAL_DUE/usb/udi_msc.h
View file

@ -148,7 +148,7 @@ typedef struct {
* *
* Routine called by the main loop * Routine called by the main loop
*/ */
bool udi_msc_process_trans(void); bool udi_msc_process_trans();
/** /**
* \brief Transfers data to/from USB MSC endpoints * \brief Transfers data to/from USB MSC endpoints
@ -206,26 +206,26 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
#define UDI_MSC_GLOBAL_PRODUCT_VERSION \ #define UDI_MSC_GLOBAL_PRODUCT_VERSION \
'1', '.', '0', '0' '1', '.', '0', '0'
#define UDI_MSC_ENABLE_EXT() my_callback_msc_enable() #define UDI_MSC_ENABLE_EXT() my_callback_msc_enable()
extern bool my_callback_msc_enable(void); extern bool my_callback_msc_enable();
#define UDI_MSC_DISABLE_EXT() my_callback_msc_disable() #define UDI_MSC_DISABLE_EXT() my_callback_msc_disable()
extern void my_callback_msc_disable(void); extern void my_callback_msc_disable();
#include "udi_msc_conf.h" // At the end of conf_usb.h file #include "udi_msc_conf.h" // At the end of conf_usb.h file
\endcode \endcode
* *
* Add to application C-file: * Add to application C-file:
* \code * \code
static bool my_flag_autorize_msc_transfert = false; static bool my_flag_autorize_msc_transfert = false;
bool my_callback_msc_enable(void) bool my_callback_msc_enable()
{ {
my_flag_autorize_msc_transfert = true; my_flag_autorize_msc_transfert = true;
return true; return true;
} }
void my_callback_msc_disable(void) void my_callback_msc_disable()
{ {
my_flag_autorize_msc_transfert = false; my_flag_autorize_msc_transfert = false;
} }
void task(void) void task()
{ {
udi_msc_process_trans(); udi_msc_process_trans();
} }
@ -244,7 +244,7 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
* \note The USB MSC interface requires a vendor ID (8 ASCII characters) * \note The USB MSC interface requires a vendor ID (8 ASCII characters)
* and a product version (4 ASCII characters). * and a product version (4 ASCII characters).
* - \code #define UDI_MSC_ENABLE_EXT() my_callback_msc_enable() * - \code #define UDI_MSC_ENABLE_EXT() my_callback_msc_enable()
extern bool my_callback_msc_enable(void); \endcode extern bool my_callback_msc_enable(); \endcode
* \note After the device enumeration (detecting and identifying USB devices), * \note After the device enumeration (detecting and identifying USB devices),
* the USB host starts the device configuration. When the USB MSC interface * the USB host starts the device configuration. When the USB MSC interface
* from the device is accepted by the host, the USB host enables this interface and the * from the device is accepted by the host, the USB host enables this interface and the
@ -252,7 +252,7 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
* Thus, when this event is received, the tasks which call * Thus, when this event is received, the tasks which call
* udi_msc_process_trans() must be enabled. * udi_msc_process_trans() must be enabled.
* - \code #define UDI_MSC_DISABLE_EXT() my_callback_msc_disable() * - \code #define UDI_MSC_DISABLE_EXT() my_callback_msc_disable()
extern void my_callback_msc_disable(void); \endcode extern void my_callback_msc_disable(); \endcode
* \note When the USB device is unplugged or is reset by the USB host, the USB * \note When the USB device is unplugged or is reset by the USB host, the USB
* interface is disabled and the UDI_MSC_DISABLE_EXT() callback function * interface is disabled and the UDI_MSC_DISABLE_EXT() callback function
* is called. Thus, it is recommended to disable the task which is called udi_msc_process_trans(). * is called. Thus, it is recommended to disable the task which is called udi_msc_process_trans().
@ -260,14 +260,14 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
* which provides the memories interfaces. However, the memory data transfers * which provides the memories interfaces. However, the memory data transfers
* must be done outside USB interrupt routine. This is done in the MSC process * must be done outside USB interrupt routine. This is done in the MSC process
* ("udi_msc_process_trans()") called by main loop: * ("udi_msc_process_trans()") called by main loop:
* - \code * void task(void) { * - \code * void task() {
udi_msc_process_trans(); udi_msc_process_trans();
} \endcode } \endcode
* -# The MSC speed depends on task periodicity. To get the best speed * -# The MSC speed depends on task periodicity. To get the best speed
* the notification callback "UDI_MSC_NOTIFY_TRANS_EXT" can be used to wakeup * the notification callback "UDI_MSC_NOTIFY_TRANS_EXT" can be used to wakeup
* this task (Example, through a mutex): * this task (Example, through a mutex):
* - \code #define UDI_MSC_NOTIFY_TRANS_EXT() msc_notify_trans() * - \code #define UDI_MSC_NOTIFY_TRANS_EXT() msc_notify_trans()
void msc_notify_trans(void) { void msc_notify_trans() {
wakeup_my_task(); wakeup_my_task();
} \endcode } \endcode
* *

92
Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c
View file

@ -357,41 +357,41 @@ static uint16_t udd_ctrl_payload_buf_cnt;
* *
* Called after a USB line reset or when UDD is enabled * Called after a USB line reset or when UDD is enabled
*/ */
static void udd_reset_ep_ctrl(void); static void udd_reset_ep_ctrl();
/** /**
* \brief Reset control endpoint management * \brief Reset control endpoint management
* *
* Called after a USB line reset or at the end of SETUP request (after ZLP) * Called after a USB line reset or at the end of SETUP request (after ZLP)
*/ */
static void udd_ctrl_init(void); static void udd_ctrl_init();
//! \brief Managed reception of SETUP packet on control endpoint //! \brief Managed reception of SETUP packet on control endpoint
static void udd_ctrl_setup_received(void); static void udd_ctrl_setup_received();
//! \brief Managed reception of IN packet on control endpoint //! \brief Managed reception of IN packet on control endpoint
static void udd_ctrl_in_sent(void); static void udd_ctrl_in_sent();
//! \brief Managed reception of OUT packet on control endpoint //! \brief Managed reception of OUT packet on control endpoint
static void udd_ctrl_out_received(void); static void udd_ctrl_out_received();
//! \brief Managed underflow event of IN packet on control endpoint //! \brief Managed underflow event of IN packet on control endpoint
static void udd_ctrl_underflow(void); static void udd_ctrl_underflow();
//! \brief Managed overflow event of OUT packet on control endpoint //! \brief Managed overflow event of OUT packet on control endpoint
static void udd_ctrl_overflow(void); static void udd_ctrl_overflow();
//! \brief Managed stall event of IN/OUT packet on control endpoint //! \brief Managed stall event of IN/OUT packet on control endpoint
static void udd_ctrl_stall_data(void); static void udd_ctrl_stall_data();
//! \brief Send a ZLP IN on control endpoint //! \brief Send a ZLP IN on control endpoint
static void udd_ctrl_send_zlp_in(void); static void udd_ctrl_send_zlp_in();
//! \brief Send a ZLP OUT on control endpoint //! \brief Send a ZLP OUT on control endpoint
static void udd_ctrl_send_zlp_out(void); static void udd_ctrl_send_zlp_out();
//! \brief Call callback associated to setup request //! \brief Call callback associated to setup request
static void udd_ctrl_endofrequest(void); static void udd_ctrl_endofrequest();
/** /**
@ -401,7 +401,7 @@ static void udd_ctrl_endofrequest(void);
* *
* \return \c 1 if an event about control endpoint is occured, otherwise \c 0. * \return \c 1 if an event about control endpoint is occured, otherwise \c 0.
*/ */
static bool udd_ctrl_interrupt(void); static bool udd_ctrl_interrupt();
//@} //@}
@ -448,10 +448,10 @@ typedef struct {
static udd_ep_job_t udd_ep_job[USB_DEVICE_MAX_EP]; static udd_ep_job_t udd_ep_job[USB_DEVICE_MAX_EP];
//! \brief Reset all job table //! \brief Reset all job table
static void udd_ep_job_table_reset(void); static void udd_ep_job_table_reset();
//! \brief Abort all endpoint jobs on going //! \brief Abort all endpoint jobs on going
static void udd_ep_job_table_kill(void); static void udd_ep_job_table_kill();
#ifdef UDD_EP_FIFO_SUPPORTED #ifdef UDD_EP_FIFO_SUPPORTED
/** /**
@ -500,7 +500,7 @@ static void udd_ep_finish_job(udd_ep_job_t * ptr_job, bool b_abort, uint8_t ep_n
* *
* \return \c 1 if an event about bulk/interrupt/isochronous endpoints has occured, otherwise \c 0. * \return \c 1 if an event about bulk/interrupt/isochronous endpoints has occured, otherwise \c 0.
*/ */
static bool udd_ep_interrupt(void); static bool udd_ep_interrupt();
#endif // (0!=USB_DEVICE_MAX_EP) #endif // (0!=USB_DEVICE_MAX_EP)
//@} //@}
@ -524,8 +524,8 @@ static bool udd_ep_interrupt(void);
* See Technical reference $3.8.3 Masking interrupt requests in peripheral modules. * See Technical reference $3.8.3 Masking interrupt requests in peripheral modules.
*/ */
#ifdef UHD_ENABLE #ifdef UHD_ENABLE
void udd_interrupt(void); void udd_interrupt();
void udd_interrupt(void) void udd_interrupt()
#else #else
ISR(UDD_USB_INT_FUN) ISR(UDD_USB_INT_FUN)
#endif #endif
@ -643,13 +643,13 @@ udd_interrupt_sof_end:
} }
bool udd_include_vbus_monitoring(void) bool udd_include_vbus_monitoring()
{ {
return true; return true;
} }
void udd_enable(void) void udd_enable()
{ {
irqflags_t flags; irqflags_t flags;
@ -736,7 +736,7 @@ void udd_enable(void)
} }
void udd_disable(void) void udd_disable()
{ {
irqflags_t flags; irqflags_t flags;
@ -777,7 +777,7 @@ void udd_disable(void)
} }
void udd_attach(void) void udd_attach()
{ {
irqflags_t flags; irqflags_t flags;
flags = cpu_irq_save(); flags = cpu_irq_save();
@ -818,7 +818,7 @@ void udd_attach(void)
} }
void udd_detach(void) void udd_detach()
{ {
otg_unfreeze_clock(); otg_unfreeze_clock();
@ -829,7 +829,7 @@ void udd_detach(void)
} }
bool udd_is_high_speed(void) bool udd_is_high_speed()
{ {
#ifdef USB_DEVICE_HS_SUPPORT #ifdef USB_DEVICE_HS_SUPPORT
return !Is_udd_full_speed_mode(); return !Is_udd_full_speed_mode();
@ -847,23 +847,23 @@ void udd_set_address(uint8_t address)
} }
uint8_t udd_getaddress(void) uint8_t udd_getaddress()
{ {
return udd_get_configured_address(); return udd_get_configured_address();
} }
uint16_t udd_get_frame_number(void) uint16_t udd_get_frame_number()
{ {
return udd_frame_number(); return udd_frame_number();
} }
uint16_t udd_get_micro_frame_number(void) uint16_t udd_get_micro_frame_number()
{ {
return udd_micro_frame_number(); return udd_micro_frame_number();
} }
void udd_send_remotewakeup(void) void udd_send_remotewakeup()
{ {
#ifndef UDD_NO_SLEEP_MGR #ifndef UDD_NO_SLEEP_MGR
if (!udd_b_idle) if (!udd_b_idle)
@ -1242,27 +1242,27 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
#ifdef USB_DEVICE_HS_SUPPORT #ifdef USB_DEVICE_HS_SUPPORT
void udd_test_mode_j(void) void udd_test_mode_j()
{ {
udd_enable_hs_test_mode(); udd_enable_hs_test_mode();
udd_enable_hs_test_mode_j(); udd_enable_hs_test_mode_j();
} }
void udd_test_mode_k(void) void udd_test_mode_k()
{ {
udd_enable_hs_test_mode(); udd_enable_hs_test_mode();
udd_enable_hs_test_mode_k(); udd_enable_hs_test_mode_k();
} }
void udd_test_mode_se0_nak(void) void udd_test_mode_se0_nak()
{ {
udd_enable_hs_test_mode(); udd_enable_hs_test_mode();
} }
void udd_test_mode_packet(void) void udd_test_mode_packet()
{ {
uint8_t i; uint8_t i;
uint8_t *ptr_dest; uint8_t *ptr_dest;
@ -1310,7 +1310,7 @@ void udd_test_mode_packet(void)
// ------------------------ // ------------------------
//--- INTERNAL ROUTINES TO MANAGED THE CONTROL ENDPOINT //--- INTERNAL ROUTINES TO MANAGED THE CONTROL ENDPOINT
static void udd_reset_ep_ctrl(void) static void udd_reset_ep_ctrl()
{ {
irqflags_t flags; irqflags_t flags;
@ -1334,7 +1334,7 @@ static void udd_reset_ep_ctrl(void)
cpu_irq_restore(flags); cpu_irq_restore(flags);
} }
static void udd_ctrl_init(void) static void udd_ctrl_init()
{ {
irqflags_t flags; irqflags_t flags;
flags = cpu_irq_save(); flags = cpu_irq_save();
@ -1357,7 +1357,7 @@ static void udd_ctrl_init(void)
} }
static void udd_ctrl_setup_received(void) static void udd_ctrl_setup_received()
{ {
irqflags_t flags; irqflags_t flags;
uint8_t i; uint8_t i;
@ -1419,7 +1419,7 @@ static void udd_ctrl_setup_received(void)
} }
static void udd_ctrl_in_sent(void) static void udd_ctrl_in_sent()
{ {
static bool b_shortpacket = false; static bool b_shortpacket = false;
uint16_t nb_remain; uint16_t nb_remain;
@ -1503,7 +1503,7 @@ static void udd_ctrl_in_sent(void)
} }
static void udd_ctrl_out_received(void) static void udd_ctrl_out_received()
{ {
irqflags_t flags; irqflags_t flags;
uint8_t i; uint8_t i;
@ -1594,7 +1594,7 @@ static void udd_ctrl_out_received(void)
} }
static void udd_ctrl_underflow(void) static void udd_ctrl_underflow()
{ {
if (Is_udd_out_received(0)) if (Is_udd_out_received(0))
return; // Underflow ignored if OUT data is received return; // Underflow ignored if OUT data is received
@ -1611,7 +1611,7 @@ static void udd_ctrl_underflow(void)
} }
static void udd_ctrl_overflow(void) static void udd_ctrl_overflow()
{ {
if (Is_udd_in_send(0)) if (Is_udd_in_send(0))
return; // Overflow ignored if IN data is received return; // Overflow ignored if IN data is received
@ -1627,7 +1627,7 @@ static void udd_ctrl_overflow(void)
} }
static void udd_ctrl_stall_data(void) static void udd_ctrl_stall_data()
{ {
// Stall all packets on IN & OUT control endpoint // Stall all packets on IN & OUT control endpoint
udd_ep_control_state = UDD_EPCTRL_STALL_REQ; udd_ep_control_state = UDD_EPCTRL_STALL_REQ;
@ -1635,7 +1635,7 @@ static void udd_ctrl_stall_data(void)
} }
static void udd_ctrl_send_zlp_in(void) static void udd_ctrl_send_zlp_in()
{ {
irqflags_t flags; irqflags_t flags;
@ -1653,7 +1653,7 @@ static void udd_ctrl_send_zlp_in(void)
} }
static void udd_ctrl_send_zlp_out(void) static void udd_ctrl_send_zlp_out()
{ {
irqflags_t flags; irqflags_t flags;
@ -1669,7 +1669,7 @@ static void udd_ctrl_send_zlp_out(void)
} }
static void udd_ctrl_endofrequest(void) static void udd_ctrl_endofrequest()
{ {
// If a callback is registered then call it // If a callback is registered then call it
if (udd_g_ctrlreq.callback) { if (udd_g_ctrlreq.callback) {
@ -1678,7 +1678,7 @@ static void udd_ctrl_endofrequest(void)
} }
static bool udd_ctrl_interrupt(void) static bool udd_ctrl_interrupt()
{ {
if (!Is_udd_endpoint_interrupt(0)) { if (!Is_udd_endpoint_interrupt(0)) {
@ -1734,7 +1734,7 @@ static bool udd_ctrl_interrupt(void)
#if (0 != USB_DEVICE_MAX_EP) #if (0 != USB_DEVICE_MAX_EP)
static void udd_ep_job_table_reset(void) static void udd_ep_job_table_reset()
{ {
uint8_t i; uint8_t i;
for (i = 0; i < USB_DEVICE_MAX_EP; i++) { for (i = 0; i < USB_DEVICE_MAX_EP; i++) {
@ -1744,7 +1744,7 @@ static void udd_ep_job_table_reset(void)
} }
static void udd_ep_job_table_kill(void) static void udd_ep_job_table_kill()
{ {
uint8_t i; uint8_t i;
@ -1970,7 +1970,7 @@ static void udd_ep_out_received(udd_ep_id_t ep)
} }
#endif // #ifdef UDD_EP_FIFO_SUPPORTED #endif // #ifdef UDD_EP_FIFO_SUPPORTED
static bool udd_ep_interrupt(void) static bool udd_ep_interrupt()
{ {
udd_ep_id_t ep; udd_ep_id_t ep;
udd_ep_job_t *ptr_job; udd_ep_job_t *ptr_job;

4
Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h
View file

@ -66,13 +66,13 @@ extern "C" {
* *
* \return \c true if the ID pin management has been started, otherwise \c false. * \return \c true if the ID pin management has been started, otherwise \c false.
*/ */
bool otg_dual_enable(void); bool otg_dual_enable();
/** /**
* \brief Uninitialize the dual role * \brief Uninitialize the dual role
* This function is implemented in uotghs_host.c file. * This function is implemented in uotghs_host.c file.
*/ */
void otg_dual_disable(void); void otg_dual_disable();
//! @name UOTGHS OTG ID pin management //! @name UOTGHS OTG ID pin management

18
Marlin/src/HAL/HAL_DUE/usb/usb_task.c
View file

@ -56,7 +56,7 @@
static volatile bool main_b_cdc_enable = false; static volatile bool main_b_cdc_enable = false;
static volatile bool main_b_dtr_active = false; static volatile bool main_b_dtr_active = false;
void usb_task_idle(void) { void usb_task_idle() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Attend SD card access from the USB MSD -- Prioritize access to improve speed // Attend SD card access from the USB MSD -- Prioritize access to improve speed
int delay = 2; int delay = 2;
@ -70,14 +70,14 @@ void usb_task_idle(void) {
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
bool usb_task_msc_enable(void) { return ((main_b_msc_enable = true)); } bool usb_task_msc_enable() { return ((main_b_msc_enable = true)); }
void usb_task_msc_disable(void) { main_b_msc_enable = false; } void usb_task_msc_disable() { main_b_msc_enable = false; }
bool usb_task_msc_isenabled(void) { return main_b_msc_enable; } bool usb_task_msc_isenabled() { return main_b_msc_enable; }
#endif #endif
bool usb_task_cdc_enable(const uint8_t port) { UNUSED(port); return ((main_b_cdc_enable = true)); } bool usb_task_cdc_enable(const uint8_t port) { UNUSED(port); return ((main_b_cdc_enable = true)); }
void usb_task_cdc_disable(const uint8_t port) { UNUSED(port); main_b_cdc_enable = false; main_b_dtr_active = false; } void usb_task_cdc_disable(const uint8_t port) { UNUSED(port); main_b_cdc_enable = false; main_b_dtr_active = false; }
bool usb_task_cdc_isenabled(void) { return main_b_cdc_enable; } bool usb_task_cdc_isenabled() { return main_b_cdc_enable; }
/*! \brief Called by CDC interface /*! \brief Called by CDC interface
* Callback running when CDC device have received data * Callback running when CDC device have received data
@ -121,7 +121,7 @@ void usb_task_cdc_set_dtr(const uint8_t port, const bool b_enable) {
} }
} }
bool usb_task_cdc_dtr_active(void) { return main_b_dtr_active; } bool usb_task_cdc_dtr_active() { return main_b_dtr_active; }
/// Microsoft WCID descriptor /// Microsoft WCID descriptor
typedef struct USB_MicrosoftCompatibleDescriptor_Interface { typedef struct USB_MicrosoftCompatibleDescriptor_Interface {
@ -202,7 +202,7 @@ static USB_MicrosoftExtendedPropertiesDescriptor microsoft_extended_properties_d
** WCID configuration information ** WCID configuration information
** Hooked into UDC via UDC_GET_EXTRA_STRING #define. ** Hooked into UDC via UDC_GET_EXTRA_STRING #define.
*/ */
bool usb_task_extra_string(void) { bool usb_task_extra_string() {
static uint8_t udi_msft_magic[] = "MSFT100\xEE"; static uint8_t udi_msft_magic[] = "MSFT100\xEE";
static uint8_t udi_cdc_name[] = "CDC interface"; static uint8_t udi_cdc_name[] = "CDC interface";
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
@ -262,7 +262,7 @@ bool usb_task_extra_string(void) {
/************************************************************************************************** /**************************************************************************************************
** Handle device requests that the ASF stack doesn't ** Handle device requests that the ASF stack doesn't
*/ */
bool usb_task_other_requests(void) { bool usb_task_other_requests() {
uint8_t* ptr = 0; uint8_t* ptr = 0;
uint16_t size = 0; uint16_t size = 0;
@ -297,7 +297,7 @@ bool usb_task_other_requests(void) {
return true; return true;
} }
void usb_task_init(void) { void usb_task_init() {
uint16_t *ptr; uint16_t *ptr;

20
Marlin/src/HAL/HAL_DUE/usb/usb_task.h
View file

@ -58,12 +58,12 @@ extern "C" {
* *
* \retval true if MSC startup is ok * \retval true if MSC startup is ok
*/ */
bool usb_task_msc_enable(void); bool usb_task_msc_enable();
/*! \brief Called by MSC interface /*! \brief Called by MSC interface
* Callback running when USB Host disable MSC interface * Callback running when USB Host disable MSC interface
*/ */
void usb_task_msc_disable(void); void usb_task_msc_disable();
/*! \brief Opens the communication port /*! \brief Opens the communication port
* This is called by CDC interface when USB Host enable it. * This is called by CDC interface when USB Host enable it.
@ -84,25 +84,25 @@ void usb_task_cdc_set_dtr(const uint8_t port, const bool b_enable);
/*! \brief Check if MSC is enumerated and configured on the PC side /*! \brief Check if MSC is enumerated and configured on the PC side
*/ */
bool usb_task_msc_isenabled(void); bool usb_task_msc_isenabled();
/*! \brief Check if CDC is enumerated and configured on the PC side /*! \brief Check if CDC is enumerated and configured on the PC side
*/ */
bool usb_task_cdc_isenabled(void); bool usb_task_cdc_isenabled();
/*! \brief Check if CDC is actually OPEN by an application on the PC side /*! \brief Check if CDC is actually OPEN by an application on the PC side
* assuming DTR signal means a program is listening to messages * assuming DTR signal means a program is listening to messages
*/ */
bool usb_task_cdc_dtr_active(void); bool usb_task_cdc_dtr_active();
/*! \brief Called by UDC when USB Host request a extra string different /*! \brief Called by UDC when USB Host request a extra string different
* of this specified in USB device descriptor * of this specified in USB device descriptor
*/ */
bool usb_task_extra_string(void); bool usb_task_extra_string();
/*! \brief Called by UDC when USB Host performs unknown requests /*! \brief Called by UDC when USB Host performs unknown requests
*/ */
bool usb_task_other_requests(void); bool usb_task_other_requests();
/*! \brief Called by CDC interface /*! \brief Called by CDC interface
* Callback running when CDC device have received data * Callback running when CDC device have received data
@ -117,15 +117,15 @@ void usb_task_cdc_config(const uint8_t port, usb_cdc_line_coding_t *cfg);
/*! \brief The USB device interrupt /*! \brief The USB device interrupt
*/ */
void USBD_ISR(void); void USBD_ISR();
/*! \brief USB task init /*! \brief USB task init
*/ */
void usb_task_init(void); void usb_task_init();
/*! \brief USB task idle /*! \brief USB task idle
*/ */
void usb_task_idle(void); void usb_task_idle();
#ifdef __cplusplus #ifdef __cplusplus
} }

4
Marlin/src/HAL/HAL_DUE/watchdog.cpp
View file

@ -32,7 +32,7 @@
// process, because watchdog initialization at hardware reset on SAM3X8E // process, because watchdog initialization at hardware reset on SAM3X8E
// is unreliable, and there is risk of unintended resets if we delay // is unreliable, and there is risk of unintended resets if we delay
// that initialization to a later time. // that initialization to a later time.
void watchdogSetup(void) { void watchdogSetup() {
#if ENABLED(USE_WATCHDOG) #if ENABLED(USE_WATCHDOG)
@ -106,7 +106,7 @@ void watchdogSetup(void) {
// Initialize watchdog - On SAM3X, Watchdog was already configured // Initialize watchdog - On SAM3X, Watchdog was already configured
// and enabled or disabled at startup, so no need to reconfigure it // and enabled or disabled at startup, so no need to reconfigure it
// here. // here.
void watchdog_init(void) { void watchdog_init() {
// Reset watchdog to start clean // Reset watchdog to start clean
WDT_Restart(WDT); WDT_Restart(WDT);
} }

2
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
View file

@ -29,7 +29,7 @@ class FlushableHardwareSerial : public HardwareSerial {
public: public:
FlushableHardwareSerial(int uart_nr); FlushableHardwareSerial(int uart_nr);
inline void flushTX(void) { /* No need to flush the hardware serial, but defined here for compatibility. */ } inline void flushTX() { /* No need to flush the hardware serial, but defined here for compatibility. */ }
}; };
extern FlushableHardwareSerial flushableSerial; extern FlushableHardwareSerial flushableSerial;

10
Marlin/src/HAL/HAL_ESP32/HAL.cpp
View file

@ -78,11 +78,11 @@ volatile int numPWMUsed = 0,
// Public functions // Public functions
// ------------------------ // ------------------------
void HAL_init(void) { void HAL_init() {
i2s_init(); i2s_init();
} }
void HAL_init_board(void) { void HAL_init_board() {
#if EITHER(EEPROM_SETTINGS, WEBSUPPORT) #if EITHER(EEPROM_SETTINGS, WEBSUPPORT)
spiffs_init(); spiffs_init();
#endif #endif
@ -99,15 +99,15 @@ void HAL_init_board(void) {
#endif #endif
} }
void HAL_idletask(void) { void HAL_idletask() {
#if ENABLED(OTASUPPORT) #if ENABLED(OTASUPPORT)
OTA_handle(); OTA_handle();
#endif #endif
} }
void HAL_clear_reset_source(void) { } void HAL_clear_reset_source() { }
uint8_t HAL_get_reset_source(void) { return rtc_get_reset_reason(1); } uint8_t HAL_get_reset_source() { return rtc_get_reset_reason(1); }
void _delay_ms(int delay_ms) { delay(delay_ms); } void _delay_ms(int delay_ms) { delay(delay_ms); }

14
Marlin/src/HAL/HAL_ESP32/HAL.h
View file

@ -85,16 +85,16 @@ extern uint16_t HAL_adc_result;
// ------------------------ // ------------------------
// clear reset reason // clear reset reason
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
// reset reason // reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();
void _delay_ms(int delay); void _delay_ms(int delay);
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
int freeMemory(void); int freeMemory();
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
void analogWrite(pin_t pin, int value); void analogWrite(pin_t pin, int value);
@ -108,7 +108,7 @@ void eeprom_update_block (const void *__src, void *__dst, size_t __n);
// ADC // ADC
#define HAL_ANALOG_SELECT(pin) #define HAL_ANALOG_SELECT(pin)
void HAL_adc_init(void); void HAL_adc_init();
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin) #define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result #define HAL_READ_ADC() HAL_adc_result
@ -123,6 +123,6 @@ void HAL_adc_start_conversion(uint8_t adc_pin);
// Enable hooks into idle and setup for HAL // Enable hooks into idle and setup for HAL
#define HAL_IDLETASK 1 #define HAL_IDLETASK 1
#define BOARD_INIT() HAL_init_board(); #define BOARD_INIT() HAL_init_board();
void HAL_idletask(void); void HAL_idletask();
void HAL_init(void); void HAL_init();
void HAL_init_board(void); void HAL_init_board();

2
Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
View file

@ -80,7 +80,7 @@ void spiInit(uint8_t spiRate) {
SPI.begin(); SPI.begin();
} }
uint8_t spiRec(void) { uint8_t spiRec() {
SPI.beginTransaction(spiConfig); SPI.beginTransaction(spiConfig);
uint8_t returnByte = SPI.transfer(0xFF); uint8_t returnByte = SPI.transfer(0xFF);
SPI.endTransaction(); SPI.endTransaction();

18
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
View file

@ -66,15 +66,15 @@ ring_buffer_pos_t RingBuffer::write(const uint8_t *buffer, ring_buffer_pos_t siz
return written; return written;
} }
int RingBuffer::available(void) { int RingBuffer::available() {
return (size - read_index + write_index) & (size - 1); return (size - read_index + write_index) & (size - 1);
} }
int RingBuffer::peek(void) { int RingBuffer::peek() {
return available() ? data[read_index] : -1; return available() ? data[read_index] : -1;
} }
int RingBuffer::read(void) { int RingBuffer::read() {
if (available()) { if (available()) {
const int ret = data[read_index]; const int ret = data[read_index];
read_index = NEXT_INDEX(read_index, size); read_index = NEXT_INDEX(read_index, size);
@ -94,7 +94,7 @@ ring_buffer_pos_t RingBuffer::read(uint8_t *buffer) {
return len; return len;
} }
void RingBuffer::flush(void) { read_index = write_index; } void RingBuffer::flush() { read_index = write_index; }
// WebSocketSerial impl // WebSocketSerial impl
WebSocketSerial::WebSocketSerial() WebSocketSerial::WebSocketSerial()
@ -120,10 +120,10 @@ void WebSocketSerial::begin(const long baud_setting) {
} }
void WebSocketSerial::end() { } void WebSocketSerial::end() { }
int WebSocketSerial::peek(void) { return rx_buffer.peek(); } int WebSocketSerial::peek() { return rx_buffer.peek(); }
int WebSocketSerial::read(void) { return rx_buffer.read(); } int WebSocketSerial::read() { return rx_buffer.read(); }
int WebSocketSerial::available(void) { return rx_buffer.available(); } int WebSocketSerial::available() { return rx_buffer.available(); }
void WebSocketSerial::flush(void) { rx_buffer.flush(); } void WebSocketSerial::flush() { rx_buffer.flush(); }
size_t WebSocketSerial::write(const uint8_t c) { size_t WebSocketSerial::write(const uint8_t c) {
size_t ret = tx_buffer.write(c); size_t ret = tx_buffer.write(c);
@ -145,7 +145,7 @@ size_t WebSocketSerial::write(const uint8_t* buffer, size_t size) {
return written; return written;
} }
void WebSocketSerial::flushTX(void) { void WebSocketSerial::flushTX() {
// No need to do anything as there's no benefit to sending partial lines over the websocket connection. // No need to do anything as there's no benefit to sending partial lines over the websocket connection.
} }

18
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
View file

@ -45,11 +45,11 @@ public:
RingBuffer(ring_buffer_pos_t size); RingBuffer(ring_buffer_pos_t size);
~RingBuffer(); ~RingBuffer();
int available(void); int available();
int peek(void); int peek();
int read(void); int read();
ring_buffer_pos_t read(uint8_t *buffer); ring_buffer_pos_t read(uint8_t *buffer);
void flush(void); void flush();
ring_buffer_pos_t write(const uint8_t c); ring_buffer_pos_t write(const uint8_t c);
ring_buffer_pos_t write(const uint8_t* buffer, ring_buffer_pos_t size); ring_buffer_pos_t write(const uint8_t* buffer, ring_buffer_pos_t size);
}; };
@ -62,11 +62,11 @@ public:
WebSocketSerial(); WebSocketSerial();
void begin(const long); void begin(const long);
void end(); void end();
int available(void); int available();
int peek(void); int peek();
int read(void); int read();
void flush(void); void flush();
void flushTX(void); void flushTX();
size_t write(const uint8_t c); size_t write(const uint8_t c);
size_t write(const uint8_t* buffer, size_t size); size_t write(const uint8_t* buffer, size_t size);

4
Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
View file

@ -38,9 +38,9 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void ICACHE_RAM_ATTR endstop_ISR(void) { endstops.update(); } void ICACHE_RAM_ATTR endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE) #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
#if HAS_X_MAX #if HAS_X_MAX
_ATTACH(X_MAX_PIN); _ATTACH(X_MAX_PIN);

14
Marlin/src/HAL/HAL_ESP32/timers.h
View file

@ -79,13 +79,13 @@ typedef uint64_t hal_timer_t;
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM) #define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM) #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
#define HAL_TEMP_TIMER_ISR() extern "C" void tempTC_Handler(void) #define HAL_TEMP_TIMER_ISR() extern "C" void tempTC_Handler()
#define HAL_STEP_TIMER_ISR() extern "C" void stepTC_Handler(void) #define HAL_STEP_TIMER_ISR() extern "C" void stepTC_Handler()
#define HAL_PWM_TIMER_ISR() extern "C" void pwmTC_Handler(void) #define HAL_PWM_TIMER_ISR() extern "C" void pwmTC_Handler()
extern "C" void tempTC_Handler(void); extern "C" void tempTC_Handler();
extern "C" void stepTC_Handler(void); extern "C" void stepTC_Handler();
extern "C" void pwmTC_Handler(void); extern "C" void pwmTC_Handler();
// ------------------------ // ------------------------
// Types // Types
@ -95,7 +95,7 @@ typedef struct {
timer_group_t group; timer_group_t group;
timer_idx_t idx; timer_idx_t idx;
uint32_t divider; uint32_t divider;
void (*fn)(void); void (*fn)();
} tTimerConfig; } tTimerConfig;
// ------------------------ // ------------------------

4
Marlin/src/HAL/HAL_ESP32/watchdog.cpp
View file

@ -28,11 +28,11 @@
#include "watchdog.h" #include "watchdog.h"
void watchdogSetup(void) { void watchdogSetup() {
// do whatever. don't remove this function. // do whatever. don't remove this function.
} }
void watchdog_init(void) { void watchdog_init() {
// TODO // TODO
} }

12
Marlin/src/HAL/HAL_LINUX/HAL.cpp
View file

@ -31,10 +31,10 @@ HalSerial usb_serial;
extern "C" void u8g_xMicroDelay(uint16_t val) { extern "C" void u8g_xMicroDelay(uint16_t val) {
DELAY_US(val); DELAY_US(val);
} }
extern "C" void u8g_MicroDelay(void) { extern "C" void u8g_MicroDelay() {
u8g_xMicroDelay(1); u8g_xMicroDelay(1);
} }
extern "C" void u8g_10MicroDelay(void) { extern "C" void u8g_10MicroDelay() {
u8g_xMicroDelay(10); u8g_xMicroDelay(10);
} }
extern "C" void u8g_Delay(uint16_t val) { extern "C" void u8g_Delay(uint16_t val) {
@ -51,7 +51,7 @@ int freeMemory() {
// ADC // ADC
// ------------------------ // ------------------------
void HAL_adc_init(void) { void HAL_adc_init() {
} }
@ -64,18 +64,18 @@ void HAL_adc_start_conversion(const uint8_t ch) {
active_ch = ch; active_ch = ch;
} }
bool HAL_adc_finished(void) { bool HAL_adc_finished() {
return true; return true;
} }
uint16_t HAL_adc_get_result(void) { uint16_t HAL_adc_get_result() {
pin_t pin = analogInputToDigitalPin(active_ch); pin_t pin = analogInputToDigitalPin(active_ch);
if (!VALID_PIN(pin)) return 0; if (!VALID_PIN(pin)) return 0;
uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF); uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
return data; // return 10bit value as Marlin expects return data; // return 10bit value as Marlin expects
} }
void HAL_pwm_init(void) { void HAL_pwm_init() {
} }

8
Marlin/src/HAL/HAL_LINUX/HAL.h
View file

@ -78,12 +78,12 @@ extern HalSerial usb_serial;
#define ENABLE_ISRS() #define ENABLE_ISRS()
#define DISABLE_ISRS() #define DISABLE_ISRS()
inline void HAL_init(void) { } inline void HAL_init() { }
// Utility functions // Utility functions
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
int freeMemory(void); int freeMemory();
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
// ADC // ADC
@ -92,10 +92,10 @@ int freeMemory(void);
#define HAL_READ_ADC() HAL_adc_get_result() #define HAL_READ_ADC() HAL_adc_get_result()
#define HAL_ADC_READY() true #define HAL_ADC_READY() true
void HAL_adc_init(void); void HAL_adc_init();
void HAL_adc_enable_channel(int pin); void HAL_adc_enable_channel(int pin);
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
/* ---------------- Delay in cycles */ /* ---------------- Delay in cycles */
FORCE_INLINE static void DELAY_CYCLES(uint64_t x) { FORCE_INLINE static void DELAY_CYCLES(uint64_t x) {

4
Marlin/src/HAL/HAL_LINUX/arduino.cpp
View file

@ -28,8 +28,8 @@
#include "../shared/Delay.h" #include "../shared/Delay.h"
// Interrupts // Interrupts
void cli(void) { } // Disable void cli() { } // Disable
void sei(void) { } // Enable void sei() { } // Enable
// Time functions // Time functions
void _delay_ms(const int delay_ms) { void _delay_ms(const int delay_ms) {

6
Marlin/src/HAL/HAL_LINUX/include/Arduino.h
View file

@ -63,9 +63,9 @@ typedef uint8_t byte;
#define constrain(value, arg_min, arg_max) ((value) < (arg_min) ? (arg_min) :((value) > (arg_max) ? (arg_max) : (value))) #define constrain(value, arg_min, arg_max) ((value) < (arg_min) ? (arg_min) :((value) > (arg_max) ? (arg_max) : (value)))
//Interrupts //Interrupts
void cli(void); // Disable void cli(); // Disable
void sei(void); // Enable void sei(); // Enable
void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode); void attachInterrupt(uint32_t pin, void (*callback)(), uint32_t mode);
void detachInterrupt(uint32_t pin); void detachInterrupt(uint32_t pin);
extern "C" void GpioEnableInt(uint32_t port, uint32_t pin, uint32_t mode); extern "C" void GpioEnableInt(uint32_t port, uint32_t pin, uint32_t mode);
extern "C" void GpioDisableInt(uint32_t port, uint32_t pin); extern "C" void GpioDisableInt(uint32_t port, uint32_t pin);

6
Marlin/src/HAL/HAL_LINUX/include/serial.h
View file

@ -108,11 +108,11 @@ public:
void flush() { receive_buffer.clear(); } void flush() { receive_buffer.clear(); }
uint8_t availableForWrite(void) { uint8_t availableForWrite() {
return transmit_buffer.free() > 255 ? 255 : (uint8_t)transmit_buffer.free(); return transmit_buffer.free() > 255 ? 255 : (uint8_t)transmit_buffer.free();
} }
void flushTX(void) { void flushTX() {
if (host_connected) if (host_connected)
while (transmit_buffer.available()) { /* nada */ } while (transmit_buffer.available()) { /* nada */ }
} }
@ -200,7 +200,7 @@ public:
void println(unsigned long value, int nbase = 0) { print(value, nbase); println(); } void println(unsigned long value, int nbase = 0) { print(value, nbase); println(); }
void println(float value, int round = 6) { printf("%f\n" , value); } void println(float value, int round = 6) { printf("%f\n" , value); }
void println(double value, int round = 6) { printf("%f\n" , value); } void println(double value, int round = 6) { printf("%f\n" , value); }
void println(void) { print('\n'); } void println() { print('\n'); }
volatile RingBuffer<uint8_t, 128> receive_buffer; volatile RingBuffer<uint8_t, 128> receive_buffer;
volatile RingBuffer<uint8_t, 128> transmit_buffer; volatile RingBuffer<uint8_t, 128> transmit_buffer;

2
Marlin/src/HAL/HAL_LINUX/main.cpp
View file

@ -104,7 +104,7 @@ void simulation_loop() {
} }
} }
int main(void) { int main() {
std::thread write_serial (write_serial_thread); std::thread write_serial (write_serial_thread);
std::thread read_serial (read_serial_thread); std::thread read_serial (read_serial_thread);

2
Marlin/src/HAL/HAL_LINUX/timers.cpp
View file

@ -37,7 +37,7 @@ HAL_TEMP_TIMER_ISR();
Timer timers[2]; Timer timers[2];
void HAL_timer_init(void) { void HAL_timer_init() {
timers[0].init(0, STEPPER_TIMER_RATE, TIMER0_IRQHandler); timers[0].init(0, STEPPER_TIMER_RATE, TIMER0_IRQHandler);
timers[1].init(1, TEMP_TIMER_RATE, TIMER1_IRQHandler); timers[1].init(1, TEMP_TIMER_RATE, TIMER1_IRQHandler);
} }

8
Marlin/src/HAL/HAL_LINUX/timers.h
View file

@ -59,16 +59,16 @@ typedef uint32_t hal_timer_t;
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM) #define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM) #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
#define HAL_STEP_TIMER_ISR() extern "C" void TIMER0_IRQHandler(void) #define HAL_STEP_TIMER_ISR() extern "C" void TIMER0_IRQHandler()
#define HAL_TEMP_TIMER_ISR() extern "C" void TIMER1_IRQHandler(void) #define HAL_TEMP_TIMER_ISR() extern "C" void TIMER1_IRQHandler()
// PWM timer // PWM timer
#define HAL_PWM_TIMER #define HAL_PWM_TIMER
#define HAL_PWM_TIMER_ISR() extern "C" void TIMER3_IRQHandler(void) #define HAL_PWM_TIMER_ISR() extern "C" void TIMER3_IRQHandler()
#define HAL_PWM_TIMER_IRQn #define HAL_PWM_TIMER_IRQn
void HAL_timer_init(void); void HAL_timer_init();
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare); void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare);

10
Marlin/src/HAL/HAL_LINUX/watchdog.cpp
View file

@ -28,19 +28,19 @@
#include "watchdog.h" #include "watchdog.h"
void watchdog_init(void) {} void watchdog_init() {}
void HAL_clear_reset_source(void) {} void HAL_clear_reset_source() {}
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
return RST_POWER_ON; return RST_POWER_ON;
} }
void watchdog_reset() {} void watchdog_reset() {}
#else #else
void HAL_clear_reset_source(void) {} void HAL_clear_reset_source() {}
uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; } uint8_t HAL_get_reset_source() { return RST_POWER_ON; }
#endif // USE_WATCHDOG #endif // USE_WATCHDOG
#endif // __PLAT_LINUX__ #endif // __PLAT_LINUX__

8
Marlin/src/HAL/HAL_LINUX/watchdog.h
View file

@ -23,7 +23,7 @@
#define WDT_TIMEOUT 4000000 // 4 second timeout #define WDT_TIMEOUT 4000000 // 4 second timeout
void watchdog_init(void); void watchdog_init();
void watchdog_reset(void); void watchdog_reset();
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();

18
Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
View file

@ -44,7 +44,7 @@
#define sw_barrier() __asm__ volatile("": : :"memory"); #define sw_barrier() __asm__ volatile("": : :"memory");
// (re)initialize UART0 as a monitor output to 250000,n,8,1 // (re)initialize UART0 as a monitor output to 250000,n,8,1
static void TXBegin(void) { static void TXBegin() {
} }
// Send character through UART with no interrupts // Send character through UART with no interrupts
@ -210,7 +210,7 @@ void HardFault_HandlerC(unsigned long *sp, unsigned long lr, unsigned long cause
} }
extern "C" { extern "C" {
__attribute__((naked)) void NMI_Handler(void) { __attribute__((naked)) void NMI_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -223,7 +223,7 @@ __attribute__((naked)) void NMI_Handler(void) {
); );
} }
__attribute__((naked)) void HardFault_Handler(void) { __attribute__((naked)) void HardFault_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -236,7 +236,7 @@ __attribute__((naked)) void HardFault_Handler(void) {
); );
} }
__attribute__((naked)) void MemManage_Handler(void) { __attribute__((naked)) void MemManage_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -249,7 +249,7 @@ __attribute__((naked)) void MemManage_Handler(void) {
); );
} }
__attribute__((naked)) void BusFault_Handler(void) { __attribute__((naked)) void BusFault_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -262,7 +262,7 @@ __attribute__((naked)) void BusFault_Handler(void) {
); );
} }
__attribute__((naked)) void UsageFault_Handler(void) { __attribute__((naked)) void UsageFault_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -275,7 +275,7 @@ __attribute__((naked)) void UsageFault_Handler(void) {
); );
} }
__attribute__((naked)) void DebugMon_Handler(void) { __attribute__((naked)) void DebugMon_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -289,7 +289,7 @@ __attribute__((naked)) void DebugMon_Handler(void) {
} }
/* This is NOT an exception, it is an interrupt handler - Nevertheless, the framing is the same */ /* This is NOT an exception, it is an interrupt handler - Nevertheless, the framing is the same */
__attribute__((naked)) void WDT_IRQHandler(void) { __attribute__((naked)) void WDT_IRQHandler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")
@ -302,7 +302,7 @@ __attribute__((naked)) void WDT_IRQHandler(void) {
); );
} }
__attribute__((naked)) void RSTC_Handler(void) { __attribute__((naked)) void RSTC_Handler() {
__asm__ __volatile__ ( __asm__ __volatile__ (
".syntax unified" "\n\t" ".syntax unified" "\n\t"
A("tst lr, #4") A("tst lr, #4")

4
Marlin/src/HAL/HAL_LPC1768/HAL.cpp
View file

@ -30,10 +30,10 @@
extern "C" void u8g_xMicroDelay(uint16_t val) { extern "C" void u8g_xMicroDelay(uint16_t val) {
DELAY_US(val); DELAY_US(val);
} }
extern "C" void u8g_MicroDelay(void) { extern "C" void u8g_MicroDelay() {
u8g_xMicroDelay(1); u8g_xMicroDelay(1);
} }
extern "C" void u8g_10MicroDelay(void) { extern "C" void u8g_10MicroDelay() {
u8g_xMicroDelay(10); u8g_xMicroDelay(10);
} }
extern "C" void u8g_Delay(uint16_t val) { extern "C" void u8g_Delay(uint16_t val) {

6
Marlin/src/HAL/HAL_LPC1768/HAL.h
View file

@ -28,7 +28,7 @@
#define CPU_32_BIT #define CPU_32_BIT
void HAL_init(void); void HAL_init();
#include <stdint.h> #include <stdint.h>
#include <stdarg.h> #include <stdarg.h>
@ -113,7 +113,7 @@ extern "C" volatile uint32_t _millis;
// //
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
int freeMemory(void); int freeMemory();
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
// //
@ -144,7 +144,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09 #define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09
#define HAL_IDLETASK 1 #define HAL_IDLETASK 1
void HAL_idletask(void); void HAL_idletask();
#define PLATFORM_M997_SUPPORT #define PLATFORM_M997_SUPPORT
void flashFirmware(int16_t value); void flashFirmware(int16_t value);

8
Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp
View file

@ -27,28 +27,28 @@
#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) #if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0)
MarlinSerial MSerial(LPC_UART0); MarlinSerial MSerial(LPC_UART0);
extern "C" void UART0_IRQHandler(void) { extern "C" void UART0_IRQHandler() {
MSerial.IRQHandler(); MSerial.IRQHandler();
} }
#endif #endif
#if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1) #if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1)
MarlinSerial MSerial1((LPC_UART_TypeDef *) LPC_UART1); MarlinSerial MSerial1((LPC_UART_TypeDef *) LPC_UART1);
extern "C" void UART1_IRQHandler(void) { extern "C" void UART1_IRQHandler() {
MSerial1.IRQHandler(); MSerial1.IRQHandler();
} }
#endif #endif
#if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2) #if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2)
MarlinSerial MSerial2(LPC_UART2); MarlinSerial MSerial2(LPC_UART2);
extern "C" void UART2_IRQHandler(void) { extern "C" void UART2_IRQHandler() {
MSerial2.IRQHandler(); MSerial2.IRQHandler();
} }
#endif #endif
#if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3) #if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3)
MarlinSerial MSerial3(LPC_UART3); MarlinSerial MSerial3(LPC_UART3);
extern "C" void UART3_IRQHandler(void) { extern "C" void UART3_IRQHandler() {
MSerial3.IRQHandler(); MSerial3.IRQHandler();
} }
#endif #endif

4
Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h
View file

@ -38,9 +38,9 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE) #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
#if HAS_X_MAX #if HAS_X_MAX
#if !LPC1768_PIN_INTERRUPT_M(X_MAX_PIN) #if !LPC1768_PIN_INTERRUPT_M(X_MAX_PIN)

2
Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c
View file

@ -89,7 +89,7 @@ uint8_t digipot_mcp4451_start(uint8_t sla) { // send slave address and write bi
return 1; return 1;
} }
void digipot_mcp4451_init(void) { void digipot_mcp4451_init() {
/** /**
* Init I2C pin connect * Init I2C pin connect
*/ */

2
Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h
View file

@ -45,7 +45,7 @@
#include <lpc17xx_libcfg_default.h> #include <lpc17xx_libcfg_default.h>
uint8_t digipot_mcp4451_start(uint8_t sla); uint8_t digipot_mcp4451_start(uint8_t sla);
void digipot_mcp4451_init(void); void digipot_mcp4451_init();
uint8_t digipot_mcp4451_send_byte(uint8_t data); uint8_t digipot_mcp4451_send_byte(uint8_t data);
#ifdef __cplusplus #ifdef __cplusplus

6
Marlin/src/HAL/HAL_LPC1768/main.cpp
View file

@ -42,11 +42,11 @@ extern "C" {
extern uint32_t MSC_SD_Init(uint8_t pdrv); extern uint32_t MSC_SD_Init(uint8_t pdrv);
extern "C" int isLPC1769(); extern "C" int isLPC1769();
extern "C" void disk_timerproc(void); extern "C" void disk_timerproc();
void SysTick_Callback() { disk_timerproc(); } void SysTick_Callback() { disk_timerproc(); }
void HAL_init(void) { void HAL_init() {
// Init LEDs // Init LEDs
#if PIN_EXISTS(LED) #if PIN_EXISTS(LED)
@ -149,7 +149,7 @@ void HAL_init(void) {
} }
// HAL idle task // HAL idle task
void HAL_idletask(void) { void HAL_idletask() {
#if ENABLED(SHARED_SD_CARD) #if ENABLED(SHARED_SD_CARD)
// If Marlin is using the SD card we need to lock it to prevent access from // If Marlin is using the SD card we need to lock it to prevent access from
// a PC via USB. // a PC via USB.

2
Marlin/src/HAL/HAL_LPC1768/timers.cpp
View file

@ -31,7 +31,7 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#include "timers.h" #include "timers.h"
void HAL_timer_init(void) { void HAL_timer_init() {
SBI(LPC_SC->PCONP, SBIT_TIMER0); // Power ON Timer 0 SBI(LPC_SC->PCONP, SBIT_TIMER0); // Power ON Timer 0
LPC_TIM0->PR = (HAL_TIMER_RATE) / (STEPPER_TIMER_RATE) - 1; // Use prescaler to set frequency if needed LPC_TIM0->PR = (HAL_TIMER_RATE) / (STEPPER_TIMER_RATE) - 1; // Use prescaler to set frequency if needed

4
Marlin/src/HAL/HAL_LPC1768/timers.h
View file

@ -53,7 +53,7 @@
#define _HAL_TIMER(T) _CAT(LPC_TIM, T) #define _HAL_TIMER(T) _CAT(LPC_TIM, T)
#define _HAL_TIMER_IRQ(T) TIMER##T##_IRQn #define _HAL_TIMER_IRQ(T) TIMER##T##_IRQn
#define __HAL_TIMER_ISR(T) extern "C" void TIMER##T##_IRQHandler(void) #define __HAL_TIMER_ISR(T) extern "C" void TIMER##T##_IRQHandler()
#define _HAL_TIMER_ISR(T) __HAL_TIMER_ISR(T) #define _HAL_TIMER_ISR(T) __HAL_TIMER_ISR(T)
typedef uint32_t hal_timer_t; typedef uint32_t hal_timer_t;
@ -94,7 +94,7 @@ typedef uint32_t hal_timer_t;
// ------------------------ // ------------------------
// Public functions // Public functions
// ------------------------ // ------------------------
void HAL_timer_init(void); void HAL_timer_init();
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare) { FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare) {

2
Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.c
View file

@ -163,7 +163,7 @@ uint8_t u8g_i2c_send_byte(uint8_t data) {
return 1; return 1;
} }
void u8g_i2c_stop(void) { void u8g_i2c_stop() {
} }

2
Marlin/src/HAL/HAL_LPC1768/u8g/LCD_I2C_routines.h
View file

@ -25,4 +25,4 @@ void u8g_i2c_init(uint8_t options);
uint8_t u8g_i2c_wait(uint8_t mask, uint8_t pos); uint8_t u8g_i2c_wait(uint8_t mask, uint8_t pos);
uint8_t u8g_i2c_start(uint8_t sla); uint8_t u8g_i2c_start(uint8_t sla);
uint8_t u8g_i2c_send_byte(uint8_t data); uint8_t u8g_i2c_send_byte(uint8_t data);
void u8g_i2c_stop(void); void u8g_i2c_stop();

4
Marlin/src/HAL/HAL_LPC1768/u8g/LCD_delay.h
View file

@ -35,8 +35,8 @@
#endif #endif
void U8g_delay(int msec); void U8g_delay(int msec);
void u8g_MicroDelay(void); void u8g_MicroDelay();
void u8g_10MicroDelay(void); void u8g_10MicroDelay();
#ifdef __cplusplus #ifdef __cplusplus
} }

2
Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction
View file

@ -138,7 +138,7 @@ uint8_t u8g_i2c_start_sw(uint8_t sla) { // assert start condition and then send
} }
void u8g_i2c_stop_sw(void) { } void u8g_i2c_stop_sw() { }
void u8g_i2c_init_sw(uint8_t clock_option) { u8g_i2c_start(0); } // send slave address and write bit void u8g_i2c_init_sw(uint8_t clock_option) { u8g_i2c_start(0); } // send slave address and write bit

14
Marlin/src/HAL/HAL_LPC1768/watchdog.cpp
View file

@ -29,7 +29,7 @@
#include "lpc17xx_wdt.h" #include "lpc17xx_wdt.h"
#include "watchdog.h" #include "watchdog.h"
void watchdog_init(void) { void watchdog_init() {
#if ENABLED(WATCHDOG_RESET_MANUAL) #if ENABLED(WATCHDOG_RESET_MANUAL)
// We enable the watchdog timer, but only for the interrupt. // We enable the watchdog timer, but only for the interrupt.
@ -56,11 +56,11 @@ void watchdog_init(void) {
WDT_Start(WDT_TIMEOUT); WDT_Start(WDT_TIMEOUT);
} }
void HAL_clear_reset_source(void) { void HAL_clear_reset_source() {
WDT_ClrTimeOutFlag(); WDT_ClrTimeOutFlag();
} }
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
if (TEST(WDT_ReadTimeOutFlag(), 0)) return RST_WATCHDOG; if (TEST(WDT_ReadTimeOutFlag(), 0)) return RST_WATCHDOG;
return RST_POWER_ON; return RST_POWER_ON;
} }
@ -74,10 +74,10 @@ void watchdog_reset() {
#else #else
void watchdog_init(void) {} void watchdog_init() {}
void watchdog_reset(void) {} void watchdog_reset() {}
void HAL_clear_reset_source(void) {} void HAL_clear_reset_source() {}
uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; } uint8_t HAL_get_reset_source() { return RST_POWER_ON; }
#endif // USE_WATCHDOG #endif // USE_WATCHDOG

8
Marlin/src/HAL/HAL_LPC1768/watchdog.h
View file

@ -23,7 +23,7 @@
#define WDT_TIMEOUT 4000000 // 4 second timeout #define WDT_TIMEOUT 4000000 // 4 second timeout
void watchdog_init(void); void watchdog_init();
void watchdog_reset(void); void watchdog_reset();
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();

12
Marlin/src/HAL/HAL_SAMD51/HAL.cpp
View file

@ -368,7 +368,7 @@ uint16_t HAL_adc_result;
// ------------------------ // ------------------------
// HAL initialization task // HAL initialization task
void HAL_init(void) { void HAL_init() {
#if DMA_IS_REQUIRED #if DMA_IS_REQUIRED
dma_init(); dma_init();
#endif #endif
@ -383,15 +383,15 @@ void HAL_init(void) {
// HAL idle task // HAL idle task
/* /*
void HAL_idletask(void) { void HAL_idletask() {
} }
*/ */
void HAL_clear_reset_source(void) { } void HAL_clear_reset_source() { }
#pragma push_macro("WDT") #pragma push_macro("WDT")
#undef WDT // Required to be able to use '.bit.WDT'. Compiler wrongly replace struct field with WDT define #undef WDT // Required to be able to use '.bit.WDT'. Compiler wrongly replace struct field with WDT define
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
RSTC_RCAUSE_Type resetCause; RSTC_RCAUSE_Type resetCause;
resetCause.reg = REG_RSTC_RCAUSE; resetCause.reg = REG_RSTC_RCAUSE;
@ -421,7 +421,7 @@ int freeMemory() {
// ADC // ADC
// ------------------------ // ------------------------
void HAL_adc_init(void) { void HAL_adc_init() {
#if ADC_IS_REQUIRED #if ADC_IS_REQUIRED
memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results)); // Fill result with invalid values memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results)); // Fill result with invalid values
@ -469,7 +469,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
HAL_adc_result = 0xFFFF; HAL_adc_result = 0xFFFF;
} }
uint16_t HAL_adc_get_result(void) { uint16_t HAL_adc_get_result() {
return HAL_adc_result; return HAL_adc_result;
} }

14
Marlin/src/HAL/HAL_SAMD51/HAL.h
View file

@ -91,8 +91,8 @@ typedef int8_t pin_t;
#define cli() __disable_irq() // Disable interrupts #define cli() __disable_irq() // Disable interrupts
#define sei() __enable_irq() // Enable interrupts #define sei() __enable_irq() // Enable interrupts
void HAL_clear_reset_source(void); // clear reset reason void HAL_clear_reset_source(); // clear reset reason
uint8_t HAL_get_reset_source(void); // get reset reason uint8_t HAL_get_reset_source(); // get reset reason
// //
// EEPROM // EEPROM
@ -107,14 +107,14 @@ extern uint16_t HAL_adc_result; // result of last ADC conversion
#define HAL_ANALOG_SELECT(pin) #define HAL_ANALOG_SELECT(pin)
void HAL_adc_init(void); void HAL_adc_init();
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin) #define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result #define HAL_READ_ADC() HAL_adc_result
#define HAL_ADC_READY() true #define HAL_ADC_READY() true
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
// //
// Pin Map // Pin Map
@ -131,10 +131,10 @@ void tone(const pin_t _pin, const unsigned int frequency, const unsigned long du
void noTone(const pin_t _pin); void noTone(const pin_t _pin);
// Enable hooks into idle and setup for HAL // Enable hooks into idle and setup for HAL
void HAL_init(void); void HAL_init();
/* /*
#define HAL_IDLETASK 1 #define HAL_IDLETASK 1
void HAL_idletask(void); void HAL_idletask();
*/ */
// //
@ -144,7 +144,7 @@ FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
int freeMemory(void); int freeMemory();
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#ifdef __cplusplus #ifdef __cplusplus

4
Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
View file

@ -64,7 +64,7 @@
// ------------------------ // ------------------------
// Hardware SPI // Hardware SPI
// ------------------------ // ------------------------
void spiBegin(void) { void spiBegin() {
spiInit(SPI_HALF_SPEED); spiInit(SPI_HALF_SPEED);
} }
@ -92,7 +92,7 @@
* *
* @details * @details
*/ */
uint8_t spiRec(void) { uint8_t spiRec() {
sdSPI.beginTransaction(spiConfig); sdSPI.beginTransaction(spiConfig);
uint8_t returnByte = sdSPI.transfer(0xFF); uint8_t returnByte = sdSPI.transfer(0xFF);
sdSPI.endTransaction(); sdSPI.endTransaction();

4
Marlin/src/HAL/HAL_SAMD51/endstop_interrupts.h
View file

@ -112,9 +112,9 @@
&& !MATCH_Z_MIN_PROBE_EILINE(P)) && !MATCH_Z_MIN_PROBE_EILINE(P))
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#if HAS_X_MAX #if HAS_X_MAX
#if !AVAILABLE_EILINE(X_MAX_PIN) #if !AVAILABLE_EILINE(X_MAX_PIN)
static_assert(false, "X_MAX_PIN has no EXTINT line available."); static_assert(false, "X_MAX_PIN has no EXTINT line available.");

2
Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
View file

@ -27,7 +27,7 @@
#include "watchdog.h" #include "watchdog.h"
void watchdog_init(void) { void watchdog_init() {
// The low-power oscillator used by the WDT runs at 32,768 Hz with // The low-power oscillator used by the WDT runs at 32,768 Hz with
// a 1:32 prescale, thus 1024 Hz, though probably not super precise. // a 1:32 prescale, thus 1024 Hz, though probably not super precise.

8
Marlin/src/HAL/HAL_STM32/HAL.cpp
View file

@ -60,7 +60,7 @@ uint16_t HAL_adc_result;
#endif #endif
// HAL initialization task // HAL initialization task
void HAL_init(void) { void HAL_init() {
FastIO_init(); FastIO_init();
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
@ -84,9 +84,9 @@ void HAL_init(void) {
#endif // EEPROM_EMULATED_SRAM #endif // EEPROM_EMULATED_SRAM
} }
void HAL_clear_reset_source(void) { __HAL_RCC_CLEAR_RESET_FLAGS(); } void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
if (__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) return RST_WATCHDOG; if (__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) return RST_WATCHDOG;
if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET) return RST_SOFTWARE; if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET) return RST_SOFTWARE;
if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET) return RST_EXTERNAL; if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET) return RST_EXTERNAL;
@ -108,7 +108,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
HAL_adc_result = analogRead(adc_pin); HAL_adc_result = analogRead(adc_pin);
} }
uint16_t HAL_adc_get_result(void) { uint16_t HAL_adc_get_result() {
return HAL_adc_result; return HAL_adc_result;
} }

10
Marlin/src/HAL/HAL_STM32/HAL.h
View file

@ -147,13 +147,13 @@ extern uint16_t HAL_adc_result;
#define __bss_end __bss_end__ #define __bss_end __bss_end__
// Enable hooks into setup for HAL // Enable hooks into setup for HAL
void HAL_init(void); void HAL_init();
// Clear reset reason // Clear reset reason
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
// Reset reason // Reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();
void _delay_ms(const int delay); void _delay_ms(const int delay);
@ -185,7 +185,7 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n);
#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT) #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
inline void HAL_adc_init(void) {} inline void HAL_adc_init() {}
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin) #define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result #define HAL_READ_ADC() HAL_adc_result
@ -193,7 +193,7 @@ inline void HAL_adc_init(void) {}
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
#define GET_PIN_MAP_PIN(index) index #define GET_PIN_MAP_PIN(index) index
#define GET_PIN_MAP_INDEX(pin) pin #define GET_PIN_MAP_INDEX(pin) pin

4
Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
View file

@ -59,7 +59,7 @@ static SPISettings spiConfig;
* *
* @details Only configures SS pin since stm32duino creates and initialize the SPI object * @details Only configures SS pin since stm32duino creates and initialize the SPI object
*/ */
void spiBegin(void) { void spiBegin() {
#if !PIN_EXISTS(SS) #if !PIN_EXISTS(SS)
#error "SS_PIN not defined!" #error "SS_PIN not defined!"
#endif #endif
@ -93,7 +93,7 @@ void spiInit(uint8_t spiRate) {
* *
* @details * @details
*/ */
uint8_t spiRec(void) { uint8_t spiRec() {
SPI.beginTransaction(spiConfig); SPI.beginTransaction(spiConfig);
uint8_t returnByte = SPI.transfer(0xFF); uint8_t returnByte = SPI.transfer(0xFF);
SPI.endTransaction(); SPI.endTransaction();

4
Marlin/src/HAL/HAL_STM32/endstop_interrupts.h
View file

@ -25,9 +25,9 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#if HAS_X_MAX #if HAS_X_MAX
attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE); attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE);
#endif #endif

20
Marlin/src/HAL/HAL_STM32F1/HAL.cpp
View file

@ -201,16 +201,16 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
#if SERIAL_PORT > 0 #if SERIAL_PORT > 0
#if SERIAL_PORT2 #if SERIAL_PORT2
#if SERIAL_PORT2 > 0 #if SERIAL_PORT2 > 0
void board_setup_usb(void) {} void board_setup_usb() {}
#endif #endif
#else #else
void board_setup_usb(void) {} void board_setup_usb() {}
#endif #endif
#endif #endif
} } } }
#endif #endif
void HAL_init(void) { void HAL_init() {
NVIC_SetPriorityGrouping(0x3); NVIC_SetPriorityGrouping(0x3);
#if PIN_EXISTS(LED) #if PIN_EXISTS(LED)
OUT_WRITE(LED_PIN, LOW); OUT_WRITE(LED_PIN, LOW);
@ -226,7 +226,7 @@ void HAL_init(void) {
} }
// HAL idle task // HAL idle task
void HAL_idletask(void) { void HAL_idletask() {
#ifdef USE_USB_COMPOSITE #ifdef USE_USB_COMPOSITE
#if ENABLED(SHARED_SD_CARD) #if ENABLED(SHARED_SD_CARD)
// If Marlin is using the SD card we need to lock it to prevent access from // If Marlin is using the SD card we need to lock it to prevent access from
@ -245,19 +245,19 @@ void HAL_idletask(void) {
/* VGPV Done with defines /* VGPV Done with defines
// disable interrupts // disable interrupts
void cli(void) { noInterrupts(); } void cli() { noInterrupts(); }
// enable interrupts // enable interrupts
void sei(void) { interrupts(); } void sei() { interrupts(); }
*/ */
void HAL_clear_reset_source(void) { } void HAL_clear_reset_source() { }
/** /**
* TODO: Check this and change or remove. * TODO: Check this and change or remove.
* currently returns 1 that's equal to poweron reset. * currently returns 1 that's equal to poweron reset.
*/ */
uint8_t HAL_get_reset_source(void) { return 1; } uint8_t HAL_get_reset_source() { return 1; }
void _delay_ms(const int delay_ms) { delay(delay_ms); } void _delay_ms(const int delay_ms) { delay(delay_ms); }
@ -297,7 +297,7 @@ extern "C" {
// ADC // ADC
// ------------------------ // ------------------------
// Init the AD in continuous capture mode // Init the AD in continuous capture mode
void HAL_adc_init(void) { void HAL_adc_init() {
// configure the ADC // configure the ADC
adc.calibrate(); adc.calibrate();
#if F_CPU > 72000000 #if F_CPU > 72000000
@ -356,7 +356,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only. HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only.
} }
uint16_t HAL_adc_get_result(void) { return HAL_adc_result; } uint16_t HAL_adc_get_result() { return HAL_adc_result; }
uint16_t analogRead(pin_t pin) { uint16_t analogRead(pin_t pin) {
const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG; const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;

14
Marlin/src/HAL/HAL_STM32F1/HAL.h
View file

@ -116,9 +116,9 @@
#endif #endif
// Set interrupt grouping for this MCU // Set interrupt grouping for this MCU
void HAL_init(void); void HAL_init();
#define HAL_IDLETASK 1 #define HAL_IDLETASK 1
void HAL_idletask(void); void HAL_idletask();
/** /**
* TODO: review this to return 1 for pins that are not analog input * TODO: review this to return 1 for pins that are not analog input
@ -183,10 +183,10 @@ extern uint16_t HAL_adc_result;
#define __bss_end __bss_end__ #define __bss_end __bss_end__
// Clear reset reason // Clear reset reason
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
// Reset reason // Reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();
void _delay_ms(const int delay); void _delay_ms(const int delay);
@ -195,7 +195,7 @@ void _delay_ms(const int delay);
/* /*
extern "C" { extern "C" {
int freeMemory(void); int freeMemory();
} }
*/ */
@ -235,14 +235,14 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n);
#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG); #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
void HAL_adc_init(void); void HAL_adc_init();
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin) #define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result #define HAL_READ_ADC() HAL_adc_result
#define HAL_ADC_READY() true #define HAL_ADC_READY() true
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
uint16_t analogRead(pin_t pin); // need HAL_ANALOG_SELECT() first uint16_t analogRead(pin_t pin); // need HAL_ANALOG_SELECT() first
void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!? void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?

2
Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
View file

@ -112,7 +112,7 @@ void spiInit(uint8_t spiRate) {
* *
* @details * @details
*/ */
uint8_t spiRec(void) { uint8_t spiRec() {
uint8_t returnByte = SPI.transfer(ff); uint8_t returnByte = SPI.transfer(ff);
return returnByte; return returnByte;
} }

4
Marlin/src/HAL/HAL_STM32F1/SPI.cpp
View file

@ -499,7 +499,7 @@ uint8_t SPIClass::dmaSendAsync(const void * transmitBuf, uint16_t length, bool m
* New functions added to manage callbacks. * New functions added to manage callbacks.
* Victor Perez 2017 * Victor Perez 2017
*/ */
void SPIClass::onReceive(void(*callback)(void)) { void SPIClass::onReceive(void(*callback)()) {
_currentSetting->receiveCallback = callback; _currentSetting->receiveCallback = callback;
if (callback) { if (callback) {
switch (_currentSetting->spi_d->clk_id) { switch (_currentSetting->spi_d->clk_id) {
@ -527,7 +527,7 @@ void SPIClass::onReceive(void(*callback)(void)) {
} }
} }
void SPIClass::onTransmit(void(*callback)(void)) { void SPIClass::onTransmit(void(*callback)()) {
_currentSetting->transmitCallback = callback; _currentSetting->transmitCallback = callback;
if (callback) { if (callback) {
switch (_currentSetting->spi_d->clk_id) { switch (_currentSetting->spi_d->clk_id) {

10
Marlin/src/HAL/HAL_STM32F1/SPI.h
View file

@ -137,8 +137,8 @@ private:
spi_dev *spi_d; spi_dev *spi_d;
dma_channel spiRxDmaChannel, spiTxDmaChannel; dma_channel spiRxDmaChannel, spiTxDmaChannel;
dma_dev* spiDmaDev; dma_dev* spiDmaDev;
void (*receiveCallback)(void) = NULL; void (*receiveCallback)() = NULL;
void (*transmitCallback)(void) = NULL; void (*transmitCallback)() = NULL;
friend class SPIClass; friend class SPIClass;
}; };
@ -213,8 +213,8 @@ public:
* onTransmit used to set the callback in case of dmaSend (tx only). That function * onTransmit used to set the callback in case of dmaSend (tx only). That function
* will NOT be called in case of TX/RX * will NOT be called in case of TX/RX
*/ */
void onReceive(void(*)(void)); void onReceive(void(*)());
void onTransmit(void(*)(void)); void onTransmit(void(*)());
/* /*
* I/O * I/O
@ -327,7 +327,7 @@ public:
* @brief Get a pointer to the underlying libmaple spi_dev for * @brief Get a pointer to the underlying libmaple spi_dev for
* this HardwareSPI instance. * this HardwareSPI instance.
*/ */
spi_dev* c_dev(void) { return _currentSetting->spi_d; } spi_dev* c_dev() { return _currentSetting->spi_d; }
spi_dev* dev() { return _currentSetting->spi_d; } spi_dev* dev() { return _currentSetting->spi_d; }

2
Marlin/src/HAL/HAL_STM32F1/Servo.cpp
View file

@ -148,7 +148,7 @@ void libServo::move(const int32_t value) {
} }
#ifdef SERVO0_TIMER_NUM #ifdef SERVO0_TIMER_NUM
extern "C" void Servo_IRQHandler(void) { extern "C" void Servo_IRQHandler() {
static timer_dev *tdev = get_timer_dev(SERVO0_TIMER_NUM); static timer_dev *tdev = get_timer_dev(SERVO0_TIMER_NUM);
uint16_t SR = timer_get_status(tdev); uint16_t SR = timer_get_status(tdev);
if (SR & TIMER_SR_CC1IF) { // channel 1 off if (SR & TIMER_SR_CC1IF) { // channel 1 off

2
Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
View file

@ -113,7 +113,7 @@ uint8_t u8g_com_stm32duino_fsmc_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, voi
#define __ASM __asm #define __ASM __asm
#define __STATIC_INLINE static inline #define __STATIC_INLINE static inline
__attribute__((always_inline)) __STATIC_INLINE void __DSB(void) { __attribute__((always_inline)) __STATIC_INLINE void __DSB() {
__ASM volatile ("dsb 0xF":::"memory"); __ASM volatile ("dsb 0xF":::"memory");
} }

4
Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h
View file

@ -50,9 +50,9 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#if HAS_X_MAX #if HAS_X_MAX
attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE); // assign it attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE); // assign it
#endif #endif

8
Marlin/src/HAL/HAL_STM32F1/onboard_sd.cpp
View file

@ -128,7 +128,7 @@ static int wait_ready ( /* 1:Ready, 0:Timeout */
/* Deselect card and release SPI */ /* Deselect card and release SPI */
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static void deselect(void) { static void deselect() {
CS_HIGH(); /* CS = H */ CS_HIGH(); /* CS = H */
xchg_spi(0xFF); /* Dummy clock (force DO hi-z for multiple slave SPI) */ xchg_spi(0xFF); /* Dummy clock (force DO hi-z for multiple slave SPI) */
} }
@ -137,7 +137,7 @@ static void deselect(void) {
/* Select card and wait for ready */ /* Select card and wait for ready */
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static int select(void) { /* 1:OK, 0:Timeout */ static int select() { /* 1:OK, 0:Timeout */
CS_LOW(); /* CS = L */ CS_LOW(); /* CS = L */
xchg_spi(0xFF); /* Dummy clock (force DO enabled) */ xchg_spi(0xFF); /* Dummy clock (force DO enabled) */
@ -151,7 +151,7 @@ static int select(void) { /* 1:OK, 0:Timeout */
/* Control SPI module (Platform dependent) */ /* Control SPI module (Platform dependent) */
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static void power_on(void) { /* Enable SSP module and attach it to I/O pads */ static void power_on() { /* Enable SSP module and attach it to I/O pads */
ONBOARD_SD_SPI.setModule(ON_BOARD_SPI_DEVICE); ONBOARD_SD_SPI.setModule(ON_BOARD_SPI_DEVICE);
ONBOARD_SD_SPI.begin(); ONBOARD_SD_SPI.begin();
ONBOARD_SD_SPI.setBitOrder(MSBFIRST); ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
@ -159,7 +159,7 @@ static void power_on(void) { /* Enable SSP module and attach it to I/O pads */
OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); /* Set CS# high */ OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); /* Set CS# high */
} }
static void power_off(void) { /* Disable SPI function */ static void power_off() { /* Disable SPI function */
select(); /* Wait for card ready */ select(); /* Wait for card ready */
deselect(); deselect();
} }

20
Marlin/src/HAL/HAL_STM32F1/sdio.cpp
View file

@ -33,7 +33,7 @@
SDIO_CardInfoTypeDef SdCard; SDIO_CardInfoTypeDef SdCard;
bool SDIO_Init(void) { bool SDIO_Init() {
uint32_t count = 0U; uint32_t count = 0U;
SdCard.CardType = SdCard.CardVersion = SdCard.Class = SdCard.RelCardAdd = SdCard.BlockNbr = SdCard.BlockSize = SdCard.LogBlockNbr = SdCard.LogBlockSize = 0; SdCard.CardType = SdCard.CardVersion = SdCard.Class = SdCard.RelCardAdd = SdCard.BlockNbr = SdCard.BlockSize = SdCard.LogBlockNbr = SdCard.LogBlockSize = 0;
@ -167,21 +167,21 @@ bool SDIO_WriteBlock(uint32_t blockAddress, const uint8_t *data) {
return false; return false;
} }
inline uint32_t SDIO_GetCardState(void) { return SDIO_CmdSendStatus(SdCard.RelCardAdd << 16U) ? (SDIO_GetResponse(SDIO_RESP1) >> 9U) & 0x0FU : SDIO_CARD_ERROR; } inline uint32_t SDIO_GetCardState() { return SDIO_CmdSendStatus(SdCard.RelCardAdd << 16U) ? (SDIO_GetResponse(SDIO_RESP1) >> 9U) & 0x0FU : SDIO_CARD_ERROR; }
// ------------------------ // ------------------------
// SD Commands and Responses // SD Commands and Responses
// ------------------------ // ------------------------
void SDIO_SendCommand(uint16_t command, uint32_t argument) { SDIO->ARG = argument; SDIO->CMD = (uint32_t)(SDIO_CMD_CPSMEN | command); } void SDIO_SendCommand(uint16_t command, uint32_t argument) { SDIO->ARG = argument; SDIO->CMD = (uint32_t)(SDIO_CMD_CPSMEN | command); }
uint8_t SDIO_GetCommandResponse(void) { return (uint8_t)(SDIO->RESPCMD); } uint8_t SDIO_GetCommandResponse() { return (uint8_t)(SDIO->RESPCMD); }
uint32_t SDIO_GetResponse(uint32_t response) { return SDIO->RESP[response]; } uint32_t SDIO_GetResponse(uint32_t response) { return SDIO->RESP[response]; }
bool SDIO_CmdGoIdleState(void) { SDIO_SendCommand(CMD0_GO_IDLE_STATE, 0); return SDIO_GetCmdError(); } bool SDIO_CmdGoIdleState() { SDIO_SendCommand(CMD0_GO_IDLE_STATE, 0); return SDIO_GetCmdError(); }
bool SDIO_CmdSendCID(void) { SDIO_SendCommand(CMD2_ALL_SEND_CID, 0); return SDIO_GetCmdResp2(); } bool SDIO_CmdSendCID() { SDIO_SendCommand(CMD2_ALL_SEND_CID, 0); return SDIO_GetCmdResp2(); }
bool SDIO_CmdSetRelAdd(uint32_t *rca) { SDIO_SendCommand(CMD3_SET_REL_ADDR, 0); return SDIO_GetCmdResp6(SDMMC_CMD_SET_REL_ADDR, rca); } bool SDIO_CmdSetRelAdd(uint32_t *rca) { SDIO_SendCommand(CMD3_SET_REL_ADDR, 0); return SDIO_GetCmdResp6(SDMMC_CMD_SET_REL_ADDR, rca); }
bool SDIO_CmdSelDesel(uint32_t address) { SDIO_SendCommand(CMD7_SEL_DESEL_CARD, address); return SDIO_GetCmdResp1(SDMMC_CMD_SEL_DESEL_CARD); } bool SDIO_CmdSelDesel(uint32_t address) { SDIO_SendCommand(CMD7_SEL_DESEL_CARD, address); return SDIO_GetCmdResp1(SDMMC_CMD_SEL_DESEL_CARD); }
bool SDIO_CmdOperCond(void) { SDIO_SendCommand(CMD8_HS_SEND_EXT_CSD, SDMMC_CHECK_PATTERN); return SDIO_GetCmdResp7(); } bool SDIO_CmdOperCond() { SDIO_SendCommand(CMD8_HS_SEND_EXT_CSD, SDMMC_CHECK_PATTERN); return SDIO_GetCmdResp7(); }
bool SDIO_CmdSendCSD(uint32_t argument) { SDIO_SendCommand(CMD9_SEND_CSD, argument); return SDIO_GetCmdResp2(); } bool SDIO_CmdSendCSD(uint32_t argument) { SDIO_SendCommand(CMD9_SEND_CSD, argument); return SDIO_GetCmdResp2(); }
bool SDIO_CmdSendStatus(uint32_t argument) { SDIO_SendCommand(CMD13_SEND_STATUS, argument); return SDIO_GetCmdResp1(SDMMC_CMD_SEND_STATUS); } bool SDIO_CmdSendStatus(uint32_t argument) { SDIO_SendCommand(CMD13_SEND_STATUS, argument); return SDIO_GetCmdResp1(SDMMC_CMD_SEND_STATUS); }
bool SDIO_CmdReadSingleBlock(uint32_t address) { SDIO_SendCommand(CMD17_READ_SINGLE_BLOCK, address); return SDIO_GetCmdResp1(SDMMC_CMD_READ_SINGLE_BLOCK); } bool SDIO_CmdReadSingleBlock(uint32_t address) { SDIO_SendCommand(CMD17_READ_SINGLE_BLOCK, address); return SDIO_GetCmdResp1(SDMMC_CMD_READ_SINGLE_BLOCK); }
@ -212,7 +212,7 @@ bool SDIO_CmdAppSetClearCardDetect(uint32_t rsa) {
do { if (!--count) return false; } while (!SDIO_GET_FLAG(FLAGS)); \ do { if (!--count) return false; } while (!SDIO_GET_FLAG(FLAGS)); \
}while(0) }while(0)
bool SDIO_GetCmdError(void) { bool SDIO_GetCmdError() {
SDIO_WAIT(SDIO_STA_CMDSENT); SDIO_WAIT(SDIO_STA_CMDSENT);
SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS); SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS);
@ -232,7 +232,7 @@ bool SDIO_GetCmdResp1(uint8_t command) {
return (SDIO_GetResponse(SDIO_RESP1) & SDMMC_OCR_ERRORBITS) == SDMMC_ALLZERO; return (SDIO_GetResponse(SDIO_RESP1) & SDMMC_OCR_ERRORBITS) == SDMMC_ALLZERO;
} }
bool SDIO_GetCmdResp2(void) { bool SDIO_GetCmdResp2() {
SDIO_WAIT(SDIO_STA_CCRCFAIL | SDIO_STA_CMDREND | SDIO_STA_CTIMEOUT); SDIO_WAIT(SDIO_STA_CCRCFAIL | SDIO_STA_CMDREND | SDIO_STA_CTIMEOUT);
if (SDIO_GET_FLAG(SDIO_STA_CCRCFAIL | SDIO_STA_CTIMEOUT)) { if (SDIO_GET_FLAG(SDIO_STA_CCRCFAIL | SDIO_STA_CTIMEOUT)) {
@ -244,7 +244,7 @@ bool SDIO_GetCmdResp2(void) {
return true; return true;
} }
bool SDIO_GetCmdResp3(void) { bool SDIO_GetCmdResp3() {
SDIO_WAIT(SDIO_STA_CCRCFAIL | SDIO_STA_CMDREND | SDIO_STA_CTIMEOUT); SDIO_WAIT(SDIO_STA_CCRCFAIL | SDIO_STA_CMDREND | SDIO_STA_CTIMEOUT);
if (SDIO_GET_FLAG(SDIO_STA_CTIMEOUT)) { if (SDIO_GET_FLAG(SDIO_STA_CTIMEOUT)) {
@ -272,7 +272,7 @@ bool SDIO_GetCmdResp6(uint8_t command, uint32_t *rca) {
return true; return true;
} }
bool SDIO_GetCmdResp7(void) { bool SDIO_GetCmdResp7() {
SDIO_WAIT(SDIO_STA_CCRCFAIL | SDIO_STA_CMDREND | SDIO_STA_CTIMEOUT); SDIO_WAIT(SDIO_STA_CCRCFAIL | SDIO_STA_CMDREND | SDIO_STA_CTIMEOUT);
if (SDIO_GET_FLAG(SDIO_STA_CTIMEOUT)) { if (SDIO_GET_FLAG(SDIO_STA_CTIMEOUT)) {

18
Marlin/src/HAL/HAL_STM32F1/sdio.h
View file

@ -121,13 +121,13 @@ typedef struct {
// Public functions // Public functions
// ------------------------ // ------------------------
inline uint32_t SDIO_GetCardState(void); inline uint32_t SDIO_GetCardState();
bool SDIO_CmdGoIdleState(void); bool SDIO_CmdGoIdleState();
bool SDIO_CmdSendCID(void); bool SDIO_CmdSendCID();
bool SDIO_CmdSetRelAdd(uint32_t *rca); bool SDIO_CmdSetRelAdd(uint32_t *rca);
bool SDIO_CmdSelDesel(uint32_t address); bool SDIO_CmdSelDesel(uint32_t address);
bool SDIO_CmdOperCond(void); bool SDIO_CmdOperCond();
bool SDIO_CmdSendCSD(uint32_t argument); bool SDIO_CmdSendCSD(uint32_t argument);
bool SDIO_CmdSendStatus(uint32_t argument); bool SDIO_CmdSendStatus(uint32_t argument);
bool SDIO_CmdReadSingleBlock(uint32_t address); bool SDIO_CmdReadSingleBlock(uint32_t address);
@ -139,11 +139,11 @@ bool SDIO_CmdAppOperCommand(uint32_t sdType);
bool SDIO_CmdAppSetClearCardDetect(uint32_t rsa); bool SDIO_CmdAppSetClearCardDetect(uint32_t rsa);
void SDIO_SendCommand(uint16_t command, uint32_t argument); void SDIO_SendCommand(uint16_t command, uint32_t argument);
uint8_t SDIO_GetCommandResponse(void); uint8_t SDIO_GetCommandResponse();
uint32_t SDIO_GetResponse(uint32_t response); uint32_t SDIO_GetResponse(uint32_t response);
bool SDIO_GetCmdError(void); bool SDIO_GetCmdError();
bool SDIO_GetCmdResp1(uint8_t command); bool SDIO_GetCmdResp1(uint8_t command);
bool SDIO_GetCmdResp2(void); bool SDIO_GetCmdResp2();
bool SDIO_GetCmdResp3(void); bool SDIO_GetCmdResp3();
bool SDIO_GetCmdResp6(uint8_t command, uint32_t *rca); bool SDIO_GetCmdResp6(uint8_t command, uint32_t *rca);
bool SDIO_GetCmdResp7(void); bool SDIO_GetCmdResp7();

8
Marlin/src/HAL/HAL_STM32F1/timers.h
View file

@ -86,11 +86,11 @@ timer_dev* get_timer_dev(int number);
// TODO change this // TODO change this
#define HAL_TEMP_TIMER_ISR() extern "C" void tempTC_Handler(void) #define HAL_TEMP_TIMER_ISR() extern "C" void tempTC_Handler()
#define HAL_STEP_TIMER_ISR() extern "C" void stepTC_Handler(void) #define HAL_STEP_TIMER_ISR() extern "C" void stepTC_Handler()
extern "C" void tempTC_Handler(void); extern "C" void tempTC_Handler();
extern "C" void stepTC_Handler(void); extern "C" void stepTC_Handler();
// ------------------------ // ------------------------
// Public Variables // Public Variables

4
Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
View file

@ -40,7 +40,7 @@ void watchdog_reset() {
iwdg_feed(); iwdg_feed();
} }
void watchdogSetup(void) { void watchdogSetup() {
// do whatever. don't remove this function. // do whatever. don't remove this function.
} }
@ -51,7 +51,7 @@ void watchdogSetup(void) {
* *
* @details The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and 625 reload value (counts down to 0) * @details The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and 625 reload value (counts down to 0)
*/ */
void watchdog_init(void) { void watchdog_init() {
//iwdg_init(IWDG_PRE_256, STM32F1_WD_RELOAD); //iwdg_init(IWDG_PRE_256, STM32F1_WD_RELOAD);
} }

10
Marlin/src/HAL/HAL_STM32_F4_F7/HAL.cpp
View file

@ -39,15 +39,15 @@ uint16_t HAL_adc_result;
/* VGPV Done with defines /* VGPV Done with defines
// disable interrupts // disable interrupts
void cli(void) { noInterrupts(); } void cli() { noInterrupts(); }
// enable interrupts // enable interrupts
void sei(void) { interrupts(); } void sei() { interrupts(); }
*/ */
void HAL_clear_reset_source(void) { __HAL_RCC_CLEAR_RESET_FLAGS(); } void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
if (__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) return RST_WATCHDOG; if (__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) return RST_WATCHDOG;
if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET) return RST_SOFTWARE; if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET) return RST_SOFTWARE;
if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET) return RST_EXTERNAL; if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET) return RST_EXTERNAL;
@ -91,6 +91,6 @@ extern "C" {
void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRead(adc_pin); } void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRead(adc_pin); }
uint16_t HAL_adc_get_result(void) { return HAL_adc_result; } uint16_t HAL_adc_get_result() { return HAL_adc_result; }
#endif // STM32GENERIC && (STM32F4 || STM32F7) #endif // STM32GENERIC && (STM32F4 || STM32F7)

14
Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
View file

@ -150,19 +150,19 @@ extern uint16_t HAL_adc_result;
// Memory related // Memory related
#define __bss_end __bss_end__ #define __bss_end __bss_end__
inline void HAL_init(void) { } inline void HAL_init() { }
// Clear reset reason // Clear reset reason
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
// Reset reason // Reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();
void _delay_ms(const int delay); void _delay_ms(const int delay);
/* /*
extern "C" { extern "C" {
int freeMemory(void); int freeMemory();
} }
*/ */
@ -179,7 +179,7 @@ int freeMemory() {
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
static inline int freeMemory(void) { static inline int freeMemory() {
volatile char top; volatile char top;
return &top - reinterpret_cast<char*>(_sbrk(0)); return &top - reinterpret_cast<char*>(_sbrk(0));
} }
@ -205,14 +205,14 @@ void eeprom_update_block (const void *__src, void *__dst, size_t __n);
#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT) #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
inline void HAL_adc_init(void) {} inline void HAL_adc_init() {}
#define HAL_START_ADC(pin) HAL_adc_start_conversion(pin) #define HAL_START_ADC(pin) HAL_adc_start_conversion(pin)
#define HAL_READ_ADC() HAL_adc_result #define HAL_READ_ADC() HAL_adc_result
#define HAL_ADC_READY() true #define HAL_ADC_READY() true
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
#define GET_PIN_MAP_PIN(index) index #define GET_PIN_MAP_PIN(index) index
#define GET_PIN_MAP_INDEX(pin) pin #define GET_PIN_MAP_INDEX(pin) pin

4
Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
View file

@ -71,7 +71,7 @@ static SPISettings spiConfig;
* *
* @details Only configures SS pin since libmaple creates and initialize the SPI object * @details Only configures SS pin since libmaple creates and initialize the SPI object
*/ */
void spiBegin(void) { void spiBegin() {
#if !defined(SS_PIN) || SS_PIN < 0 #if !defined(SS_PIN) || SS_PIN < 0
#error SS_PIN not defined! #error SS_PIN not defined!
#endif #endif
@ -103,7 +103,7 @@ void spiInit(uint8_t spiRate) {
* *
* @details * @details
*/ */
uint8_t spiRec(void) { uint8_t spiRec() {
SPI.beginTransaction(spiConfig); SPI.beginTransaction(spiConfig);
uint8_t returnByte = SPI.transfer(0xFF); uint8_t returnByte = SPI.transfer(0xFF);
SPI.endTransaction(); SPI.endTransaction();

4
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
View file

@ -82,10 +82,10 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
} }
extern "C" void TIM5_IRQHandler() { extern "C" void TIM5_IRQHandler() {
((void(*)(void))TimerHandle[0].callback)(); ((void(*)())TimerHandle[0].callback)();
} }
extern "C" void TIM7_IRQHandler() { extern "C" void TIM7_IRQHandler() {
((void(*)(void))TimerHandle[1].callback)(); ((void(*)())TimerHandle[1].callback)();
} }
void HAL_timer_enable_interrupt(const uint8_t timer_num) { void HAL_timer_enable_interrupt(const uint8_t timer_num) {

48
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
View file

@ -226,7 +226,7 @@ void TMC26XStepper::setSpeed(uint16_t whatSpeed) {
this->next_step_time = this->last_step_time + this->step_delay; this->next_step_time = this->last_step_time + this->step_delay;
} }
uint16_t TMC26XStepper::getSpeed(void) { return this->speed; } uint16_t TMC26XStepper::getSpeed() { return this->speed; }
/** /**
* Moves the motor steps_to_move steps. * Moves the motor steps_to_move steps.
@ -246,7 +246,7 @@ char TMC26XStepper::step(int16_t steps_to_move) {
return -1; return -1;
} }
char TMC26XStepper::move(void) { char TMC26XStepper::move() {
// decrement the number of steps, moving one step each time: // decrement the number of steps, moving one step each time:
if (this->steps_left > 0) { if (this->steps_left > 0) {
uint32_t time = micros(); uint32_t time = micros();
@ -277,11 +277,11 @@ char TMC26XStepper::move(void) {
return 0; return 0;
} }
char TMC26XStepper::isMoving(void) { return this->steps_left > 0; } char TMC26XStepper::isMoving() { return this->steps_left > 0; }
uint16_t TMC26XStepper::getStepsLeft(void) { return this->steps_left; } uint16_t TMC26XStepper::getStepsLeft() { return this->steps_left; }
char TMC26XStepper::stop(void) { char TMC26XStepper::stop() {
//note to self if the motor is currently moving //note to self if the motor is currently moving
char state = isMoving(); char state = isMoving();
//stop the motor //stop the motor
@ -334,7 +334,7 @@ void TMC26XStepper::setCurrent(uint16_t current) {
} }
} }
uint16_t TMC26XStepper::getCurrent(void) { uint16_t TMC26XStepper::getCurrent() {
// Calculate the current according to the datasheet to be on the safe side. // Calculate the current according to the datasheet to be on the safe side.
// This is not the fastest but the most accurate and illustrative way. // This is not the fastest but the most accurate and illustrative way.
float result = (float)(stallguard2_current_register_value & CURRENT_SCALING_PATTERN), float result = (float)(stallguard2_current_register_value & CURRENT_SCALING_PATTERN),
@ -361,7 +361,7 @@ void TMC26XStepper::setStallGuardThreshold(char stallguard_threshold, char stall
if (started) send262(stallguard2_current_register_value); if (started) send262(stallguard2_current_register_value);
} }
char TMC26XStepper::getStallGuardThreshold(void) { char TMC26XStepper::getStallGuardThreshold() {
uint32_t stallguard_threshold = stallguard2_current_register_value & STALL_GUARD_VALUE_PATTERN; uint32_t stallguard_threshold = stallguard2_current_register_value & STALL_GUARD_VALUE_PATTERN;
//shift it down to bit 0 //shift it down to bit 0
stallguard_threshold >>= 8; stallguard_threshold >>= 8;
@ -374,7 +374,7 @@ char TMC26XStepper::getStallGuardThreshold(void) {
return result; return result;
} }
char TMC26XStepper::getStallGuardFilter(void) { char TMC26XStepper::getStallGuardFilter() {
if (stallguard2_current_register_value & STALL_GUARD_FILTER_ENABLED) if (stallguard2_current_register_value & STALL_GUARD_FILTER_ENABLED)
return -1; return -1;
return 0; return 0;
@ -421,7 +421,7 @@ void TMC26XStepper::setMicrosteps(const int16_t in_steps) {
/** /**
* returns the effective number of microsteps at the moment * returns the effective number of microsteps at the moment
*/ */
int16_t TMC26XStepper::getMicrosteps(void) { return microsteps; } int16_t TMC26XStepper::getMicrosteps() { return microsteps; }
/** /**
* constant_off_time: The off time setting controls the minimum chopper frequency. * constant_off_time: The off time setting controls the minimum chopper frequency.
@ -623,7 +623,7 @@ void TMC26XStepper::setCoolStepEnabled(boolean enabled) {
if (started) send262(cool_step_register_value); if (started) send262(cool_step_register_value);
} }
boolean TMC26XStepper::isCoolStepEnabled(void) { return this->cool_step_enabled; } boolean TMC26XStepper::isCoolStepEnabled() { return this->cool_step_enabled; }
uint16_t TMC26XStepper::getCoolStepLowerSgThreshold() { uint16_t TMC26XStepper::getCoolStepLowerSgThreshold() {
// We return our internally stored value - in order to provide the correct setting even if cool step is not enabled // We return our internally stored value - in order to provide the correct setting even if cool step is not enabled
@ -684,7 +684,7 @@ void TMC26XStepper::readStatus(char read_value) {
send262(driver_configuration_register_value); send262(driver_configuration_register_value);
} }
int16_t TMC26XStepper::getMotorPosition(void) { int16_t TMC26XStepper::getMotorPosition() {
//we read it out even if we are not started yet - perhaps it is useful information for somebody //we read it out even if we are not started yet - perhaps it is useful information for somebody
readStatus(TMC26X_READOUT_POSITION); readStatus(TMC26X_READOUT_POSITION);
return getReadoutValue(); return getReadoutValue();
@ -692,7 +692,7 @@ int16_t TMC26XStepper::getMotorPosition(void) {
//reads the StallGuard setting from last status //reads the StallGuard setting from last status
//returns -1 if StallGuard information is not present //returns -1 if StallGuard information is not present
int16_t TMC26XStepper::getCurrentStallGuardReading(void) { int16_t TMC26XStepper::getCurrentStallGuardReading() {
//if we don't yet started there cannot be a StallGuard value //if we don't yet started there cannot be a StallGuard value
if (!started) return -1; if (!started) return -1;
//not time optimal, but solution optiomal: //not time optimal, but solution optiomal:
@ -701,7 +701,7 @@ int16_t TMC26XStepper::getCurrentStallGuardReading(void) {
return getReadoutValue(); return getReadoutValue();
} }
uint8_t TMC26XStepper::getCurrentCSReading(void) { uint8_t TMC26XStepper::getCurrentCSReading() {
//if we don't yet started there cannot be a StallGuard value //if we don't yet started there cannot be a StallGuard value
if (!started) return 0; if (!started) return 0;
//not time optimal, but solution optiomal: //not time optimal, but solution optiomal:
@ -710,7 +710,7 @@ uint8_t TMC26XStepper::getCurrentCSReading(void) {
return (getReadoutValue() & 0x1F); return (getReadoutValue() & 0x1F);
} }
uint16_t TMC26XStepper::getCurrentCurrent(void) { uint16_t TMC26XStepper::getCurrentCurrent() {
float result = (float)getCurrentCSReading(), float result = (float)getCurrentCSReading(),
resistor_value = (float)this->resistor, resistor_value = (float)this->resistor,
voltage = (driver_configuration_register_value & VSENSE)? 0.165 : 0.31; voltage = (driver_configuration_register_value & VSENSE)? 0.165 : 0.31;
@ -721,7 +721,7 @@ uint16_t TMC26XStepper::getCurrentCurrent(void) {
/** /**
* Return true if the StallGuard threshold has been reached * Return true if the StallGuard threshold has been reached
*/ */
boolean TMC26XStepper::isStallGuardOverThreshold(void) { boolean TMC26XStepper::isStallGuardOverThreshold() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_STALL_GUARD_STATUS); return (driver_status_result & STATUS_STALL_GUARD_STATUS);
} }
@ -732,7 +732,7 @@ boolean TMC26XStepper::isStallGuardOverThreshold(void) {
* OVER_TEMPERATURE_SHUTDOWN if the temperature is so hot that the driver is shut down * OVER_TEMPERATURE_SHUTDOWN if the temperature is so hot that the driver is shut down
* Any of those levels are not too good. * Any of those levels are not too good.
*/ */
char TMC26XStepper::getOverTemperature(void) { char TMC26XStepper::getOverTemperature() {
if (!this->started) return 0; if (!this->started) return 0;
if (driver_status_result & STATUS_OVER_TEMPERATURE_SHUTDOWN) if (driver_status_result & STATUS_OVER_TEMPERATURE_SHUTDOWN)
@ -745,44 +745,44 @@ char TMC26XStepper::getOverTemperature(void) {
} }
// Is motor channel A shorted to ground // Is motor channel A shorted to ground
boolean TMC26XStepper::isShortToGroundA(void) { boolean TMC26XStepper::isShortToGroundA() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_SHORT_TO_GROUND_A); return (driver_status_result & STATUS_SHORT_TO_GROUND_A);
} }
// Is motor channel B shorted to ground // Is motor channel B shorted to ground
boolean TMC26XStepper::isShortToGroundB(void) { boolean TMC26XStepper::isShortToGroundB() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_SHORT_TO_GROUND_B); return (driver_status_result & STATUS_SHORT_TO_GROUND_B);
} }
// Is motor channel A connected // Is motor channel A connected
boolean TMC26XStepper::isOpenLoadA(void) { boolean TMC26XStepper::isOpenLoadA() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_OPEN_LOAD_A); return (driver_status_result & STATUS_OPEN_LOAD_A);
} }
// Is motor channel B connected // Is motor channel B connected
boolean TMC26XStepper::isOpenLoadB(void) { boolean TMC26XStepper::isOpenLoadB() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_OPEN_LOAD_B); return (driver_status_result & STATUS_OPEN_LOAD_B);
} }
// Is chopper inactive since 2^20 clock cycles - defaults to ~0,08s // Is chopper inactive since 2^20 clock cycles - defaults to ~0,08s
boolean TMC26XStepper::isStandStill(void) { boolean TMC26XStepper::isStandStill() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_STAND_STILL); return (driver_status_result & STATUS_STAND_STILL);
} }
//is chopper inactive since 2^20 clock cycles - defaults to ~0,08s //is chopper inactive since 2^20 clock cycles - defaults to ~0,08s
boolean TMC26XStepper::isStallGuardReached(void) { boolean TMC26XStepper::isStallGuardReached() {
if (!this->started) return false; if (!this->started) return false;
return (driver_status_result & STATUS_STALL_GUARD_STATUS); return (driver_status_result & STATUS_STALL_GUARD_STATUS);
} }
//reads the StallGuard setting from last status //reads the StallGuard setting from last status
//returns -1 if StallGuard information is not present //returns -1 if StallGuard information is not present
int16_t TMC26XStepper::getReadoutValue(void) { int16_t TMC26XStepper::getReadoutValue() {
return (int)(driver_status_result >> 10); return (int)(driver_status_result >> 10);
} }
@ -794,7 +794,7 @@ boolean TMC26XStepper::isCurrentScalingHalfed() {
/** /**
* version() returns the version of the library: * version() returns the version of the library:
*/ */
int16_t TMC26XStepper::version(void) { return 1; } int16_t TMC26XStepper::version() { return 1; }
void TMC26XStepper::debugLastStatus() { void TMC26XStepper::debugLastStatus() {
#ifdef TMC_DEBUG1 #ifdef TMC_DEBUG1

46
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h
View file

@ -150,7 +150,7 @@ class TMC26XStepper {
* \brief Report the currently selected speed in RPM. * \brief Report the currently selected speed in RPM.
* \sa setSpeed() * \sa setSpeed()
*/ */
uint16_t getSpeed(void); uint16_t getSpeed();
/*! /*!
* \brief Set the number of microsteps in 2^i values (rounded) up to 256 * \brief Set the number of microsteps in 2^i values (rounded) up to 256
@ -170,7 +170,7 @@ class TMC26XStepper {
* *
* \sa setMicrosteps() * \sa setMicrosteps()
*/ */
int16_t getMicrosteps(void); int16_t getMicrosteps();
/*! /*!
* \brief Initiate a movement with the given number of steps. Positive values move in one direction, negative in the other. * \brief Initiate a movement with the given number of steps. Positive values move in one direction, negative in the other.
@ -204,7 +204,7 @@ class TMC26XStepper {
* It is recommended to call this using a hardware timer to ensure regular invocation. * It is recommended to call this using a hardware timer to ensure regular invocation.
* \sa step() * \sa step()
*/ */
char move(void); char move();
/*! /*!
* \brief Check whether the last movement command is done. * \brief Check whether the last movement command is done.
@ -213,13 +213,13 @@ class TMC26XStepper {
* Used to determine if the motor is ready for new movements. * Used to determine if the motor is ready for new movements.
*\sa step(), move() *\sa step(), move()
*/ */
char isMoving(void); char isMoving();
/*! /*!
* \brief Get the number of steps left in the current movement. * \brief Get the number of steps left in the current movement.
* \return The number of steps left in the movement. Always positive. * \return The number of steps left in the movement. Always positive.
*/ */
uint16_t getStepsLeft(void); uint16_t getStepsLeft();
/*! /*!
* \brief Stop the motor immediately. * \brief Stop the motor immediately.
@ -227,7 +227,7 @@ class TMC26XStepper {
* *
* This method directly and abruptly stops the motor and may be used as an emergency stop. * This method directly and abruptly stops the motor and may be used as an emergency stop.
*/ */
char stop(void); char stop();
/*! /*!
* \brief Set and configure the classical Constant Off Timer Chopper * \brief Set and configure the classical Constant Off Timer Chopper
@ -309,7 +309,7 @@ class TMC26XStepper {
* \return the maximum motor current in milli amps * \return the maximum motor current in milli amps
* \sa getCurrentCurrent() * \sa getCurrentCurrent()
*/ */
uint16_t getCurrent(void); uint16_t getCurrent();
/*! /*!
* \brief set the StallGuard threshold in order to get sensible StallGuard readings. * \brief set the StallGuard threshold in order to get sensible StallGuard readings.
@ -332,13 +332,13 @@ class TMC26XStepper {
* \brief reads out the StallGuard threshold * \brief reads out the StallGuard threshold
* \return a number between -64 and 63. * \return a number between -64 and 63.
*/ */
char getStallGuardThreshold(void); char getStallGuardThreshold();
/*! /*!
* \brief returns the current setting of the StallGuard filter * \brief returns the current setting of the StallGuard filter
* \return 0 if not set, -1 if set * \return 0 if not set, -1 if set
*/ */
char getStallGuardFilter(void); char getStallGuardFilter();
/*! /*!
* \brief This method configures the CoolStep smart energy operation. You must have a proper StallGuard configuration for the motor situation (current, voltage, speed) in rder to use this feature. * \brief This method configures the CoolStep smart energy operation. You must have a proper StallGuard configuration for the motor situation (current, voltage, speed) in rder to use this feature.
@ -411,7 +411,7 @@ class TMC26XStepper {
* *
* Keep in mind that this routine reads and writes a value via SPI - so this may take a bit time. * Keep in mind that this routine reads and writes a value via SPI - so this may take a bit time.
*/ */
int16_t getMotorPosition(void); int16_t getMotorPosition();
/*! /*!
* \brief Reads the current StallGuard value. * \brief Reads the current StallGuard value.
@ -419,14 +419,14 @@ class TMC26XStepper {
* Keep in mind that this routine reads and writes a value via SPI - so this may take a bit time. * Keep in mind that this routine reads and writes a value via SPI - so this may take a bit time.
* \sa setStallGuardThreshold() for tuning the readout to sensible ranges. * \sa setStallGuardThreshold() for tuning the readout to sensible ranges.
*/ */
int16_t getCurrentStallGuardReading(void); int16_t getCurrentStallGuardReading();
/*! /*!
* \brief Reads the current current setting value as fraction of the maximum current * \brief Reads the current current setting value as fraction of the maximum current
* Returns values between 0 and 31, representing 1/32 to 32/32 (=1) * Returns values between 0 and 31, representing 1/32 to 32/32 (=1)
* \sa setCoolStepConfiguration() * \sa setCoolStepConfiguration()
*/ */
uint8_t getCurrentCSReading(void); uint8_t getCurrentCSReading();
/*! /*!
@ -442,7 +442,7 @@ class TMC26XStepper {
* may not be the fastest. * may not be the fastest.
* \sa getCurrentCSReading(), getResistor(), isCurrentScalingHalfed(), getCurrent() * \sa getCurrentCSReading(), getResistor(), isCurrentScalingHalfed(), getCurrent()
*/ */
uint16_t getCurrentCurrent(void); uint16_t getCurrentCurrent();
/*! /*!
* \brief checks if there is a StallGuard warning in the last status * \brief checks if there is a StallGuard warning in the last status
@ -452,7 +452,7 @@ class TMC26XStepper {
* *
* \sa setStallGuardThreshold() for tuning the readout to sensible ranges. * \sa setStallGuardThreshold() for tuning the readout to sensible ranges.
*/ */
boolean isStallGuardOverThreshold(void); boolean isStallGuardOverThreshold();
/*! /*!
* \brief Return over temperature status of the last status readout * \brief Return over temperature status of the last status readout
@ -460,7 +460,7 @@ class TMC26XStepper {
* Keep in mind that this method does not enforce a readout but uses the value of the last status readout. * Keep in mind that this method does not enforce a readout but uses the value of the last status readout.
* You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout. * You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout.
*/ */
char getOverTemperature(void); char getOverTemperature();
/*! /*!
* \brief Is motor channel A shorted to ground detected in the last status readout. * \brief Is motor channel A shorted to ground detected in the last status readout.
@ -469,7 +469,7 @@ class TMC26XStepper {
* You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout. * You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout.
*/ */
boolean isShortToGroundA(void); boolean isShortToGroundA();
/*! /*!
* \brief Is motor channel B shorted to ground detected in the last status readout. * \brief Is motor channel B shorted to ground detected in the last status readout.
@ -477,14 +477,14 @@ class TMC26XStepper {
* Keep in mind that this method does not enforce a readout but uses the value of the last status readout. * Keep in mind that this method does not enforce a readout but uses the value of the last status readout.
* You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout. * You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout.
*/ */
boolean isShortToGroundB(void); boolean isShortToGroundB();
/*! /*!
* \brief iIs motor channel A connected according to the last statu readout. * \brief iIs motor channel A connected according to the last statu readout.
* \return true is yes, false if not. * \return true is yes, false if not.
* Keep in mind that this method does not enforce a readout but uses the value of the last status readout. * Keep in mind that this method does not enforce a readout but uses the value of the last status readout.
* You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout. * You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout.
*/ */
boolean isOpenLoadA(void); boolean isOpenLoadA();
/*! /*!
* \brief iIs motor channel A connected according to the last statu readout. * \brief iIs motor channel A connected according to the last statu readout.
@ -492,7 +492,7 @@ class TMC26XStepper {
* Keep in mind that this method does not enforce a readout but uses the value of the last status readout. * Keep in mind that this method does not enforce a readout but uses the value of the last status readout.
* You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout. * You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout.
*/ */
boolean isOpenLoadB(void); boolean isOpenLoadB();
/*! /*!
* \brief Is chopper inactive since 2^20 clock cycles - defaults to ~0,08s * \brief Is chopper inactive since 2^20 clock cycles - defaults to ~0,08s
@ -500,7 +500,7 @@ class TMC26XStepper {
* Keep in mind that this method does not enforce a readout but uses the value of the last status readout. * Keep in mind that this method does not enforce a readout but uses the value of the last status readout.
* You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout. * You may want to use getMotorPosition() or getCurrentStallGuardReading() to enforce an updated status readout.
*/ */
boolean isStandStill(void); boolean isStandStill();
/*! /*!
* \brief checks if there is a StallGuard warning in the last status * \brief checks if there is a StallGuard warning in the last status
@ -513,7 +513,7 @@ class TMC26XStepper {
* *
* \sa setStallGuardThreshold() for tuning the readout to sensible ranges. * \sa setStallGuardThreshold() for tuning the readout to sensible ranges.
*/ */
boolean isStallGuardReached(void); boolean isStallGuardReached();
/*! /*!
*\brief enables or disables the motor driver bridges. If disabled the motor can run freely. If enabled not. *\brief enables or disables the motor driver bridges. If disabled the motor can run freely. If enabled not.
@ -549,13 +549,13 @@ class TMC26XStepper {
* \brief Prints out all the information that can be found in the last status read out - it does not force a status readout. * \brief Prints out all the information that can be found in the last status read out - it does not force a status readout.
* The result is printed via Serial * The result is printed via Serial
*/ */
void debugLastStatus(void); void debugLastStatus();
/*! /*!
* \brief library version * \brief library version
* \return the version number as int. * \return the version number as int.
*/ */
int16_t version(void); int16_t version();
private: private:
uint16_t steps_left; // The steps the motor has to do to complete the movement uint16_t steps_left; // The steps the motor has to do to complete the movement

4
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
View file

@ -86,10 +86,10 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
//forward the interrupt //forward the interrupt
extern "C" void TIM5_IRQHandler() { extern "C" void TIM5_IRQHandler() {
((void(*)(void))timerConfig[0].callback)(); ((void(*)())timerConfig[0].callback)();
} }
extern "C" void TIM7_IRQHandler() { extern "C" void TIM7_IRQHandler() {
((void(*)(void))timerConfig[1].callback)(); ((void(*)())timerConfig[1].callback)();
} }
void HAL_timer_set_compare(const uint8_t timer_num, const uint32_t compare) { void HAL_timer_set_compare(const uint8_t timer_num, const uint32_t compare) {

6
Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.cpp
View file

@ -62,7 +62,7 @@ uint16_t VirtAddVarTab[NB_OF_VAR];
/* Private function prototypes -----------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/
/* Private functions ---------------------------------------------------------*/ /* Private functions ---------------------------------------------------------*/
static HAL_StatusTypeDef EE_Format(void); static HAL_StatusTypeDef EE_Format();
static uint16_t EE_FindValidPage(uint8_t Operation); static uint16_t EE_FindValidPage(uint8_t Operation);
static uint16_t EE_VerifyPageFullWriteVariable(uint16_t VirtAddress, uint16_t Data); static uint16_t EE_VerifyPageFullWriteVariable(uint16_t VirtAddress, uint16_t Data);
static uint16_t EE_PageTransfer(uint16_t VirtAddress, uint16_t Data); static uint16_t EE_PageTransfer(uint16_t VirtAddress, uint16_t Data);
@ -75,7 +75,7 @@ static uint16_t EE_VerifyPageFullyErased(uint32_t Address);
* @retval - Flash error code: on write Flash error * @retval - Flash error code: on write Flash error
* - FLASH_COMPLETE: on success * - FLASH_COMPLETE: on success
*/ */
uint16_t EE_Initialize(void) { uint16_t EE_Initialize() {
/* Get Page0 and Page1 status */ /* Get Page0 and Page1 status */
uint16_t PageStatus0 = (*(__IO uint16_t*)PAGE0_BASE_ADDRESS), uint16_t PageStatus0 = (*(__IO uint16_t*)PAGE0_BASE_ADDRESS),
PageStatus1 = (*(__IO uint16_t*)PAGE1_BASE_ADDRESS); PageStatus1 = (*(__IO uint16_t*)PAGE1_BASE_ADDRESS);
@ -331,7 +331,7 @@ uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data) {
* @retval Status of the last operation (Flash write or erase) done during * @retval Status of the last operation (Flash write or erase) done during
* EEPROM formating * EEPROM formating
*/ */
static HAL_StatusTypeDef EE_Format(void) { static HAL_StatusTypeDef EE_Format() {
FLASH_EraseInitTypeDef pEraseInit; FLASH_EraseInitTypeDef pEraseInit;
pEraseInit.TypeErase = FLASH_TYPEERASE_SECTORS; pEraseInit.TypeErase = FLASH_TYPEERASE_SECTORS;
pEraseInit.Sector = PAGE0_ID; pEraseInit.Sector = PAGE0_ID;

2
Marlin/src/HAL/HAL_STM32_F4_F7/eeprom_emul.h
View file

@ -108,7 +108,7 @@
#define NB_OF_VAR uint16_t(4096) #define NB_OF_VAR uint16_t(4096)
/* Exported functions ------------------------------------------------------- */ /* Exported functions ------------------------------------------------------- */
uint16_t EE_Initialize(void); uint16_t EE_Initialize();
uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data); uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data);
uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data); uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data);

4
Marlin/src/HAL/HAL_STM32_F4_F7/endstop_interrupts.h
View file

@ -25,9 +25,9 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#if HAS_X_MAX #if HAS_X_MAX
attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE); attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE);
#endif #endif

10
Marlin/src/HAL/HAL_TEENSY31_32/HAL.cpp
View file

@ -44,10 +44,10 @@ static const uint8_t pin2sc1a[] = {
/* /*
// disable interrupts // disable interrupts
void cli(void) { noInterrupts(); } void cli() { noInterrupts(); }
// enable interrupts // enable interrupts
void sei(void) { interrupts(); } void sei() { interrupts(); }
*/ */
void HAL_adc_init() { void HAL_adc_init() {
@ -56,9 +56,9 @@ void HAL_adc_init() {
NVIC_ENABLE_IRQ(IRQ_FTM1); NVIC_ENABLE_IRQ(IRQ_FTM1);
} }
void HAL_clear_reset_source(void) { } void HAL_clear_reset_source() { }
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
switch (RCM_SRS0) { switch (RCM_SRS0) {
case 128: return RST_POWER_ON; break; case 128: return RST_POWER_ON; break;
case 64: return RST_EXTERNAL; break; case 64: return RST_EXTERNAL; break;
@ -87,6 +87,6 @@ extern "C" {
void HAL_adc_start_conversion(const uint8_t adc_pin) { ADC0_SC1A = pin2sc1a[adc_pin]; } void HAL_adc_start_conversion(const uint8_t adc_pin) { ADC0_SC1A = pin2sc1a[adc_pin]; }
uint16_t HAL_adc_get_result(void) { return ADC0_RA; } uint16_t HAL_adc_get_result() { return ADC0_RA; }
#endif // __MK20DX256__ #endif // __MK20DX256__

10
Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
View file

@ -87,20 +87,20 @@ typedef int8_t pin_t;
#undef pgm_read_word #undef pgm_read_word
#define pgm_read_word(addr) (*((uint16_t*)(addr))) #define pgm_read_word(addr) (*((uint16_t*)(addr)))
inline void HAL_init(void) { } inline void HAL_init() { }
// Clear the reset reason // Clear the reset reason
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
// Get the reason for the reset // Get the reason for the reset
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();
FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); } FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
extern "C" { extern "C" {
int freeMemory(void); int freeMemory();
} }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
@ -115,7 +115,7 @@ void HAL_adc_init();
#define HAL_ANALOG_SELECT(pin) #define HAL_ANALOG_SELECT(pin)
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
#define GET_PIN_MAP_PIN(index) index #define GET_PIN_MAP_PIN(index) index
#define GET_PIN_MAP_INDEX(pin) pin #define GET_PIN_MAP_INDEX(pin) pin

4
Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
View file

@ -34,7 +34,7 @@ static SPISettings spiConfig;
*/ */
// Initialize SPI bus // Initialize SPI bus
void spiBegin(void) { void spiBegin() {
#if !PIN_EXISTS(SS) #if !PIN_EXISTS(SS)
#error "SS_PIN not defined!" #error "SS_PIN not defined!"
#endif #endif
@ -71,7 +71,7 @@ void spiInit(uint8_t spiRate) {
} }
// SPI receive a byte // SPI receive a byte
uint8_t spiRec(void) { uint8_t spiRec() {
SPI.beginTransaction(spiConfig); SPI.beginTransaction(spiConfig);
const uint8_t returnByte = SPI.transfer(0xFF); const uint8_t returnByte = SPI.transfer(0xFF);
SPI.endTransaction(); SPI.endTransaction();

4
Marlin/src/HAL/HAL_TEENSY31_32/endstop_interrupts.h
View file

@ -38,14 +38,14 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
/** /**
* Endstop interrupts for Due based targets. * Endstop interrupts for Due based targets.
* On Due, all pins support external interrupt capability. * On Due, all pins support external interrupt capability.
*/ */
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE) #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
#if HAS_X_MAX #if HAS_X_MAX
_ATTACH(X_MAX_PIN); _ATTACH(X_MAX_PIN);

4
Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
View file

@ -34,7 +34,7 @@
so that all instructions following the ISB are fetched from cache or so that all instructions following the ISB are fetched from cache or
memory, after the instruction has been completed. memory, after the instruction has been completed.
*/ */
FORCE_INLINE static void __ISB(void) { FORCE_INLINE static void __ISB() {
__asm__ __volatile__("isb 0xF":::"memory"); __asm__ __volatile__("isb 0xF":::"memory");
} }
@ -42,7 +42,7 @@ FORCE_INLINE static void __ISB(void) {
This function acts as a special kind of Data Memory Barrier. This function acts as a special kind of Data Memory Barrier.
It completes when all explicit memory accesses before this instruction complete. It completes when all explicit memory accesses before this instruction complete.
*/ */
FORCE_INLINE static void __DSB(void) { FORCE_INLINE static void __DSB() {
__asm__ __volatile__("dsb 0xF":::"memory"); __asm__ __volatile__("dsb 0xF":::"memory");
} }

4
Marlin/src/HAL/HAL_TEENSY31_32/timers.h
View file

@ -68,8 +68,8 @@ typedef uint32_t hal_timer_t;
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM) #define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM) #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
#define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr(void) //void TC3_Handler() #define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr() //void TC3_Handler()
#define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr(void) //void TC4_Handler() #define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr() //void TC4_Handler()
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);

10
Marlin/src/HAL/HAL_TEENSY35_36/HAL.cpp
View file

@ -51,10 +51,10 @@ static const uint8_t pin2sc1a[] = {
/* /*
// disable interrupts // disable interrupts
void cli(void) { noInterrupts(); } void cli() { noInterrupts(); }
// enable interrupts // enable interrupts
void sei(void) { interrupts(); } void sei() { interrupts(); }
*/ */
void HAL_adc_init() { void HAL_adc_init() {
@ -64,9 +64,9 @@ void HAL_adc_init() {
NVIC_ENABLE_IRQ(IRQ_FTM1); NVIC_ENABLE_IRQ(IRQ_FTM1);
} }
void HAL_clear_reset_source(void) { } void HAL_clear_reset_source() { }
uint8_t HAL_get_reset_source(void) { uint8_t HAL_get_reset_source() {
switch (RCM_SRS0) { switch (RCM_SRS0) {
case 128: return RST_POWER_ON; break; case 128: return RST_POWER_ON; break;
case 64: return RST_EXTERNAL; break; case 64: return RST_EXTERNAL; break;
@ -109,7 +109,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
} }
} }
uint16_t HAL_adc_get_result(void) { uint16_t HAL_adc_get_result() {
switch (HAL_adc_select) { switch (HAL_adc_select) {
case 0: return ADC0_RA; case 0: return ADC0_RA;
case 1: return ADC1_RA; case 1: return ADC1_RA;

10
Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
View file

@ -93,20 +93,20 @@ typedef int8_t pin_t;
#undef pgm_read_word #undef pgm_read_word
#define pgm_read_word(addr) (*((uint16_t*)(addr))) #define pgm_read_word(addr) (*((uint16_t*)(addr)))
inline void HAL_init(void) { } inline void HAL_init() { }
// Clear reset reason // Clear reset reason
void HAL_clear_reset_source(void); void HAL_clear_reset_source();
// Reset reason // Reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source();
FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); } FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-function"
extern "C" { extern "C" {
int freeMemory(void); int freeMemory();
} }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
@ -121,7 +121,7 @@ void HAL_adc_init();
#define HAL_ANALOG_SELECT(pin) #define HAL_ANALOG_SELECT(pin)
void HAL_adc_start_conversion(const uint8_t adc_pin); void HAL_adc_start_conversion(const uint8_t adc_pin);
uint16_t HAL_adc_get_result(void); uint16_t HAL_adc_get_result();
#define GET_PIN_MAP_PIN(index) index #define GET_PIN_MAP_PIN(index) index
#define GET_PIN_MAP_INDEX(pin) pin #define GET_PIN_MAP_INDEX(pin) pin

4
Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
View file

@ -29,7 +29,7 @@
static SPISettings spiConfig; static SPISettings spiConfig;
void spiBegin(void) { void spiBegin() {
#if !PIN_EXISTS(SS) #if !PIN_EXISTS(SS)
#error SS_PIN not defined! #error SS_PIN not defined!
#endif #endif
@ -65,7 +65,7 @@ void spiInit(uint8_t spiRate) {
SPI.begin(); SPI.begin();
} }
uint8_t spiRec(void) { uint8_t spiRec() {
SPI.beginTransaction(spiConfig); SPI.beginTransaction(spiConfig);
uint8_t returnByte = SPI.transfer(0xFF); uint8_t returnByte = SPI.transfer(0xFF);
SPI.endTransaction(); SPI.endTransaction();

4
Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h
View file

@ -38,13 +38,13 @@
#include "../../module/endstops.h" #include "../../module/endstops.h"
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR() { endstops.update(); }
/** /**
* Endstop interrupts for Due based targets. * Endstop interrupts for Due based targets.
* On Due, all pins support external interrupt capability. * On Due, all pins support external interrupt capability.
*/ */
void setup_endstop_interrupts(void) { void setup_endstop_interrupts() {
#define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE) #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
#if HAS_X_MAX #if HAS_X_MAX
_ATTACH(X_MAX_PIN); _ATTACH(X_MAX_PIN);

4
Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
View file

@ -35,7 +35,7 @@
so that all instructions following the ISB are fetched from cache or so that all instructions following the ISB are fetched from cache or
memory, after the instruction has been completed. memory, after the instruction has been completed.
*/ */
FORCE_INLINE static void __ISB(void) { FORCE_INLINE static void __ISB() {
__asm__ __volatile__("isb 0xF":::"memory"); __asm__ __volatile__("isb 0xF":::"memory");
} }
@ -43,7 +43,7 @@ FORCE_INLINE static void __ISB(void) {
This function acts as a special kind of Data Memory Barrier. This function acts as a special kind of Data Memory Barrier.
It completes when all explicit memory accesses before this instruction complete. It completes when all explicit memory accesses before this instruction complete.
*/ */
FORCE_INLINE static void __DSB(void) { FORCE_INLINE static void __DSB() {
__asm__ __volatile__("dsb 0xF":::"memory"); __asm__ __volatile__("dsb 0xF":::"memory");
} }

4
Marlin/src/HAL/HAL_TEENSY35_36/timers.h
View file

@ -67,8 +67,8 @@ typedef uint32_t hal_timer_t;
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM) #define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM) #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
#define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr(void) //void TC3_Handler() #define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr() //void TC3_Handler()
#define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr(void) //void TC4_Handler() #define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr() //void TC4_Handler()
void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency); void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);

4
Marlin/src/HAL/shared/HAL_SPI.h
View file

@ -59,7 +59,7 @@
// //
// Initialize SPI bus // Initialize SPI bus
void spiBegin(void); void spiBegin();
// Configure SPI for specified SPI speed // Configure SPI for specified SPI speed
void spiInit(uint8_t spiRate); void spiInit(uint8_t spiRate);
@ -68,7 +68,7 @@ void spiInit(uint8_t spiRate);
void spiSend(uint8_t b); void spiSend(uint8_t b);
// Read single byte from SPI // Read single byte from SPI
uint8_t spiRec(void); uint8_t spiRec();
// Read from SPI into buffer // Read from SPI into buffer
void spiRead(uint8_t* buf, uint16_t nbyte); void spiRead(uint8_t* buf, uint16_t nbyte);

4
Marlin/src/HAL/shared/backtrace/backtrace.cpp
View file

@ -65,7 +65,7 @@ static const UnwindCallbacks UnwCallbacks = {
#endif #endif
}; };
void backtrace(void) { void backtrace() {
UnwindFrame btf; UnwindFrame btf;
uint32_t sp = 0, lr = 0, pc = 0; uint32_t sp = 0, lr = 0, pc = 0;
@ -95,6 +95,6 @@ void backtrace(void) {
#else // !__arm__ && !__thumb__ #else // !__arm__ && !__thumb__
void backtrace(void) {} void backtrace() {}
#endif #endif

2
Marlin/src/HAL/shared/backtrace/backtrace.h
View file

@ -22,4 +22,4 @@
#pragma once #pragma once
// Perform a backtrace to the serial port // Perform a backtrace to the serial port
void backtrace(void); void backtrace();

2
Marlin/src/HAL/shared/backtrace/unwarm.cpp
View file

@ -78,7 +78,7 @@ void UnwInitState(UnwState * const state, /**< Pointer to structure to fill.
} }
// Detect if function names are available // Detect if function names are available
static int __attribute__ ((noinline)) has_function_names(void) { static int __attribute__ ((noinline)) has_function_names() {
uint32_t flag_word = ((uint32_t*)(((uint32_t)(&has_function_names)) & (-4))) [-1]; uint32_t flag_word = ((uint32_t*)(((uint32_t)(&has_function_names)) & (-4))) [-1];
return ((flag_word & 0xFF000000) == 0xFF000000) ? 1 : 0; return ((flag_word & 0xFF000000) == 0xFF000000) ? 1 : 0;
} }

8
Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
View file

@ -23,9 +23,9 @@ extern "C" const UnwTabEntry __exidx_start[];
extern "C" const UnwTabEntry __exidx_end[]; extern "C" const UnwTabEntry __exidx_end[];
/* This prevents the linking of libgcc unwinder code */ /* This prevents the linking of libgcc unwinder code */
void __aeabi_unwind_cpp_pr0(void) {}; void __aeabi_unwind_cpp_pr0() {};
void __aeabi_unwind_cpp_pr1(void) {}; void __aeabi_unwind_cpp_pr1() {};
void __aeabi_unwind_cpp_pr2(void) {}; void __aeabi_unwind_cpp_pr2() {};
static inline __attribute__((always_inline)) uint32_t prel31_to_addr(const uint32_t *prel31) { static inline __attribute__((always_inline)) uint32_t prel31_to_addr(const uint32_t *prel31) {
uint32_t offset = (((uint32_t)(*prel31)) << 1) >> 1; uint32_t offset = (((uint32_t)(*prel31)) << 1) >> 1;
@ -285,7 +285,7 @@ static UnwResult UnwTabExecuteInstructions(const UnwindCallbacks *cb, UnwTabStat
return UNWIND_SUCCESS; return UNWIND_SUCCESS;
} }
static inline __attribute__((always_inline)) uint32_t read_psp(void) { static inline __attribute__((always_inline)) uint32_t read_psp() {
/* Read the current PSP and return its value as a pointer */ /* Read the current PSP and return its value as a pointer */
uint32_t psp; uint32_t psp;

2
Marlin/src/HAL/shared/backtrace/unwinder.cpp
View file

@ -27,7 +27,7 @@ extern "C" const UnwTabEntry __exidx_start[];
extern "C" const UnwTabEntry __exidx_end[]; extern "C" const UnwTabEntry __exidx_end[];
// Detect if unwind information is present or not // Detect if unwind information is present or not
static int HasUnwindTableInfo(void) { static int HasUnwindTableInfo() {
// > 16 because there are default entries we can't supress // > 16 because there are default entries we can't supress
return ((char*)(&__exidx_end) - (char*)(&__exidx_start)) > 16 ? 1 : 0; return ((char*)(&__exidx_end) - (char*)(&__exidx_start)) > 16 ? 1 : 0;
} }

2
Marlin/src/HAL/shared/eeprom_i2c.cpp
View file

@ -42,7 +42,7 @@ static uint8_t eeprom_device_address = 0x50;
// Public functions // Public functions
// ------------------------ // ------------------------
static void eeprom_init(void) { static void eeprom_init() {
static bool eeprom_initialized = false; static bool eeprom_initialized = false;
if (!eeprom_initialized) { if (!eeprom_initialized) {
Wire.begin(); Wire.begin();

2
Marlin/src/Marlin.cpp
View file

@ -814,7 +814,7 @@ void minkill(const bool steppers_off/*=false*/) {
#endif #endif
} }
void (*resetFunc)(void) = 0; // Declare resetFunc() at address 0 void (*resetFunc)() = 0; // Declare resetFunc() at address 0
resetFunc(); // Jump to address 0 resetFunc(); // Jump to address 0
#else // !HAS_KILL #else // !HAS_KILL

10
Marlin/src/feature/I2CPositionEncoder.h
View file

@ -168,15 +168,15 @@ class I2CPositionEncoder {
bool passes_test(const bool report); bool passes_test(const bool report);
bool test_axis(void); bool test_axis();
FORCE_INLINE int get_error_count(void) { return errorCount; } FORCE_INLINE int get_error_count() { return errorCount; }
FORCE_INLINE void set_error_count(const int newCount) { errorCount = newCount; } FORCE_INLINE void set_error_count(const int newCount) { errorCount = newCount; }
FORCE_INLINE uint8_t get_address() { return i2cAddress; } FORCE_INLINE uint8_t get_address() { return i2cAddress; }
FORCE_INLINE void set_address(const uint8_t addr) { i2cAddress = addr; } FORCE_INLINE void set_address(const uint8_t addr) { i2cAddress = addr; }
FORCE_INLINE bool get_active(void) { return active; } FORCE_INLINE bool get_active() { return active; }
FORCE_INLINE void set_active(const bool a) { active = a; } FORCE_INLINE void set_active(const bool a) { active = a; }
FORCE_INLINE void set_inverted(const bool i) { invert = i; } FORCE_INLINE void set_inverted(const bool i) { invert = i; }
@ -219,10 +219,10 @@ class I2CPositionEncodersMgr {
public: public:
static void init(void); static void init();
// consider only updating one endoder per call / tick if encoders become too time intensive // consider only updating one endoder per call / tick if encoders become too time intensive
static void update(void) { LOOP_PE(i) encoders[i].update(); } static void update() { LOOP_PE(i) encoders[i].update(); }
static void homed(const AxisEnum axis) { static void homed(const AxisEnum axis) {
LOOP_PE(i) LOOP_PE(i)

2
Marlin/src/feature/dac/dac_dac084s085.h
View file

@ -24,7 +24,7 @@
class dac084s085 { class dac084s085 {
public: public:
dac084s085(); dac084s085();
static void begin(void); static void begin();
static void setValue(const uint8_t channel, const uint8_t value); static void setValue(const uint8_t channel, const uint8_t value);
private: private:
static void cshigh(); static void cshigh();

2
Marlin/src/feature/fanmux.cpp
View file

@ -41,7 +41,7 @@ void fanmux_switch(const uint8_t e) {
#endif #endif
} }
void fanmux_init(void) { void fanmux_init() {
SET_OUTPUT(FANMUX0_PIN); SET_OUTPUT(FANMUX0_PIN);
#if PIN_EXISTS(FANMUX1) #if PIN_EXISTS(FANMUX1)
SET_OUTPUT(FANMUX1_PIN); SET_OUTPUT(FANMUX1_PIN);

2
Marlin/src/feature/fanmux.h
View file

@ -26,4 +26,4 @@
*/ */
extern void fanmux_switch(const uint8_t e); extern void fanmux_switch(const uint8_t e);
extern void fanmux_init(void); extern void fanmux_init();

2
Marlin/src/feature/leds/tempstat.cpp
View file

@ -31,7 +31,7 @@
#include "tempstat.h" #include "tempstat.h"
#include "../../module/temperature.h" #include "../../module/temperature.h"
void handle_status_leds(void) { void handle_status_leds() {
static int8_t old_red = -1; // Invalid value to force LED initialization static int8_t old_red = -1; // Invalid value to force LED initialization
static millis_t next_status_led_update_ms = 0; static millis_t next_status_led_update_ms = 0;
if (ELAPSED(millis(), next_status_led_update_ms)) { if (ELAPSED(millis(), next_status_led_update_ms)) {

2
Marlin/src/feature/leds/tempstat.h
View file

@ -25,4 +25,4 @@
* Marlin general RGB LED support * Marlin general RGB LED support
*/ */
void handle_status_leds(void); void handle_status_leds();

2
Marlin/src/feature/prusa_MMU2/mmu2.cpp
View file

@ -533,7 +533,7 @@ void MMU2::command(const uint8_t mmu_cmd) {
/** /**
* Wait for response from MMU * Wait for response from MMU
*/ */
bool MMU2::get_response(void) { bool MMU2::get_response() {
while (cmd != MMU_CMD_NONE) idle(); while (cmd != MMU_CMD_NONE) idle();
while (!ready) { while (!ready) {

2
Marlin/src/feature/prusa_MMU2/mmu2.h
View file

@ -61,7 +61,7 @@ private:
static void check_version(); static void check_version();
static void command(const uint8_t cmd); static void command(const uint8_t cmd);
static bool get_response(void); static bool get_response();
static void manage_response(const bool move_axes, const bool turn_off_nozzle); static void manage_response(const bool move_axes, const bool turn_off_nozzle);
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS) #if HAS_LCD_MENU && ENABLED(MMU2_MENUS)

2
Marlin/src/feature/touch/xpt2046.cpp
View file

@ -43,7 +43,7 @@
XPT2046 touch; XPT2046 touch;
extern int8_t encoderDiff; extern int8_t encoderDiff;
void XPT2046::init(void) { void XPT2046::init() {
SET_INPUT(TOUCH_MISO_PIN); SET_INPUT(TOUCH_MISO_PIN);
SET_OUTPUT(TOUCH_MOSI_PIN); SET_OUTPUT(TOUCH_MOSI_PIN);
SET_OUTPUT(TOUCH_SCK_PIN); SET_OUTPUT(TOUCH_SCK_PIN);

4
Marlin/src/feature/touch/xpt2046.h
View file

@ -40,11 +40,11 @@ enum XPTCoordinate : uint8_t {
class XPT2046 { class XPT2046 {
public: public:
static void init(void); static void init();
static uint8_t read_buttons(); static uint8_t read_buttons();
bool getTouchPoint(uint16_t &x, uint16_t &y); bool getTouchPoint(uint16_t &x, uint16_t &y);
static bool isTouched(); static bool isTouched();
inline void waitForRelease(void) { while (isTouched()) { /* nada */ } } inline void waitForRelease() { while (isTouched()) { /* nada */ } }
inline void waitForTouch(uint16_t &x, uint16_t &y) { while (!getTouchPoint(x, y)) { /* nada */ } } inline void waitForTouch(uint16_t &x, uint16_t &y) { while (!getTouchPoint(x, y)) { /* nada */ } }
private: private:
static uint16_t getInTouch(const XPTCoordinate coordinate); static uint16_t getInTouch(const XPTCoordinate coordinate);

4
Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
View file

@ -29,7 +29,7 @@
#endif #endif
extern LCD_CLASS lcd; extern LCD_CLASS lcd;
int lcd_glyph_height(void) { return 1; } int lcd_glyph_height() { return 1; }
typedef struct _hd44780_charmap_t { typedef struct _hd44780_charmap_t {
wchar_t uchar; // the unicode char wchar_t uchar; // the unicode char
@ -1012,7 +1012,7 @@ int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
return 0; return 0;
} }
int test_hd44780_charmap_all(void) { int test_hd44780_charmap_all() {
int flg_error = 0; int flg_error = 0;
if (test_hd44780_charmap(g_hd44780_charmap_device, COUNT(g_hd44780_charmap_device), "g_hd44780_charmap_device", 0) < 0) { if (test_hd44780_charmap(g_hd44780_charmap_device, COUNT(g_hd44780_charmap_device), "g_hd44780_charmap_device", 0) < 0) {
flg_error = 1; flg_error = 1;

2
Marlin/src/lcd/dogm/lcdprint_u8g.cpp
View file

@ -20,7 +20,7 @@
#include "u8g_fontutf8.h" #include "u8g_fontutf8.h"
#include "../lcdprint.h" #include "../lcdprint.h"
int lcd_glyph_height(void) { return u8g_GetFontBBXHeight(u8g.getU8g()); } int lcd_glyph_height() { return u8g_GetFontBBXHeight(u8g.getU8g()); }
void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) { u8g.setPrintPos(col, row); } void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) { u8g.setPrintPos(col, row); }

2
Marlin/src/lcd/dogm/u8g_fontutf8.cpp
View file

@ -119,7 +119,7 @@ static font_group_t g_fontgroup_root = { nullptr, 0 };
/** /**
* @brief check if font is loaded * @brief check if font is loaded
*/ */
static inline bool uxg_Utf8FontIsInited(void) { return flag_fontgroup_was_inited; } static inline bool uxg_Utf8FontIsInited() { return flag_fontgroup_was_inited; }
int uxg_SetUtf8Fonts (const uxg_fontinfo_t * fntinfo, int number) { int uxg_SetUtf8Fonts (const uxg_fontinfo_t * fntinfo, int number) {
flag_fontgroup_was_inited = 1; flag_fontgroup_was_inited = 1;

6
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
View file

@ -103,7 +103,7 @@ public:
// ISR for Rx // ISR for Rx
void store_rxd_char(); void store_rxd_char();
// ISR for Tx (UDRE vector) // ISR for Tx (UDRE vector)
void tx_udr_empty_irq(void); void tx_udr_empty_irq();
inline volatile bool is_rx_overrun() { inline volatile bool is_rx_overrun() {
return dgus_rx_overrun; return dgus_rx_overrun;
@ -1013,7 +1013,7 @@ FORCE_INLINE void DGUSSerial::store_rxd_char() {
} }
// (called with TX irqs disabled) // (called with TX irqs disabled)
FORCE_INLINE void DGUSSerial::tx_udr_empty_irq(void) { FORCE_INLINE void DGUSSerial::tx_udr_empty_irq() {
// Read positions // Read positions
uint8_t t = tx_buffer.tail; uint8_t t = tx_buffer.tail;
const uint8_t h = tx_buffer.head; const uint8_t h = tx_buffer.head;
@ -1039,7 +1039,7 @@ FORCE_INLINE void DGUSSerial::tx_udr_empty_irq(void) {
if (h == t) CBI(DGUS_UCSRxB, UDRIEx); if (h == t) CBI(DGUS_UCSRxB, UDRIEx);
} }
r_ring_buffer_pos_t DGUSSerial::available(void) { r_ring_buffer_pos_t DGUSSerial::available() {
const r_ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail; const r_ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail;
return (r_ring_buffer_pos_t) (DGUS_RX_BUFFER_SIZE + h - t) & (DGUS_RX_BUFFER_SIZE - 1); return (r_ring_buffer_pos_t) (DGUS_RX_BUFFER_SIZE + h - t) & (DGUS_RX_BUFFER_SIZE - 1);
} }

8
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.cpp
View file

@ -29,11 +29,11 @@
using namespace FTDI; using namespace FTDI;
using namespace FTDI::SPI; using namespace FTDI::SPI;
void CLCD::enable(void) { void CLCD::enable() {
mem_write_8(REG::PCLK, Pclk); mem_write_8(REG::PCLK, Pclk);
} }
void CLCD::disable(void) { void CLCD::disable() {
mem_write_8(REG::PCLK, 0x00); mem_write_8(REG::PCLK, 0x00);
} }
@ -45,7 +45,7 @@ uint8_t CLCD::get_brightness() {
return mem_read_8(REG::PWM_DUTY); return mem_read_8(REG::PWM_DUTY);
} }
void CLCD::turn_on_backlight(void) { void CLCD::turn_on_backlight() {
mem_write_8(REG::PWM_DUTY, 128); mem_write_8(REG::PWM_DUTY, 128);
} }
@ -1052,7 +1052,7 @@ void CLCD::CommandFifo::str(progmem_str data) {
/******************* LCD INITIALIZATION ************************/ /******************* LCD INITIALIZATION ************************/
void CLCD::init(void) { void CLCD::init() {
spi_init(); // Set Up I/O Lines for SPI and FT800/810 Control spi_init(); // Set Up I/O Lines for SPI and FT800/810 Control
ftdi_reset(); // Power down/up the FT8xx with the apropriate delays ftdi_reset(); // Power down/up the FT8xx with the apropriate delays

18
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.h
View file

@ -124,12 +124,12 @@ class CLCD {
class CommandFifo; class CommandFifo;
class FontMetrics; class FontMetrics;
static void init(void); static void init();
static void default_touch_transform(void); static void default_touch_transform();
static void default_display_orientation(void); static void default_display_orientation();
static void turn_on_backlight(void); static void turn_on_backlight();
static void enable(void); static void enable();
static void disable(void); static void disable();
static void set_brightness (uint8_t brightness); static void set_brightness (uint8_t brightness);
static uint8_t get_brightness(); static uint8_t get_brightness();
static void host_cmd (unsigned char host_command, unsigned char byte2); static void host_cmd (unsigned char host_command, unsigned char byte2);
@ -179,7 +179,7 @@ class CLCD::CommandFifo {
static uint32_t command_write_ptr; static uint32_t command_write_ptr;
template <class T> bool _write_unaligned(T data, uint16_t len); template <class T> bool _write_unaligned(T data, uint16_t len);
#endif #endif
void start(void); void start();
public: public:
template <class T> bool write(T data, uint16_t len); template <class T> bool write(T data, uint16_t len);
@ -187,11 +187,11 @@ class CLCD::CommandFifo {
public: public:
CommandFifo() {start();} CommandFifo() {start();}
static void reset(void); static void reset();
static bool is_processing(); static bool is_processing();
static bool has_fault(); static bool has_fault();
void execute(void); void execute();
void cmd(uint32_t cmd32); void cmd(uint32_t cmd32);
void cmd(void* data, uint16_t len); void cmd(void* data, uint16_t len);

10
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.cpp
View file

@ -31,7 +31,7 @@ namespace FTDI {
SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0); SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
#endif #endif
void SPI::spi_init(void) { void SPI::spi_init() {
SET_OUTPUT(CLCD_MOD_RESET); // Module Reset (a.k.a. PD, not SPI) SET_OUTPUT(CLCD_MOD_RESET); // Module Reset (a.k.a. PD, not SPI)
WRITE(CLCD_MOD_RESET, 0); // start with module in power-down WRITE(CLCD_MOD_RESET, 0); // start with module in power-down
@ -106,7 +106,7 @@ namespace FTDI {
} }
// CLCD SPI - Chip Select // CLCD SPI - Chip Select
void SPI::spi_ftdi_select(void) { void SPI::spi_ftdi_select() {
#ifndef CLCD_USE_SOFT_SPI #ifndef CLCD_USE_SOFT_SPI
::SPI.beginTransaction(spi_settings); ::SPI.beginTransaction(spi_settings);
#endif #endif
@ -115,7 +115,7 @@ namespace FTDI {
} }
// CLCD SPI - Chip Deselect // CLCD SPI - Chip Deselect
void SPI::spi_ftdi_deselect(void) { void SPI::spi_ftdi_deselect() {
WRITE(CLCD_SPI_CS, 1); WRITE(CLCD_SPI_CS, 1);
#ifndef CLCD_USE_SOFT_SPI #ifndef CLCD_USE_SOFT_SPI
::SPI.endTransaction(); ::SPI.endTransaction();
@ -142,7 +142,7 @@ namespace FTDI {
#endif #endif
// Not really a SPI signal... // Not really a SPI signal...
void SPI::ftdi_reset(void) { void SPI::ftdi_reset() {
WRITE(CLCD_MOD_RESET, 0); WRITE(CLCD_MOD_RESET, 0);
delay(6); /* minimum time for power-down is 5ms */ delay(6); /* minimum time for power-down is 5ms */
WRITE(CLCD_MOD_RESET, 1); WRITE(CLCD_MOD_RESET, 1);
@ -150,7 +150,7 @@ namespace FTDI {
} }
// Not really a SPI signal... // Not really a SPI signal...
void SPI::test_pulse(void) { void SPI::test_pulse() {
#ifdef CLCD_AUX_0 #ifdef CLCD_AUX_0
WRITE(CLCD_AUX_0, 1); WRITE(CLCD_AUX_0, 1);
delayMicroseconds(10); delayMicroseconds(10);

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.h
View file

@ -122,7 +122,7 @@ namespace FTDI {
void spi_read_bulk( void *data, uint16_t len); void spi_read_bulk( void *data, uint16_t len);
bool spi_verify_bulk(const void *data, uint16_t len); bool spi_verify_bulk(const void *data, uint16_t len);
void ftdi_reset(void); void ftdi_reset();
void test_pulse(void); void test_pulse();
} }
} }

10
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/screen_types.h
View file

@ -54,11 +54,11 @@ typedef enum {
class ScreenRef { class ScreenRef {
protected: protected:
typedef void onStartup_func_t(void); typedef void onStartup_func_t();
typedef void onEntry_func_t(void); typedef void onEntry_func_t();
typedef void onExit_func_t(void); typedef void onExit_func_t();
typedef void onIdle_func_t(void); typedef void onIdle_func_t();
typedef void onRefresh_func_t(void); typedef void onRefresh_func_t();
typedef void onRedraw_func_t(draw_mode_t); typedef void onRedraw_func_t(draw_mode_t);
typedef bool onTouchStart_func_t(uint8_t); typedef bool onTouchStart_func_t(uint8_t);
typedef bool onTouchHeld_func_t(uint8_t); typedef bool onTouchHeld_func_t(uint8_t);

2
Marlin/src/lcd/extensible_ui/ui_api.cpp
View file

@ -901,7 +901,7 @@ namespace ExtUI {
feedrate_percentage = clamp(value, 10, 500); feedrate_percentage = clamp(value, 10, 500);
} }
void setUserConfirmed(void) { void setUserConfirmed() {
#if HAS_RESUME_CONTINUE #if HAS_RESUME_CONTINUE
wait_for_user = false; wait_for_user = false;
#endif #endif

2
Marlin/src/lcd/extensible_ui/ui_api.h
View file

@ -165,7 +165,7 @@ namespace ExtUI {
void setRetractAcceleration_mm_s2(const float); void setRetractAcceleration_mm_s2(const float);
void setTravelAcceleration_mm_s2(const float); void setTravelAcceleration_mm_s2(const float);
void setFeedrate_percent(const float); void setFeedrate_percent(const float);
void setUserConfirmed(void); void setUserConfirmed();
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
float getLinearAdvance_mm_mm_s(const extruder_t); float getLinearAdvance_mm_mm_s(const extruder_t);

2
Marlin/src/lcd/lcdprint.h
View file

@ -22,7 +22,7 @@
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u) #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
int lcd_glyph_height(void); int lcd_glyph_height();
int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length); int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length);

2
Marlin/src/lcd/ultralcd.cpp
View file

@ -1123,7 +1123,7 @@ void MarlinUI::update() {
ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) + 100, 1 + BLEN_KEYPAD_MIDDLE }, // ENTER (1205 ... 1405) ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) + 100, 1 + BLEN_KEYPAD_MIDDLE }, // ENTER (1205 ... 1405)
}; };
uint8_t get_ADC_keyValue(void) { uint8_t get_ADC_keyValue() {
if (thermalManager.ADCKey_count >= 16) { if (thermalManager.ADCKey_count >= 16) {
const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw << 2; const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw << 2;
thermalManager.current_ADCKey_raw = 1024; thermalManager.current_ADCKey_raw = 1024;

2
Marlin/src/libs/softspi.h
View file

@ -475,7 +475,7 @@
static constexpr uint8_t digitalPinCount = sizeof(pinMap) / sizeof(pin_map_t); static constexpr uint8_t digitalPinCount = sizeof(pinMap) / sizeof(pin_map_t);
/** generate bad pin number error */ /** generate bad pin number error */
void badPinNumber(void) void badPinNumber()
__attribute__((error("Pin number is too large or not a constant"))); __attribute__((error("Pin number is too large or not a constant")));
/** /**

2
Marlin/src/module/temperature.h
View file

@ -789,7 +789,7 @@ class Temperature {
#if ENABLED(AUTO_REPORT_TEMPERATURES) #if ENABLED(AUTO_REPORT_TEMPERATURES)
static uint8_t auto_report_temp_interval; static uint8_t auto_report_temp_interval;
static millis_t next_temp_report_ms; static millis_t next_temp_report_ms;
static void auto_report_temperatures(void); static void auto_report_temperatures();
static inline void set_auto_report_interval(uint8_t v) { static inline void set_auto_report_interval(uint8_t v) {
NOMORE(v, 60); NOMORE(v, 60);
auto_report_temp_interval = v; auto_report_temp_interval = v;

2
Marlin/src/sd/Sd2Card_sdio.h
View file

@ -25,7 +25,7 @@
#if ENABLED(SDIO_SUPPORT) #if ENABLED(SDIO_SUPPORT)
bool SDIO_Init(void); bool SDIO_Init();
bool SDIO_ReadBlock(uint32_t block, uint8_t *dst); bool SDIO_ReadBlock(uint32_t block, uint8_t *dst);
bool SDIO_WriteBlock(uint32_t block, const uint8_t *src); bool SDIO_WriteBlock(uint32_t block, const uint8_t *src);

2
Marlin/src/sd/cardreader.h
View file

@ -128,7 +128,7 @@ public:
static Sd2Card& getSd2Card() { return sd2card; } static Sd2Card& getSd2Card() { return sd2card; }
#if ENABLED(AUTO_REPORT_SD_STATUS) #if ENABLED(AUTO_REPORT_SD_STATUS)
static void auto_report_sd_status(void); static void auto_report_sd_status();
static inline void set_auto_report_interval(uint8_t v) { static inline void set_auto_report_interval(uint8_t v) {
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
auto_report_port = serial_port_index; auto_report_port = serial_port_index;

4
Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp
View file

@ -45,7 +45,7 @@ void USB::init() {
bmHubPre = 0; bmHubPre = 0;
} }
uint8_t USB::getUsbTaskState(void) { uint8_t USB::getUsbTaskState() {
return usb_task_state; return usb_task_state;
} }
@ -424,7 +424,7 @@ uint8_t USB::dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit) {
} }
/* USB main task. Performs enumeration/cleanup */ /* USB main task. Performs enumeration/cleanup */
void USB::Task(void) { //USB state machine void USB::Task() { //USB state machine
uint8_t rcode; uint8_t rcode;
uint8_t tmpdata; uint8_t tmpdata;
static uint32_t delay = 0; static uint32_t delay = 0;

6
Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h
View file

@ -216,7 +216,7 @@ class USB : public MAX3421E {
uint8_t bmHubPre; uint8_t bmHubPre;
public: public:
USB(void); USB();
void SetHubPreMask() { void SetHubPreMask() {
bmHubPre |= bmHUBPRE; bmHubPre |= bmHUBPRE;
@ -243,7 +243,7 @@ public:
void ForEachUsbDevice(UsbDeviceHandleFunc pfunc) { void ForEachUsbDevice(UsbDeviceHandleFunc pfunc) {
addrPool.ForEachUsbDevice(pfunc); addrPool.ForEachUsbDevice(pfunc);
}; };
uint8_t getUsbTaskState(void); uint8_t getUsbTaskState();
void setUsbTaskState(uint8_t state); void setUsbTaskState(uint8_t state);
EpInfo* getEpInfoEntry(uint8_t addr, uint8_t ep); EpInfo* getEpInfoEntry(uint8_t addr, uint8_t ep);
@ -265,7 +265,7 @@ public:
uint8_t outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data); uint8_t outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data);
uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit); uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit);
void Task(void); void Task();
uint8_t DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed); uint8_t DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed);
uint8_t Configuring(uint8_t parent, uint8_t port, bool lowspeed); uint8_t Configuring(uint8_t parent, uint8_t port, bool lowspeed);

2
Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h
View file

@ -69,7 +69,7 @@ class ConfigDescParser : public USBReadParser {
public: public:
void SetOR(void) { UseOr = true; } void SetOR() { UseOr = true; }
ConfigDescParser(UsbConfigXtracter *xtractor); ConfigDescParser(UsbConfigXtracter *xtractor);
void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset); void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset);
}; };

8
Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp
View file

@ -74,19 +74,19 @@ void E_Notify(double d, int lvl) {
#ifdef DEBUG_USB_HOST #ifdef DEBUG_USB_HOST
void NotifyFailGetDevDescr(void) { void NotifyFailGetDevDescr() {
Notify(PSTR("\r\ngetDevDescr "), 0x80); Notify(PSTR("\r\ngetDevDescr "), 0x80);
} }
void NotifyFailSetDevTblEntry(void) { void NotifyFailSetDevTblEntry() {
Notify(PSTR("\r\nsetDevTblEn "), 0x80); Notify(PSTR("\r\nsetDevTblEn "), 0x80);
} }
void NotifyFailGetConfDescr(void) { void NotifyFailGetConfDescr() {
Notify(PSTR("\r\ngetConf "), 0x80); Notify(PSTR("\r\ngetConf "), 0x80);
} }
void NotifyFailSetConfDescr(void) { void NotifyFailSetConfDescr() {
Notify(PSTR("\r\nsetConf "), 0x80); Notify(PSTR("\r\nsetConf "), 0x80);
} }

8
Marlin/src/sd/usb_flashdrive/lib-uhs2/message.h
View file

@ -43,10 +43,10 @@ void E_Notifyc(char c, int lvl);
void NotifyFailSetDevTblEntry(uint8_t reason); void NotifyFailSetDevTblEntry(uint8_t reason);
void NotifyFailGetConfDescr(uint8_t reason); void NotifyFailGetConfDescr(uint8_t reason);
void NotifyFailSetConfDescr(uint8_t reason); void NotifyFailSetConfDescr(uint8_t reason);
void NotifyFailGetDevDescr(void); void NotifyFailGetDevDescr();
void NotifyFailSetDevTblEntry(void); void NotifyFailSetDevTblEntry();
void NotifyFailGetConfDescr(void); void NotifyFailGetConfDescr();
void NotifyFailSetConfDescr(void); void NotifyFailSetConfDescr();
void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID); void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID);
void NotifyFail(uint8_t rcode); void NotifyFail(uint8_t rcode);
#else #else

2
Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
View file

@ -194,7 +194,7 @@ void MAX3421e::busprobe() {
} }
// MAX3421 state change task and interrupt handler // MAX3421 state change task and interrupt handler
uint8_t MAX3421e::Task(void) { uint8_t MAX3421e::Task() {
return READ(USB_INTR_PIN) ? 0 : IntHandler(); return READ(USB_INTR_PIN) ? 0 : IntHandler();
} }

2
Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.h
View file

@ -44,7 +44,7 @@ class MAX3421e {
uint8_t gpioRd(); uint8_t gpioRd();
bool reset(); bool reset();
uint8_t getVbusState(void) {return vbusState;}; uint8_t getVbusState() {return vbusState;};
void busprobe(); void busprobe();

18
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE.h
View file

@ -98,7 +98,7 @@ struct UHS_BULK_CommandBlockWrapperBase {
volatile uint8_t bmCBWFlags; volatile uint8_t bmCBWFlags;
public: public:
UHS_BULK_CommandBlockWrapperBase(void) { UHS_BULK_CommandBlockWrapperBase() {
} }
UHS_BULK_CommandBlockWrapperBase(uint32_t tag, uint32_t xflen, uint8_t flgs) : UHS_BULK_CommandBlockWrapperBase(uint32_t tag, uint32_t xflen, uint8_t flgs) :
@ -181,11 +181,11 @@ public:
volatile UHS_EpInfo epInfo[MASS_MAX_ENDPOINTS]; volatile UHS_EpInfo epInfo[MASS_MAX_ENDPOINTS];
uint8_t GetbMaxLUN(void) { uint8_t GetbMaxLUN() {
return bMaxLUN; // Max LUN return bMaxLUN; // Max LUN
} }
uint8_t GetbTheLUN(void) { uint8_t GetbTheLUN() {
return bTheLUN; // Active LUN return bTheLUN; // Active LUN
} }
@ -203,23 +203,23 @@ public:
// Configure and internal methods, these should never be called by a user's sketch. // Configure and internal methods, these should never be called by a user's sketch.
uint8_t Start(void); uint8_t Start();
bool OKtoEnumerate(ENUMERATION_INFO *ei); bool OKtoEnumerate(ENUMERATION_INFO *ei);
uint8_t SetInterface(ENUMERATION_INFO *ei); uint8_t SetInterface(ENUMERATION_INFO *ei);
uint8_t GetAddress(void) { uint8_t GetAddress() {
return bAddress; return bAddress;
}; };
void Poll(void); void Poll();
void DriverDefaults(void); void DriverDefaults();
private: private:
void Reset(void); void Reset();
void CheckMedia(void); void CheckMedia();
bool IsValidCBW(uint8_t size, uint8_t *pcbw); bool IsValidCBW(uint8_t size, uint8_t *pcbw);
bool IsMeaningfulCBW(uint8_t size, uint8_t *pcbw); bool IsMeaningfulCBW(uint8_t size, uint8_t *pcbw);

14
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE_INLINE.h
View file

@ -378,7 +378,7 @@ uint8_t UHS_NI UHS_Bulk_Storage::SetInterface(ENUMERATION_INFO *ei) {
* *
* @return 0 for success * @return 0 for success
*/ */
uint8_t UHS_NI UHS_Bulk_Storage::Start(void) { uint8_t UHS_NI UHS_Bulk_Storage::Start() {
uint8_t rcode; uint8_t rcode;
// Serial.print("Bulk Start from USB Host @ 0x"); // Serial.print("Bulk Start from USB Host @ 0x");
// Serial.println((uint32_t)pUsb, HEX); // Serial.println((uint32_t)pUsb, HEX);
@ -541,7 +541,7 @@ Fail:
* *
* @return * @return
*/ */
//void UHS_NI UHS_Bulk_Storage::Release(void) { //void UHS_NI UHS_Bulk_Storage::Release() {
// pUsb->DisablePoll(); // pUsb->DisablePoll();
// OnRelease(); // OnRelease();
// DriverDefaults(); // DriverDefaults();
@ -602,7 +602,7 @@ bool UHS_NI UHS_Bulk_Storage::CheckLUN(uint8_t lun) {
* *
* Scan for media change on all LUNs * Scan for media change on all LUNs
*/ */
void UHS_NI UHS_Bulk_Storage::CheckMedia(void) { void UHS_NI UHS_Bulk_Storage::CheckMedia() {
if(!bAddress) return; if(!bAddress) return;
for(uint8_t lun = 0; lun <= bMaxLUN; lun++) { for(uint8_t lun = 0; lun <= bMaxLUN; lun++) {
if(TestUnitReady(lun)) { if(TestUnitReady(lun)) {
@ -630,7 +630,7 @@ void UHS_NI UHS_Bulk_Storage::CheckMedia(void) {
* For driver use only. * For driver use only.
* *
*/ */
void UHS_NI UHS_Bulk_Storage::Poll(void) { void UHS_NI UHS_Bulk_Storage::Poll() {
if((long)(millis() - qNextPollTime) >= 0L) { if((long)(millis() - qNextPollTime) >= 0L) {
CheckMedia(); CheckMedia();
@ -841,7 +841,7 @@ uint8_t UHS_NI UHS_Bulk_Storage::ClearEpHalt(uint8_t index) {
* For driver use only. * For driver use only.
* *
*/ */
void UHS_NI UHS_Bulk_Storage::Reset(void) { void UHS_NI UHS_Bulk_Storage::Reset() {
if(!bAddress) return; if(!bAddress) return;
while(pUsb->ctrlReq(bAddress, mkSETUP_PKT16(UHS_BULK_bmREQ_OUT, UHS_BULK_REQ_BOMSR, 0x0000U, bIface, 0), 0, NULL) == 0x01) { while(pUsb->ctrlReq(bAddress, mkSETUP_PKT16(UHS_BULK_bmREQ_OUT, UHS_BULK_REQ_BOMSR, 0x0000U, bIface, 0), 0, NULL) == 0x01) {
@ -858,7 +858,7 @@ void UHS_NI UHS_Bulk_Storage::Reset(void) {
* *
* @return 0 if successful * @return 0 if successful
*/ */
uint8_t UHS_NI UHS_Bulk_Storage::ResetRecovery(void) { uint8_t UHS_NI UHS_Bulk_Storage::ResetRecovery() {
if(!bAddress) return UHS_BULK_ERR_DEVICE_DISCONNECTED; if(!bAddress) return UHS_BULK_ERR_DEVICE_DISCONNECTED;
Notify(PSTR("\r\nResetRecovery\r\n"), 0x80); Notify(PSTR("\r\nResetRecovery\r\n"), 0x80);
Notify(PSTR("-----------------\r\n"), 0x80); Notify(PSTR("-----------------\r\n"), 0x80);
@ -883,7 +883,7 @@ uint8_t UHS_NI UHS_Bulk_Storage::ResetRecovery(void) {
* *
* Clear all EP data and clear all LUN status * Clear all EP data and clear all LUN status
*/ */
void UHS_NI UHS_Bulk_Storage::DriverDefaults(void) { void UHS_NI UHS_Bulk_Storage::DriverDefaults() {
pUsb->DeviceDefaults(MASS_MAX_ENDPOINTS, this); pUsb->DeviceDefaults(MASS_MAX_ENDPOINTS, this);

2
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_address.h
View file

@ -158,7 +158,7 @@ class AddressPool {
InitEntry(index); InitEntry(index);
} }
void InitAllAddresses(void) { void InitAllAddresses() {
for(uint8_t i = 1; i < UHS_HOST_MAX_INTERFACE_DRIVERS; i++) InitEntry(i); for(uint8_t i = 1; i < UHS_HOST_MAX_INTERFACE_DRIVERS; i++) InitEntry(i);
hubCounter = 0; hubCounter = 0;
}; };

2
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_hexdump.h
View file

@ -40,7 +40,7 @@ public:
HexDumper() : byteCount(0), byteTotal(0) { HexDumper() : byteCount(0), byteTotal(0) {
}; };
void Initialize(void) { void Initialize() {
byteCount = 0; byteCount = 0;
byteTotal = 0; byteTotal = 0;
}; };

8
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_message.h
View file

@ -43,10 +43,10 @@ void NotifyFailGetDevDescr(uint8_t reason);
void NotifyFailSetDevTblEntry(uint8_t reason); void NotifyFailSetDevTblEntry(uint8_t reason);
void NotifyFailGetConfDescr(uint8_t reason); void NotifyFailGetConfDescr(uint8_t reason);
void NotifyFailSetConfDescr(uint8_t reason); void NotifyFailSetConfDescr(uint8_t reason);
void NotifyFailGetDevDescr(void); void NotifyFailGetDevDescr();
void NotifyFailSetDevTblEntry(void); void NotifyFailSetDevTblEntry();
void NotifyFailGetConfDescr(void); void NotifyFailGetConfDescr();
void NotifyFailSetConfDescr(void); void NotifyFailSetConfDescr();
void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID); void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID);
void NotifyFail(uint8_t rcode); void NotifyFail(uint8_t rcode);
#else #else

2
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h
View file

@ -171,7 +171,7 @@ extern "C" {
#ifdef __AVR__ #ifdef __AVR__
// The only wierdo in the bunch... // The only wierdo in the bunch...
void UHS_AVR_printf_HELPER_init(void) { void UHS_AVR_printf_HELPER_init() {
// Set up stdio/stderr // Set up stdio/stderr
tty_stdio.put = tty_std_putc; tty_stdio.put = tty_std_putc;
tty_stdio.get = tty_std_getc; tty_stdio.get = tty_std_getc;

50
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usbhost.h
View file

@ -69,7 +69,7 @@ public:
volatile uint8_t usb_host_speed; volatile uint8_t usb_host_speed;
volatile uint8_t hub_present; volatile uint8_t hub_present;
UHS_USB_HOST_BASE(void) { UHS_USB_HOST_BASE() {
for(uint16_t i = 0; i < UHS_HOST_MAX_INTERFACE_DRIVERS; i++) { for(uint16_t i = 0; i < UHS_HOST_MAX_INTERFACE_DRIVERS; i++) {
devConfig[i] = NULL; devConfig[i] = NULL;
} }
@ -110,7 +110,7 @@ public:
virtual void UHS_NI vbusPower(NOTUSED(VBUS_t state)) { virtual void UHS_NI vbusPower(NOTUSED(VBUS_t state)) {
}; };
virtual void UHS_NI Task(void) { virtual void UHS_NI Task() {
}; };
virtual uint8_t UHS_NI SetAddress(NOTUSED(uint8_t addr), NOTUSED(uint8_t ep), NOTUSED(UHS_EpInfo **ppep), NOTUSED(uint16_t &nak_limit)) { virtual uint8_t UHS_NI SetAddress(NOTUSED(uint8_t addr), NOTUSED(uint8_t ep), NOTUSED(UHS_EpInfo **ppep), NOTUSED(uint16_t &nak_limit)) {
@ -137,27 +137,27 @@ public:
return UHS_HOST_ERROR_NOT_IMPLEMENTED; return UHS_HOST_ERROR_NOT_IMPLEMENTED;
}; };
virtual uint8_t UHS_NI init(void) { virtual uint8_t UHS_NI init() {
return 0; return 0;
}; };
virtual void UHS_NI doHostReset(void) { virtual void UHS_NI doHostReset() {
}; };
virtual int16_t UHS_NI Init(NOTUSED(int16_t mseconds)) { virtual int16_t UHS_NI Init(NOTUSED(int16_t mseconds)) {
return -1; return -1;
}; };
virtual int16_t UHS_NI Init(void) { virtual int16_t UHS_NI Init() {
return Init(INT16_MIN); return Init(INT16_MIN);
}; };
virtual uint8_t hwlPowerUp(void) { virtual uint8_t hwlPowerUp() {
/* This is for machine specific support to enable/power up the USB HW to operate*/ /* This is for machine specific support to enable/power up the USB HW to operate*/
return UHS_HOST_ERROR_NOT_IMPLEMENTED; return UHS_HOST_ERROR_NOT_IMPLEMENTED;
}; };
virtual uint8_t hwPowerDown(void) { virtual uint8_t hwPowerDown() {
/* This is for machine specific support to disable/powerdown the USB Hw */ /* This is for machine specific support to disable/powerdown the USB Hw */
return UHS_HOST_ERROR_NOT_IMPLEMENTED; return UHS_HOST_ERROR_NOT_IMPLEMENTED;
}; };
@ -166,13 +166,13 @@ public:
return (klass == UHS_USB_CLASS_HUB); return (klass == UHS_USB_CLASS_HUB);
}; };
virtual void UHS_NI suspend_host(void) { virtual void UHS_NI suspend_host() {
// Used on MCU that lack control of IRQ priority (AVR). // Used on MCU that lack control of IRQ priority (AVR).
// Suspends ISRs, for critical code. IRQ will be serviced after it is resumed. // Suspends ISRs, for critical code. IRQ will be serviced after it is resumed.
// NOTE: you must track the state yourself! // NOTE: you must track the state yourself!
}; };
virtual void UHS_NI resume_host(void) { virtual void UHS_NI resume_host() {
// Used on MCU that lack control of IRQ priority (AVR). // Used on MCU that lack control of IRQ priority (AVR).
// Resumes ISRs. // Resumes ISRs.
// NOTE: you must track the state yourself! // NOTE: you must track the state yourself!
@ -184,7 +184,7 @@ public:
// //
///////////////////////////////////////////// /////////////////////////////////////////////
// these two probably will go away, and won't be used, TBD // these two probably will go away, and won't be used, TBD
inline void Poll_Others(void) { inline void Poll_Others() {
#ifdef UHS_LOAD_BT #ifdef UHS_LOAD_BT
UHS_BT_Poll(this); UHS_BT_Poll(this);
#endif #endif
@ -193,14 +193,14 @@ public:
#endif #endif
} }
inline void DisablePoll(void) { inline void DisablePoll() {
noInterrupts(); noInterrupts();
usb_task_polling_disabled++; usb_task_polling_disabled++;
DDSB(); DDSB();
interrupts(); interrupts();
} }
inline void EnablePoll(void) { inline void EnablePoll() {
noInterrupts(); noInterrupts();
usb_task_polling_disabled--; usb_task_polling_disabled--;
DDSB(); DDSB();
@ -233,11 +233,11 @@ public:
UHS_EpInfo* UHS_NI getEpInfoEntry(uint8_t addr, uint8_t ep); UHS_EpInfo* UHS_NI getEpInfoEntry(uint8_t addr, uint8_t ep);
inline uint8_t getUsbTaskState(void) { inline uint8_t getUsbTaskState() {
return ( usb_task_state); return ( usb_task_state);
}; };
inline AddressPool* GetAddressPool(void) { inline AddressPool* GetAddressPool() {
return &addrPool; return &addrPool;
}; };
@ -289,7 +289,7 @@ public:
* Resets interface driver to unused state. You should override this in * Resets interface driver to unused state. You should override this in
* your driver if it requires extra class variable cleanup. * your driver if it requires extra class variable cleanup.
*/ */
virtual void DriverDefaults(void) { virtual void DriverDefaults() {
printf("Default driver defaults.\r\n"); printf("Default driver defaults.\r\n");
pUsb->DeviceDefaults(bNumEP, this); pUsb->DeviceDefaults(bNumEP, this);
}; };
@ -325,7 +325,7 @@ public:
* *
* @return zero on success * @return zero on success
*/ */
virtual uint8_t Finalize(void) { virtual uint8_t Finalize() {
return 0; return 0;
}; };
@ -334,7 +334,7 @@ public:
* *
* @return 0 on success * @return 0 on success
*/ */
virtual uint8_t OnStart(void) { virtual uint8_t OnStart() {
return 0; return 0;
}; };
@ -342,7 +342,7 @@ public:
* Start interface polling * Start interface polling
* @return * @return
*/ */
virtual uint8_t Start(void) { virtual uint8_t Start() {
uint8_t rcode = OnStart(); uint8_t rcode = OnStart();
if(!rcode) bPollEnable = true; if(!rcode) bPollEnable = true;
return rcode; return rcode;
@ -352,7 +352,7 @@ public:
* Executed before anything else in Release(). * Executed before anything else in Release().
* *
*/ */
virtual void OnRelease(void) { virtual void OnRelease() {
return; return;
}; };
@ -360,7 +360,7 @@ public:
* Release resources when device is disconnected. * Release resources when device is disconnected.
* Normally this does not need to be overridden. * Normally this does not need to be overridden.
*/ */
virtual void Release(void) { virtual void Release() {
OnRelease(); OnRelease();
DriverDefaults(); DriverDefaults();
return; return;
@ -375,7 +375,7 @@ public:
* Button state/joystick position/etc changes on a HID device. * Button state/joystick position/etc changes on a HID device.
* Flow control status change on a communication device, e.g. CTS on serial * Flow control status change on a communication device, e.g. CTS on serial
*/ */
virtual void OnPoll(void) { virtual void OnPoll() {
return; return;
}; };
@ -389,7 +389,7 @@ public:
qNextPollTime = millis() + 100; qNextPollTime = millis() + 100;
}; };
virtual bool UHS_NI Polling(void) { virtual bool UHS_NI Polling() {
return bPollEnable; return bPollEnable;
} }
@ -434,10 +434,10 @@ public:
UHS_VSI(UHS_USB_HOST_BASE *p); UHS_VSI(UHS_USB_HOST_BASE *p);
bool OKtoEnumerate(ENUMERATION_INFO *ei); bool OKtoEnumerate(ENUMERATION_INFO *ei);
uint8_t SetInterface(ENUMERATION_INFO *ei); uint8_t SetInterface(ENUMERATION_INFO *ei);
virtual void DriverDefaults(void); virtual void DriverDefaults();
virtual void Release(void); virtual void Release();
uint8_t GetAddress(void) { uint8_t GetAddress() {
return bAddress; return bAddress;
}; };

8
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_util_INLINE.h
View file

@ -74,19 +74,19 @@ void E_Notify(double d, int lvl) {
#ifdef DEBUG_USB_HOST #ifdef DEBUG_USB_HOST
void NotifyFailGetDevDescr(void) { void NotifyFailGetDevDescr() {
Notify(PSTR("\r\ngetDevDescr "), 0x80); Notify(PSTR("\r\ngetDevDescr "), 0x80);
} }
void NotifyFailSetDevTblEntry(void) { void NotifyFailSetDevTblEntry() {
Notify(PSTR("\r\nsetDevTblEn "), 0x80); Notify(PSTR("\r\nsetDevTblEn "), 0x80);
} }
void NotifyFailGetConfDescr(void) { void NotifyFailGetConfDescr() {
Notify(PSTR("\r\ngetConf "), 0x80); Notify(PSTR("\r\ngetConf "), 0x80);
} }
void NotifyFailSetConfDescr(void) { void NotifyFailSetConfDescr() {
Notify(PSTR("\r\nsetConf "), 0x80); Notify(PSTR("\r\nsetConf "), 0x80);
} }

28
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
View file

@ -330,7 +330,7 @@ public:
uint8_t irq_pin; uint8_t irq_pin;
// Will use the defaults UHS_MAX3421E_SS, UHS_MAX3421E_INT and speed // Will use the defaults UHS_MAX3421E_SS, UHS_MAX3421E_INT and speed
UHS_NI MAX3421E_HOST(void) { UHS_NI MAX3421E_HOST() {
sof_countdown = 0; sof_countdown = 0;
busevent = false; busevent = false;
doingreset = false; doingreset = false;
@ -394,7 +394,7 @@ public:
regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE) | (uint8_t)(state)); regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE) | (uint8_t)(state));
}; };
void UHS_NI Task(void); void UHS_NI Task();
virtual uint8_t SetAddress(uint8_t addr, uint8_t ep, UHS_EpInfo **ppep, uint16_t &nak_limit); virtual uint8_t SetAddress(uint8_t addr, uint8_t ep, UHS_EpInfo **ppep, uint16_t &nak_limit);
virtual uint8_t OutTransfer(UHS_EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data); virtual uint8_t OutTransfer(UHS_EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data);
@ -403,7 +403,7 @@ public:
virtual uint8_t ctrlReqRead(UHS_EpInfo *pep, uint16_t *left, uint16_t *read, uint16_t nbytes, uint8_t *dataptr); virtual uint8_t ctrlReqRead(UHS_EpInfo *pep, uint16_t *left, uint16_t *read, uint16_t nbytes, uint8_t *dataptr);
virtual uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit); virtual uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit);
void UHS_NI ReleaseChildren(void) { void UHS_NI ReleaseChildren() {
for(uint8_t i = 0; i < UHS_HOST_MAX_INTERFACE_DRIVERS; i++) for(uint8_t i = 0; i < UHS_HOST_MAX_INTERFACE_DRIVERS; i++)
if(devConfig[i]) if(devConfig[i])
devConfig[i]->Release(); devConfig[i]->Release();
@ -418,9 +418,9 @@ public:
return false; return false;
}; };
virtual void VBUS_changed(void); virtual void VBUS_changed();
virtual void UHS_NI doHostReset(void) { virtual void UHS_NI doHostReset() {
#if USB_HOST_SHIELD_USE_ISR #if USB_HOST_SHIELD_USE_ISR
// Enable interrupts // Enable interrupts
noInterrupts(); noInterrupts();
@ -469,32 +469,32 @@ public:
int16_t UHS_NI Init(int16_t mseconds); int16_t UHS_NI Init(int16_t mseconds);
int16_t UHS_NI Init(void) { int16_t UHS_NI Init() {
return Init(INT16_MIN); return Init(INT16_MIN);
}; };
void ISRTask(void); void ISRTask();
void ISRbottom(void); void ISRbottom();
void busprobe(void); void busprobe();
uint16_t reset(void); uint16_t reset();
// MAX3421e specific // MAX3421e specific
void regWr(uint8_t reg, uint8_t data); void regWr(uint8_t reg, uint8_t data);
void gpioWr(uint8_t data); void gpioWr(uint8_t data);
uint8_t regRd(uint8_t reg); uint8_t regRd(uint8_t reg);
uint8_t gpioRd(void); uint8_t gpioRd();
uint8_t* bytesWr(uint8_t reg, uint8_t nbytes, uint8_t* data_p); uint8_t* bytesWr(uint8_t reg, uint8_t nbytes, uint8_t* data_p);
uint8_t* bytesRd(uint8_t reg, uint8_t nbytes, uint8_t* data_p); uint8_t* bytesRd(uint8_t reg, uint8_t nbytes, uint8_t* data_p);
// ARM/NVIC specific, used to emulate reentrant ISR. // ARM/NVIC specific, used to emulate reentrant ISR.
#ifdef SWI_IRQ_NUM #ifdef SWI_IRQ_NUM
void dyn_SWISR(void) { void dyn_SWISR() {
ISRbottom(); ISRbottom();
}; };
#endif #endif
virtual void UHS_NI suspend_host(void) { virtual void UHS_NI suspend_host() {
// Used on MCU that lack control of IRQ priority (AVR). // Used on MCU that lack control of IRQ priority (AVR).
// Suspends ISRs, for critical code. IRQ will be serviced after it is resumed. // Suspends ISRs, for critical code. IRQ will be serviced after it is resumed.
// NOTE: you must track the state yourself! // NOTE: you must track the state yourself!
@ -505,7 +505,7 @@ public:
#endif #endif
}; };
virtual void UHS_NI resume_host(void); virtual void UHS_NI resume_host();
}; };
#ifndef SPIclass #ifndef SPIclass
#define SPIclass SPI #define SPIclass SPI

24
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h
View file

@ -34,18 +34,18 @@ e-mail : support@circuitsathome.com
static MAX3421E_HOST *ISReven; static MAX3421E_HOST *ISReven;
static MAX3421E_HOST *ISRodd; static MAX3421E_HOST *ISRodd;
static void UHS_NI call_ISReven(void) { static void UHS_NI call_ISReven() {
ISReven->ISRTask(); ISReven->ISRTask();
} }
static void UHS_NI call_ISRodd(void) { static void UHS_NI call_ISRodd() {
UHS_PIN_WRITE(LED_BUILTIN, HIGH); UHS_PIN_WRITE(LED_BUILTIN, HIGH);
ISRodd->ISRTask(); ISRodd->ISRTask();
} }
#endif #endif
void UHS_NI MAX3421E_HOST::resume_host(void) { void UHS_NI MAX3421E_HOST::resume_host() {
// Used on MCU that lack control of IRQ priority (AVR). // Used on MCU that lack control of IRQ priority (AVR).
// Resumes ISRs. // Resumes ISRs.
// NOTE: you must track the state yourself! // NOTE: you must track the state yourself!
@ -133,7 +133,7 @@ uint8_t* UHS_NI MAX3421E_HOST::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t* dat
/* GPIO read. See gpioWr for explanation */ /* GPIO read. See gpioWr for explanation */
/* GPIN pins are in high nibbles of IOPINS1, IOPINS2 */ /* GPIN pins are in high nibbles of IOPINS1, IOPINS2 */
uint8_t UHS_NI MAX3421E_HOST::gpioRd(void) { uint8_t UHS_NI MAX3421E_HOST::gpioRd() {
uint8_t gpin = 0; uint8_t gpin = 0;
gpin = regRd(rIOPINS2); //pins 4-7 gpin = regRd(rIOPINS2); //pins 4-7
gpin &= 0xf0; //clean lower nibble gpin &= 0xf0; //clean lower nibble
@ -143,7 +143,7 @@ uint8_t UHS_NI MAX3421E_HOST::gpioRd(void) {
/* reset MAX3421E. Returns number of microseconds it took for PLL to stabilize after reset /* reset MAX3421E. Returns number of microseconds it took for PLL to stabilize after reset
or zero if PLL haven't stabilized in 65535 cycles */ or zero if PLL haven't stabilized in 65535 cycles */
uint16_t UHS_NI MAX3421E_HOST::reset(void) { uint16_t UHS_NI MAX3421E_HOST::reset() {
uint16_t i = 0; uint16_t i = 0;
// Initiate chip reset // Initiate chip reset
@ -167,7 +167,7 @@ uint16_t UHS_NI MAX3421E_HOST::reset(void) {
return (i); return (i);
} }
void UHS_NI MAX3421E_HOST::VBUS_changed(void) { void UHS_NI MAX3421E_HOST::VBUS_changed() {
/* modify USB task state because Vbus changed or unknown */ /* modify USB task state because Vbus changed or unknown */
uint8_t speed = 1; uint8_t speed = 1;
//printf("\r\n\r\n\r\n\r\nSTATE %2.2x -> ", usb_task_state); //printf("\r\n\r\n\r\n\r\nSTATE %2.2x -> ", usb_task_state);
@ -214,7 +214,7 @@ void UHS_NI MAX3421E_HOST::VBUS_changed(void) {
* Probe bus to determine device presence and speed, * Probe bus to determine device presence and speed,
* then switch host to detected speed. * then switch host to detected speed.
*/ */
void UHS_NI MAX3421E_HOST::busprobe(void) { void UHS_NI MAX3421E_HOST::busprobe() {
uint8_t bus_sample; uint8_t bus_sample;
uint8_t tmpdata; uint8_t tmpdata;
bus_sample = regRd(rHRSL); //Get J,K status bus_sample = regRd(rHRSL); //Get J,K status
@ -760,7 +760,7 @@ uint8_t UHS_NI MAX3421E_HOST::ctrlReqClose(UHS_EpInfo *pep, uint8_t bmReqType, u
/** /**
* Bottom half of the ISR task * Bottom half of the ISR task
*/ */
void UHS_NI MAX3421E_HOST::ISRbottom(void) { void UHS_NI MAX3421E_HOST::ISRbottom() {
uint8_t x; uint8_t x;
// Serial.print("Enter "); // Serial.print("Enter ");
// Serial.print((uint32_t)this,HEX); // Serial.print((uint32_t)this,HEX);
@ -879,12 +879,12 @@ void UHS_NI MAX3421E_HOST::ISRbottom(void) {
/* USB main task. Services the MAX3421e */ /* USB main task. Services the MAX3421e */
#if !USB_HOST_SHIELD_USE_ISR #if !USB_HOST_SHIELD_USE_ISR
void UHS_NI MAX3421E_HOST::ISRTask(void) { void UHS_NI MAX3421E_HOST::ISRTask() {
} }
void UHS_NI MAX3421E_HOST::Task(void) void UHS_NI MAX3421E_HOST::Task()
#else #else
void UHS_NI MAX3421E_HOST::Task(void) { void UHS_NI MAX3421E_HOST::Task() {
#ifdef USB_HOST_MANUAL_POLL #ifdef USB_HOST_MANUAL_POLL
if(usb_task_state == UHS_USB_HOST_STATE_RUNNING) { if(usb_task_state == UHS_USB_HOST_STATE_RUNNING) {
noInterrupts(); noInterrupts();
@ -896,7 +896,7 @@ void UHS_NI MAX3421E_HOST::Task(void) {
#endif #endif
} }
void UHS_NI MAX3421E_HOST::ISRTask(void) void UHS_NI MAX3421E_HOST::ISRTask()
#endif #endif
{ {
DDSB(); DDSB();

18
Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h
View file

@ -42,12 +42,12 @@ extern "C" {
} }
#else #else
__attribute__((always_inline)) static inline void __DSB(void) { __attribute__((always_inline)) static inline void __DSB() {
__asm__ volatile ("dsb"); __asm__ volatile ("dsb");
} }
#endif // defined(__USE_CMSIS_VECTORS__) #endif // defined(__USE_CMSIS_VECTORS__)
#else // defined(__arm__) #else // defined(__arm__)
__attribute__((always_inline)) static inline void __DSB(void) { __attribute__((always_inline)) static inline void __DSB() {
__asm__ volatile ("sync" : : : "memory"); __asm__ volatile ("sync" : : : "memory");
} }
#endif // defined(__arm__) #endif // defined(__arm__)
@ -66,12 +66,12 @@ void
#else #else
__attribute__((interrupt(),nomips16)) __attribute__((interrupt(),nomips16))
#endif #endif
softISR(void) { softISR() {
#else #else
#ifdef ARDUINO_spresense_ast #ifdef ARDUINO_spresense_ast
unsigned int softISR(void) { unsigned int softISR() {
#else #else
void softISR(void) { void softISR() {
#endif #endif
#endif #endif
@ -121,9 +121,9 @@ void softISR(void) {
#ifdef __arm__ #ifdef __arm__
#ifndef interruptsStatus #ifndef interruptsStatus
#define interruptsStatus() __interruptsStatus() #define interruptsStatus() __interruptsStatus()
static inline unsigned char __interruptsStatus(void) __attribute__((always_inline, unused)); static inline unsigned char __interruptsStatus() __attribute__((always_inline, unused));
static inline unsigned char __interruptsStatus(void) { static inline unsigned char __interruptsStatus() {
unsigned int primask; unsigned int primask;
asm volatile ("mrs %0, primask" : "=r" (primask)); asm volatile ("mrs %0, primask" : "=r" (primask));
if(primask) return 0; if(primask) return 0;
@ -134,7 +134,7 @@ static inline unsigned char __interruptsStatus(void) {
/** /**
* Initialize the Dynamic (class) Software Interrupt * Initialize the Dynamic (class) Software Interrupt
*/ */
static void Init_dyn_SWI(void) { static void Init_dyn_SWI() {
if(!dyn_SWI_initied) { if(!dyn_SWI_initied) {
#ifdef __USE_CMSIS_VECTORS__ #ifdef __USE_CMSIS_VECTORS__
uint32_t *X_Vectors = (uint32_t*)SCB->VTOR; uint32_t *X_Vectors = (uint32_t*)SCB->VTOR;
@ -201,7 +201,7 @@ int exec_SWI(const dyn_SWI* klass) {
/** /**
* Initialize the Dynamic (class) Software Interrupt * Initialize the Dynamic (class) Software Interrupt
*/ */
static void Init_dyn_SWI(void) { static void Init_dyn_SWI() {
if(!dyn_SWI_initied) { if(!dyn_SWI_initied) {
uint32_t sreg = disableInterrupts(); uint32_t sreg = disableInterrupts();

4
Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h
View file

@ -62,7 +62,7 @@ extern "C"
#else #else
__attribute__((interrupt(),nomips16)) __attribute__((interrupt(),nomips16))
#endif #endif
softISR(void); softISR();
} }
#endif #endif
#endif #endif
@ -149,7 +149,7 @@ public:
/** /**
* Override this method with your code. * Override this method with your code.
*/ */
virtual void dyn_SWISR(void) { virtual void dyn_SWISR() {
}; };
}; };

2
buildroot/share/PlatformIO/variants/BIGTREE_GENERIC_STM32F407_5X/variant.cpp
View file

@ -205,7 +205,7 @@ extern "C" {
* @param None * @param None
* @retval None * @retval None
*/ */
WEAK void SystemClock_Config(void) { WEAK void SystemClock_Config() {
RCC_OscInitTypeDef RCC_OscInitStruct; RCC_OscInitTypeDef RCC_OscInitStruct;
RCC_ClkInitTypeDef RCC_ClkInitStruct; RCC_ClkInitTypeDef RCC_ClkInitStruct;

2
buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp
View file

@ -109,7 +109,7 @@ extern "C" {
* @param None * @param None
* @retval None * @retval None
*/ */
WEAK void SystemClock_Config(void) { WEAK void SystemClock_Config() {
RCC_OscInitTypeDef RCC_OscInitStruct; RCC_OscInitTypeDef RCC_OscInitStruct;
RCC_ClkInitTypeDef RCC_ClkInitStruct; RCC_ClkInitTypeDef RCC_ClkInitStruct;