Browse Source

Formatting

Scott Lahteine 5 years ago
parent
commit
7d8c38693f

+ 5
- 5
Marlin/src/HAL/HAL_AVR/HAL.h View File

199
 
199
 
200
 /* 18 cycles maximum latency */
200
 /* 18 cycles maximum latency */
201
 #define HAL_STEP_TIMER_ISR() \
201
 #define HAL_STEP_TIMER_ISR() \
202
-extern "C" void TIMER1_COMPA_vect (void) __attribute__ ((signal, naked, used, externally_visible)); \
203
-extern "C" void TIMER1_COMPA_vect_bottom (void) asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
204
-void TIMER1_COMPA_vect (void) { \
202
+extern "C" void TIMER1_COMPA_vect(void) __attribute__ ((signal, naked, used, externally_visible)); \
203
+extern "C" void TIMER1_COMPA_vect_bottom(void) asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
204
+void TIMER1_COMPA_vect(void) { \
205
   __asm__ __volatile__ ( \
205
   __asm__ __volatile__ ( \
206
     A("push r16")                      /* 2 Save R16 */ \
206
     A("push r16")                      /* 2 Save R16 */ \
207
     A("in r16, __SREG__")              /* 1 Get SREG */ \
207
     A("in r16, __SREG__")              /* 1 Get SREG */ \
272
 
272
 
273
 /* 14 cycles maximum latency */
273
 /* 14 cycles maximum latency */
274
 #define HAL_TEMP_TIMER_ISR() \
274
 #define HAL_TEMP_TIMER_ISR() \
275
-extern "C" void TIMER0_COMPB_vect (void) __attribute__ ((signal, naked, used, externally_visible)); \
275
+extern "C" void TIMER0_COMPB_vect(void) __attribute__ ((signal, naked, used, externally_visible)); \
276
 extern "C" void TIMER0_COMPB_vect_bottom(void)  asm ("TIMER0_COMPB_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
276
 extern "C" void TIMER0_COMPB_vect_bottom(void)  asm ("TIMER0_COMPB_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
277
-void TIMER0_COMPB_vect (void) { \
277
+void TIMER0_COMPB_vect(void) { \
278
   __asm__ __volatile__ ( \
278
   __asm__ __volatile__ ( \
279
     A("push r16")                       /* 2 Save R16 */ \
279
     A("push r16")                       /* 2 Save R16 */ \
280
     A("in r16, __SREG__")               /* 1 Get SREG */ \
280
     A("in r16, __SREG__")               /* 1 Get SREG */ \

+ 1
- 1
Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp View File

428
 
428
 
429
   static void spiTxBlockX(const uint8_t* buf, uint32_t todo) {
429
   static void spiTxBlockX(const uint8_t* buf, uint32_t todo) {
430
     do {
430
     do {
431
-      (void) spiTransferTx(*buf++);
431
+      (void)spiTransferTx(*buf++);
432
     } while (--todo);
432
     } while (--todo);
433
   }
433
   }
434
 
434
 

+ 3
- 3
Marlin/src/HAL/HAL_DUE/usb/udd.h View File

94
 	uint16_t payload_size;
94
 	uint16_t payload_size;
95
 
95
 
96
 	//! Callback called after reception of ZLP from setup request
96
 	//! Callback called after reception of ZLP from setup request
97
-	void (*callback) (void);
97
+	void (*callback)(void);
98
 
98
 
99
 	//! Callback called when the buffer given (.payload) is full or empty.
99
 	//! Callback called when the buffer given (.payload) is full or empty.
100
 	//! This one return false to abort data transfer, or true with a new buffer in .payload.
100
 	//! This one return false to abort data transfer, or true with a new buffer in .payload.
101
-	bool(*over_under_run) (void);
101
+	bool (*over_under_run)(void);
102
 } udd_ctrl_request_t;
102
 } udd_ctrl_request_t;
103
 extern udd_ctrl_request_t udd_g_ctrlreq;
103
 extern udd_ctrl_request_t udd_g_ctrlreq;
104
 
104
 
123
  * Registered by routine udd_ep_wait_stall_clear()
123
  * Registered by routine udd_ep_wait_stall_clear()
124
  * Callback called when endpoint stall is cleared.
124
  * Callback called when endpoint stall is cleared.
125
  */
125
  */
126
-typedef void (*udd_callback_halt_cleared_t) (void);
126
+typedef void (*udd_callback_halt_cleared_t)(void);
127
 
127
 
128
 /**
128
 /**
129
  * \brief End of transfer callback function type.
129
  * \brief End of transfer callback function type.

+ 5
- 5
Marlin/src/HAL/HAL_DUE/usb/udi.h View File

82
 	 *
82
 	 *
83
 	 * \return \c 1 if function was successfully done, otherwise \c 0.
83
 	 * \return \c 1 if function was successfully done, otherwise \c 0.
84
 	 */
84
 	 */
85
-	bool(*enable) (void);
85
+	bool (*enable)(void);
86
 
86
 
87
 	/**
87
 	/**
88
 	 * \brief Disable the interface.
88
 	 * \brief Disable the interface.
95
 	 * - the device is detached from the host (i.e. Vbus is no
95
 	 * - the device is detached from the host (i.e. Vbus is no
96
 	 *   longer present)
96
 	 *   longer present)
97
 	 */
97
 	 */
98
-	void (*disable) (void);
98
+	void (*disable)(void);
99
 
99
 
100
 	/**
100
 	/**
101
 	 * \brief Handle a control request directed at an interface.
101
 	 * \brief Handle a control request directed at an interface.
108
 	 *
108
 	 *
109
 	 * \return \c 1 if this interface supports the SETUP request, otherwise \c 0.
109
 	 * \return \c 1 if this interface supports the SETUP request, otherwise \c 0.
110
 	 */
110
 	 */
111
-	bool(*setup) (void);
111
+	bool (*setup)(void);
112
 
112
 
113
 	/**
113
 	/**
114
 	 * \brief Returns the current setting of the selected interface.
114
 	 * \brief Returns the current setting of the selected interface.
117
 	 *
117
 	 *
118
 	 * \return alternate setting of selected interface
118
 	 * \return alternate setting of selected interface
119
 	 */
119
 	 */
120
-	uint8_t(*getsetting) (void);
120
+	uint8_t (*getsetting)(void);
121
 
121
 
122
 	/**
122
 	/**
123
 	 * \brief To signal that a SOF is occurred
123
 	 * \brief To signal that a SOF is occurred
124
 	 */
124
 	 */
125
-	void(*sof_notify) (void);
125
+	void (*sof_notify)(void);
126
 } udi_api_t;
126
 } udi_api_t;
127
 
127
 
128
 //@}
128
 //@}

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/HAL.h View File

85
 // ------------------------
85
 // ------------------------
86
 
86
 
87
 // clear reset reason
87
 // clear reset reason
88
-void HAL_clear_reset_source (void);
88
+void HAL_clear_reset_source(void);
89
 
89
 
90
 // reset reason
90
 // reset reason
91
 uint8_t HAL_get_reset_source(void);
91
 uint8_t HAL_get_reset_source(void);

+ 1
- 1
Marlin/src/HAL/HAL_STM32/HAL.h View File

150
 void HAL_init(void);
150
 void HAL_init(void);
151
 
151
 
152
 // Clear reset reason
152
 // Clear reset reason
153
-void HAL_clear_reset_source (void);
153
+void HAL_clear_reset_source(void);
154
 
154
 
155
 // Reset reason
155
 // Reset reason
156
 uint8_t HAL_get_reset_source(void);
156
 uint8_t HAL_get_reset_source(void);

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/sdio.cpp View File

107
   dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
107
   dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
108
 
108
 
109
   if (SDIO->STA & SDIO_STA_RXDAVL) {
109
   if (SDIO->STA & SDIO_STA_RXDAVL) {
110
-    while (SDIO->STA & SDIO_STA_RXDAVL) (void) SDIO->FIFO;
110
+    while (SDIO->STA & SDIO_STA_RXDAVL) (void)SDIO->FIFO;
111
     SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
111
     SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
112
     return false;
112
     return false;
113
   }
113
   }

+ 1
- 1
Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h View File

153
 inline void HAL_init(void) { }
153
 inline void HAL_init(void) { }
154
 
154
 
155
 // Clear reset reason
155
 // Clear reset reason
156
-void HAL_clear_reset_source (void);
156
+void HAL_clear_reset_source(void);
157
 
157
 
158
 // Reset reason
158
 // Reset reason
159
 uint8_t HAL_get_reset_source(void);
159
 uint8_t HAL_get_reset_source(void);

+ 2
- 2
Marlin/src/Marlin.cpp View File

814
       #endif
814
       #endif
815
     }
815
     }
816
 
816
 
817
-    void(*resetFunc)(void) = 0; // Declare resetFunc() at address 0
818
-    resetFunc();                // Jump to address 0
817
+    void (*resetFunc)(void) = 0;  // Declare resetFunc() at address 0
818
+    resetFunc();                  // Jump to address 0
819
 
819
 
820
   #else // !HAS_KILL
820
   #else // !HAS_KILL
821
 
821
 

+ 7
- 7
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.cpp View File

29
 using namespace FTDI;
29
 using namespace FTDI;
30
 using namespace FTDI::SPI;
30
 using namespace FTDI::SPI;
31
 
31
 
32
-void CLCD::enable (void) {
32
+void CLCD::enable(void) {
33
   mem_write_8(REG::PCLK, Pclk);
33
   mem_write_8(REG::PCLK, Pclk);
34
 }
34
 }
35
 
35
 
36
-void CLCD::disable (void) {
36
+void CLCD::disable(void) {
37
   mem_write_8(REG::PCLK, 0x00);
37
   mem_write_8(REG::PCLK, 0x00);
38
 }
38
 }
39
 
39
 
40
-void CLCD::set_brightness (uint8_t brightness) {
40
+void CLCD::set_brightness(uint8_t brightness) {
41
   mem_write_8(REG::PWM_DUTY, min(128,brightness));
41
   mem_write_8(REG::PWM_DUTY, min(128,brightness));
42
 }
42
 }
43
 
43
 
45
   return mem_read_8(REG::PWM_DUTY);
45
   return mem_read_8(REG::PWM_DUTY);
46
 }
46
 }
47
 
47
 
48
-void CLCD::turn_on_backlight (void) {
48
+void CLCD::turn_on_backlight(void) {
49
   mem_write_8(REG::PWM_DUTY, 128);
49
   mem_write_8(REG::PWM_DUTY, 128);
50
 }
50
 }
51
 
51
 
1042
 
1042
 
1043
 // CO_PROCESSOR COMMANDS
1043
 // CO_PROCESSOR COMMANDS
1044
 
1044
 
1045
-void CLCD::CommandFifo::str (const char * data) {
1045
+void CLCD::CommandFifo::str(const char * data) {
1046
   write(data, strlen(data)+1);
1046
   write(data, strlen(data)+1);
1047
 }
1047
 }
1048
 
1048
 
1049
-void CLCD::CommandFifo::str (progmem_str data) {
1049
+void CLCD::CommandFifo::str(progmem_str data) {
1050
   write(data, strlen_P((const char*)data)+1);
1050
   write(data, strlen_P((const char*)data)+1);
1051
 }
1051
 }
1052
 
1052
 
1053
 /******************* LCD INITIALIZATION ************************/
1053
 /******************* LCD INITIALIZATION ************************/
1054
 
1054
 
1055
-void CLCD::init (void) {
1055
+void CLCD::init(void) {
1056
   spi_init();                                  // Set Up I/O Lines for SPI and FT800/810 Control
1056
   spi_init();                                  // Set Up I/O Lines for SPI and FT800/810 Control
1057
   ftdi_reset();                                // Power down/up the FT8xx with the apropriate delays
1057
   ftdi_reset();                                // Power down/up the FT8xx with the apropriate delays
1058
 
1058
 

+ 7
- 7
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.h View File

124
     class CommandFifo;
124
     class CommandFifo;
125
     class FontMetrics;
125
     class FontMetrics;
126
 
126
 
127
-    static void init (void);
128
-    static void default_touch_transform (void);
129
-    static void default_display_orientation (void);
130
-    static void turn_on_backlight (void);
131
-    static void enable (void);
132
-    static void disable (void);
127
+    static void init(void);
128
+    static void default_touch_transform(void);
129
+    static void default_display_orientation(void);
130
+    static void turn_on_backlight(void);
131
+    static void enable(void);
132
+    static void disable(void);
133
     static void set_brightness (uint8_t brightness);
133
     static void set_brightness (uint8_t brightness);
134
     static uint8_t get_brightness();
134
     static uint8_t get_brightness();
135
     static void host_cmd (unsigned char host_command, unsigned char byte2);
135
     static void host_cmd (unsigned char host_command, unsigned char byte2);
187
   public:
187
   public:
188
     CommandFifo() {start();}
188
     CommandFifo() {start();}
189
 
189
 
190
-    static void reset (void);
190
+    static void reset(void);
191
     static bool is_processing();
191
     static bool is_processing();
192
     static bool has_fault();
192
     static bool has_fault();
193
 
193
 

+ 11
- 28
Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.cpp View File

31
     SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
31
     SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
32
   #endif
32
   #endif
33
 
33
 
34
-  void SPI::spi_init (void) {
34
+  void SPI::spi_init(void) {
35
     SET_OUTPUT(CLCD_MOD_RESET); // Module Reset (a.k.a. PD, not SPI)
35
     SET_OUTPUT(CLCD_MOD_RESET); // Module Reset (a.k.a. PD, not SPI)
36
     WRITE(CLCD_MOD_RESET, 0); // start with module in power-down
36
     WRITE(CLCD_MOD_RESET, 0); // start with module in power-down
37
 
37
 
63
       uint8_t k;
63
       uint8_t k;
64
 
64
 
65
       noInterrupts();
65
       noInterrupts();
66
-      for(k = 0; k <8; k++) {  // Output and Read each bit of spiOutByte and spiInByte
67
-        if (spiOutByte & spiIndex) {   // Output MOSI Bit
68
-          WRITE(CLCD_SOFT_SPI_MOSI, 1);
69
-        }
70
-        else {
71
-          WRITE(CLCD_SOFT_SPI_MOSI, 0);
72
-        }
66
+      for (k = 0; k < 8; k++) {  // Output and Read each bit of spiOutByte and spiInByte
67
+        WRITE(CLCD_SOFT_SPI_MOSI, (spiOutByte & spiIndex) ? 1 : 0); // Output MOSI Bit
73
         WRITE(CLCD_SOFT_SPI_SCLK, 1);   // Pulse Clock
68
         WRITE(CLCD_SOFT_SPI_SCLK, 1);   // Pulse Clock
74
         WRITE(CLCD_SOFT_SPI_SCLK, 0);
69
         WRITE(CLCD_SOFT_SPI_SCLK, 0);
75
-
76
-        if (READ(CLCD_SOFT_SPI_MISO)) {
77
-          spiInByte |= spiIndex;
78
-        }
79
-
70
+        if (READ(CLCD_SOFT_SPI_MISO)) spiInByte |= spiIndex;
80
         spiIndex >>= 1;
71
         spiIndex >>= 1;
81
       }
72
       }
82
       interrupts();
73
       interrupts();
86
 
77
 
87
   #ifdef CLCD_USE_SOFT_SPI
78
   #ifdef CLCD_USE_SOFT_SPI
88
     void SPI::_soft_spi_send (uint8_t spiOutByte) {
79
     void SPI::_soft_spi_send (uint8_t spiOutByte) {
89
-      uint8_t spiIndex  = 0x80;
90
-      uint8_t k;
80
+      uint8_t k, spiIndex  = 0x80;
91
 
81
 
92
       noInterrupts();
82
       noInterrupts();
93
-      for(k = 0; k <8; k++) {         // Output each bit of spiOutByte
94
-        if (spiOutByte & spiIndex) {   // Output MOSI Bit
95
-          WRITE(CLCD_SOFT_SPI_MOSI, 1);
96
-        }
97
-        else {
98
-          WRITE(CLCD_SOFT_SPI_MOSI, 0);
99
-        }
83
+      for (k = 0; k < 8; k++) {         // Output each bit of spiOutByte
84
+        WRITE(CLCD_SOFT_SPI_MOSI, (spiOutByte & spiIndex) ? 1 : 0); // Output MOSI Bit
100
         WRITE(CLCD_SOFT_SPI_SCLK, 1);   // Pulse Clock
85
         WRITE(CLCD_SOFT_SPI_SCLK, 1);   // Pulse Clock
101
         WRITE(CLCD_SOFT_SPI_SCLK, 0);
86
         WRITE(CLCD_SOFT_SPI_SCLK, 0);
102
-
103
         spiIndex >>= 1;
87
         spiIndex >>= 1;
104
       }
88
       }
105
       interrupts();
89
       interrupts();
122
   }
106
   }
123
 
107
 
124
   // CLCD SPI - Chip Select
108
   // CLCD SPI - Chip Select
125
-  void SPI::spi_ftdi_select (void) {
109
+  void SPI::spi_ftdi_select(void) {
126
     #ifndef CLCD_USE_SOFT_SPI
110
     #ifndef CLCD_USE_SOFT_SPI
127
       ::SPI.beginTransaction(spi_settings);
111
       ::SPI.beginTransaction(spi_settings);
128
     #endif
112
     #endif
131
   }
115
   }
132
 
116
 
133
   // CLCD SPI - Chip Deselect
117
   // CLCD SPI - Chip Deselect
134
-  void SPI::spi_ftdi_deselect (void) {
118
+  void SPI::spi_ftdi_deselect(void) {
135
     WRITE(CLCD_SPI_CS, 1);
119
     WRITE(CLCD_SPI_CS, 1);
136
     #ifndef CLCD_USE_SOFT_SPI
120
     #ifndef CLCD_USE_SOFT_SPI
137
       ::SPI.endTransaction();
121
       ::SPI.endTransaction();
158
   #endif
142
   #endif
159
 
143
 
160
   // Not really a SPI signal...
144
   // Not really a SPI signal...
161
-  void SPI::ftdi_reset (void) {
145
+  void SPI::ftdi_reset(void) {
162
     WRITE(CLCD_MOD_RESET, 0);
146
     WRITE(CLCD_MOD_RESET, 0);
163
     delay(6); /* minimum time for power-down is 5ms */
147
     delay(6); /* minimum time for power-down is 5ms */
164
     WRITE(CLCD_MOD_RESET, 1);
148
     WRITE(CLCD_MOD_RESET, 1);
166
   }
150
   }
167
 
151
 
168
   // Not really a SPI signal...
152
   // Not really a SPI signal...
169
-  void SPI::test_pulse(void)
170
-  {
153
+  void SPI::test_pulse(void) {
171
     #ifdef CLCD_AUX_0
154
     #ifdef CLCD_AUX_0
172
       WRITE(CLCD_AUX_0, 1);
155
       WRITE(CLCD_AUX_0, 1);
173
       delayMicroseconds(10);
156
       delayMicroseconds(10);

+ 1
- 2
buildroot/share/PlatformIO/variants/BIGTREE_GENERIC_STM32F407_5X/variant.cpp View File

205
   * @param  None
205
   * @param  None
206
   * @retval None
206
   * @retval None
207
   */
207
   */
208
-WEAK void SystemClock_Config(void)
209
-{
208
+WEAK void SystemClock_Config(void) {
210
 
209
 
211
   RCC_OscInitTypeDef RCC_OscInitStruct;
210
   RCC_OscInitTypeDef RCC_OscInitStruct;
212
   RCC_ClkInitTypeDef RCC_ClkInitStruct;
211
   RCC_ClkInitTypeDef RCC_ClkInitStruct;

+ 1
- 2
buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp View File

109
   * @param  None
109
   * @param  None
110
   * @retval None
110
   * @retval None
111
   */
111
   */
112
-WEAK void SystemClock_Config(void)
113
-{
112
+WEAK void SystemClock_Config(void) {
114
 
113
 
115
   RCC_OscInitTypeDef RCC_OscInitStruct;
114
   RCC_OscInitTypeDef RCC_OscInitStruct;
116
   RCC_ClkInitTypeDef RCC_ClkInitStruct;
115
   RCC_ClkInitTypeDef RCC_ClkInitStruct;

Loading…
Cancel
Save