melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Scott Lahteine 2019-09-16 20:27:04 -05:00
parent a06010e08a
commit 7d8c38693f
14 changed files with 47 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/HAL/HAL_AVR/HAL.h
View File

@ -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(void) __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(void) asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
void TIMER1_COMPA_vect (void) { \ void TIMER1_COMPA_vect(void) { \
__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 */ \
@ -272,9 +272,9 @@ void TIMER1_COMPA_vect_bottom(void)
/* 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(void) __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(void) asm ("TIMER0_COMPB_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
void TIMER0_COMPB_vect (void) { \ void TIMER0_COMPB_vect(void) { \
__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 */ \

2
Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
View File

@ -428,7 +428,7 @@
static void spiTxBlockX(const uint8_t* buf, uint32_t todo) { static void spiTxBlockX(const uint8_t* buf, uint32_t todo) {
do { do {
(void) spiTransferTx(*buf++); (void)spiTransferTx(*buf++);
} while (--todo); } while (--todo);
} }

6
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)(void);
//! 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)(void);
} 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)(void);
/** /**
* \brief End of transfer callback function type. * \brief End of transfer callback function type.

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)(void);
/** /**
* \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)(void);
/** /**
* \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)(void);
/** /**
* \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)(void);
/** /**
* \brief To signal that a SOF is occurred * \brief To signal that a SOF is occurred
*/ */
void(*sof_notify) (void); void (*sof_notify)(void);
} udi_api_t; } udi_api_t;
//@} //@}

2
Marlin/src/HAL/HAL_ESP32/HAL.h
View File

@ -85,7 +85,7 @@ extern uint16_t HAL_adc_result;
// ------------------------ // ------------------------
// clear reset reason // clear reset reason
void HAL_clear_reset_source (void); void HAL_clear_reset_source(void);
// reset reason // reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source(void);

2
Marlin/src/HAL/HAL_STM32/HAL.h
View File

@ -150,7 +150,7 @@ extern uint16_t HAL_adc_result;
void HAL_init(void); void HAL_init(void);
// Clear reset reason // Clear reset reason
void HAL_clear_reset_source (void); void HAL_clear_reset_source(void);
// Reset reason // Reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source(void);

2
Marlin/src/HAL/HAL_STM32F1/sdio.cpp
View File

@ -107,7 +107,7 @@ bool SDIO_ReadBlock_DMA(uint32_t blockAddress, uint8_t *data) {
dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL); dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
if (SDIO->STA & SDIO_STA_RXDAVL) { if (SDIO->STA & SDIO_STA_RXDAVL) {
while (SDIO->STA & SDIO_STA_RXDAVL) (void) SDIO->FIFO; while (SDIO->STA & SDIO_STA_RXDAVL) (void)SDIO->FIFO;
SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS); SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
return false; return false;
} }

2
Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
View File

@ -153,7 +153,7 @@ extern uint16_t HAL_adc_result;
inline void HAL_init(void) { } inline void HAL_init(void) { }
// Clear reset reason // Clear reset reason
void HAL_clear_reset_source (void); void HAL_clear_reset_source(void);
// Reset reason // Reset reason
uint8_t HAL_get_reset_source(void); uint8_t HAL_get_reset_source(void);

4
Marlin/src/Marlin.cpp
View File

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

14
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.cpp
View File

@ -29,15 +29,15 @@
using namespace FTDI; using namespace FTDI;
using namespace FTDI::SPI; using namespace FTDI::SPI;
void CLCD::enable (void) { void CLCD::enable(void) {
mem_write_8(REG::PCLK, Pclk); mem_write_8(REG::PCLK, Pclk);
} }
void CLCD::disable (void) { void CLCD::disable(void) {
mem_write_8(REG::PCLK, 0x00); mem_write_8(REG::PCLK, 0x00);
} }
void CLCD::set_brightness (uint8_t brightness) { void CLCD::set_brightness(uint8_t brightness) {
mem_write_8(REG::PWM_DUTY, min(128,brightness)); mem_write_8(REG::PWM_DUTY, min(128,brightness));
} }
@ -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(void) {
mem_write_8(REG::PWM_DUTY, 128); mem_write_8(REG::PWM_DUTY, 128);
} }
@ -1042,17 +1042,17 @@ template bool CLCD::CommandFifo::write(progmem_str, uint16_t);
// CO_PROCESSOR COMMANDS // CO_PROCESSOR COMMANDS
void CLCD::CommandFifo::str (const char * data) { void CLCD::CommandFifo::str(const char * data) {
write(data, strlen(data)+1); write(data, strlen(data)+1);
} }
void CLCD::CommandFifo::str (progmem_str data) { void CLCD::CommandFifo::str(progmem_str data) {
write(data, strlen_P((const char*)data)+1); write(data, strlen_P((const char*)data)+1);
} }
/******************* LCD INITIALIZATION ************************/ /******************* LCD INITIALIZATION ************************/
void CLCD::init (void) { void CLCD::init(void) {
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

14
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(void);
static void default_touch_transform (void); static void default_touch_transform(void);
static void default_display_orientation (void); static void default_display_orientation(void);
static void turn_on_backlight (void); static void turn_on_backlight(void);
static void enable (void); static void enable(void);
static void disable (void); static void disable(void);
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);
@ -187,7 +187,7 @@ class CLCD::CommandFifo {
public: public:
CommandFifo() {start();} CommandFifo() {start();}
static void reset (void); static void reset(void);
static bool is_processing(); static bool is_processing();
static bool has_fault(); static bool has_fault();

39
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(void) {
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
@ -63,20 +63,11 @@ namespace FTDI {
uint8_t k; uint8_t k;
noInterrupts(); noInterrupts();
for(k = 0; k <8; k++) { // Output and Read each bit of spiOutByte and spiInByte for (k = 0; k < 8; k++) { // Output and Read each bit of spiOutByte and spiInByte
if (spiOutByte & spiIndex) { // Output MOSI Bit WRITE(CLCD_SOFT_SPI_MOSI, (spiOutByte & spiIndex) ? 1 : 0); // Output MOSI Bit
WRITE(CLCD_SOFT_SPI_MOSI, 1);
}
else {
WRITE(CLCD_SOFT_SPI_MOSI, 0);
}
WRITE(CLCD_SOFT_SPI_SCLK, 1); // Pulse Clock WRITE(CLCD_SOFT_SPI_SCLK, 1); // Pulse Clock
WRITE(CLCD_SOFT_SPI_SCLK, 0); WRITE(CLCD_SOFT_SPI_SCLK, 0);
if (READ(CLCD_SOFT_SPI_MISO)) spiInByte |= spiIndex;
if (READ(CLCD_SOFT_SPI_MISO)) {
spiInByte |= spiIndex;
}
spiIndex >>= 1; spiIndex >>= 1;
} }
interrupts(); interrupts();
@ -86,20 +77,13 @@ namespace FTDI {
#ifdef CLCD_USE_SOFT_SPI #ifdef CLCD_USE_SOFT_SPI
void SPI::_soft_spi_send (uint8_t spiOutByte) { void SPI::_soft_spi_send (uint8_t spiOutByte) {
uint8_t spiIndex = 0x80; uint8_t k, spiIndex = 0x80;
uint8_t k;
noInterrupts(); noInterrupts();
for(k = 0; k <8; k++) { // Output each bit of spiOutByte for (k = 0; k < 8; k++) { // Output each bit of spiOutByte
if (spiOutByte & spiIndex) { // Output MOSI Bit WRITE(CLCD_SOFT_SPI_MOSI, (spiOutByte & spiIndex) ? 1 : 0); // Output MOSI Bit
WRITE(CLCD_SOFT_SPI_MOSI, 1);
}
else {
WRITE(CLCD_SOFT_SPI_MOSI, 0);
}
WRITE(CLCD_SOFT_SPI_SCLK, 1); // Pulse Clock WRITE(CLCD_SOFT_SPI_SCLK, 1); // Pulse Clock
WRITE(CLCD_SOFT_SPI_SCLK, 0); WRITE(CLCD_SOFT_SPI_SCLK, 0);
spiIndex >>= 1; spiIndex >>= 1;
} }
interrupts(); interrupts();
@ -122,7 +106,7 @@ namespace FTDI {
} }
// CLCD SPI - Chip Select // CLCD SPI - Chip Select
void SPI::spi_ftdi_select (void) { void SPI::spi_ftdi_select(void) {
#ifndef CLCD_USE_SOFT_SPI #ifndef CLCD_USE_SOFT_SPI
::SPI.beginTransaction(spi_settings); ::SPI.beginTransaction(spi_settings);
#endif #endif
@ -131,7 +115,7 @@ namespace FTDI {
} }
// CLCD SPI - Chip Deselect // CLCD SPI - Chip Deselect
void SPI::spi_ftdi_deselect (void) { void SPI::spi_ftdi_deselect(void) {
WRITE(CLCD_SPI_CS, 1); WRITE(CLCD_SPI_CS, 1);
#ifndef CLCD_USE_SOFT_SPI #ifndef CLCD_USE_SOFT_SPI
::SPI.endTransaction(); ::SPI.endTransaction();
@ -158,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(void) {
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);
@ -166,8 +150,7 @@ namespace FTDI {
} }
// Not really a SPI signal... // Not really a SPI signal...
void SPI::test_pulse(void) void SPI::test_pulse(void) {
{
#ifdef CLCD_AUX_0 #ifdef CLCD_AUX_0
WRITE(CLCD_AUX_0, 1); WRITE(CLCD_AUX_0, 1);
delayMicroseconds(10); delayMicroseconds(10);

3
buildroot/share/PlatformIO/variants/BIGTREE_GENERIC_STM32F407_5X/variant.cpp
View File

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

3
buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp
View File

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