zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Misc general spacing cleanup

Browse source
This commit is contained in:
Scott Lahteine 2017-10-06 15:13:43 -05:00
parent c0382cd8cd
commit 9fe7f53216
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -1238,7 +1238,7 @@
* Enable one of the following items for a slower SPI transfer speed. * Enable one of the following items for a slower SPI transfer speed.
* This may be required to resolve "volume init" errors or LCD issues. * This may be required to resolve "volume init" errors or LCD issues.
*/ */
//#define SPI_SPEED SPI_HALF_SPEED //#define SPI_SPEED SPI_HALF_SPEED
//#define SPI_SPEED SPI_QUARTER_SPEED //#define SPI_SPEED SPI_QUARTER_SPEED
//#define SPI_SPEED SPI_EIGHTH_SPEED //#define SPI_SPEED SPI_EIGHTH_SPEED

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

@ -496,7 +496,7 @@
} }
void MarlinSerial::writeNoHandshake(const uint8_t c) { void MarlinSerial::writeNoHandshake(const uint8_t c) {
while (!TEST(M_UCSRxA, M_UDREx)) ; while (!TEST(M_UCSRxA, M_UDREx)) { /* nada */ }
M_UDRx = c; M_UDRx = c;
} }

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

@ -107,15 +107,15 @@
#else #else
typedef uint8_t ring_buffer_pos_t; typedef uint8_t ring_buffer_pos_t;
#endif #endif
#if ENABLED(SERIAL_STATS_DROPPED_RX) #if ENABLED(SERIAL_STATS_DROPPED_RX)
extern uint8_t rx_dropped_bytes; extern uint8_t rx_dropped_bytes;
#endif #endif
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
extern ring_buffer_pos_t rx_max_enqueued; extern ring_buffer_pos_t rx_max_enqueued;
#endif #endif
class MarlinSerial { //: public Stream class MarlinSerial { //: public Stream
public: public:
@ -140,7 +140,7 @@
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; } FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; }
#endif #endif
static FORCE_INLINE void write(const char* str) { while (*str) write(*str++); } static FORCE_INLINE void write(const char* str) { while (*str) write(*str++); }
static FORCE_INLINE void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); } static FORCE_INLINE void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); }

2
Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.h
View file

@ -431,7 +431,7 @@ HAL_PWM_LPC1768_ISR {
ISR_table = active_table; // MR0 means new values could have been loaded so set everything ISR_table = active_table; // MR0 means new values could have been loaded so set everything
if (PWM_table_swap) LPC_PWM1->MCR = LPC1768_PWM_interrupt_mask; // enable new PWM individual channel interrupts if (PWM_table_swap) LPC_PWM1->MCR = LPC1768_PWM_interrupt_mask; // enable new PWM individual channel interrupts
for (uint8_t i = 0; (i < NUM_PWMS) ; i++) { for (uint8_t i = 0; i < NUM_PWMS; i++) {
if(ISR_table[i].active_flag && !((ISR_table[i].logical_pin == 11) || if(ISR_table[i].active_flag && !((ISR_table[i].logical_pin == 11) ||
(ISR_table[i].logical_pin == 4) || (ISR_table[i].logical_pin == 4) ||
(ISR_table[i].logical_pin == 6))) (ISR_table[i].logical_pin == 6)))

2
Marlin/src/HAL/persistent_store_api.h
View file

@ -10,7 +10,7 @@ namespace PersistentStore {
bool access_start(); bool access_start();
bool access_finish(); bool access_finish();
bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc); bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc);
void read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc) ; void read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc);
} // PersistentStore } // PersistentStore
} // HAL } // HAL

4
frameworks/CMSIS/LPC1768/driver/lpc17xx_systick.c
View file

@ -73,7 +73,7 @@ void SYSTICK_InternalInit(uint32_t time)
* 1/SystemCoreClock * (2^24) * 1000 (ms) * 1/SystemCoreClock * (2^24) * 1000 (ms)
*/ */
//check time value is available or not //check time value is available or not
maxtime = (1<<24)/(SystemCoreClock / 1000) ; maxtime = (1<<24)/(SystemCoreClock / 1000);
if(time > maxtime) if(time > maxtime)
//Error loop //Error loop
while(1); while(1);
@ -105,7 +105,7 @@ void SYSTICK_ExternalInit(uint32_t freq, uint32_t time)
* 1/freq * (2^24) * 1000 (ms) * 1/freq * (2^24) * 1000 (ms)
*/ */
//check time value is available or not //check time value is available or not
maxtime = (1<<24)/(freq / 1000) ; maxtime = (1<<24)/(freq / 1000);
if (time>maxtime) if (time>maxtime)
//Error Loop //Error Loop
while(1); while(1);