ソースを参照

Tweak some formatting, replace tabs

Scott Lahteine 6年前
コミット
8f9b246d0e

+ 20
- 18
Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp ファイルの表示

@@ -26,10 +26,11 @@
26 26
  * Communication interface for FSMC
27 27
  */
28 28
 
29
+#if defined(STM32F1) || defined(STM32F1xx)
30
+
29 31
 #include "../../inc/MarlinConfig.h"
30 32
 
31 33
 #if HAS_GRAPHICAL_LCD
32
-#if defined(STM32F1) || defined(STM32F1xx)
33 34
 
34 35
 #include "U8glib.h"
35 36
 #include "libmaple/fsmc.h"
@@ -227,29 +228,30 @@ void LCD_IO_Init(uint8_t cs, uint8_t rs) {
227 228
 }
228 229
 
229 230
 void LCD_IO_WriteData(uint16_t RegValue) {
230
-	LCD->RAM = RegValue;
231
-	__DSB();
231
+  LCD->RAM = RegValue;
232
+  __DSB();
232 233
 }
233 234
 
234 235
 void LCD_IO_WriteReg(uint8_t Reg) {
235
-	LCD->REG = (uint16_t)Reg;
236
-	__DSB();
236
+  LCD->REG = (uint16_t)Reg;
237
+  __DSB();
237 238
 }
238 239
 
239 240
 uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
240
-	volatile uint32_t data;
241
-	LCD->REG = (uint16_t)RegValue;
242
-	__DSB();
243
-
244
-	data = LCD->RAM; // dummy read
245
-	data = LCD->RAM & 0x00FF;
246
-
247
-	while (--ReadSize) {
248
-		data <<= 8;
249
-		data |= (LCD->RAM & 0x00FF);
250
-	}
251
-	return (uint32_t)data;
241
+  volatile uint32_t data;
242
+  LCD->REG = (uint16_t)RegValue;
243
+  __DSB();
244
+
245
+  data = LCD->RAM; // dummy read
246
+  data = LCD->RAM & 0x00FF;
247
+
248
+  while (--ReadSize) {
249
+    data <<= 8;
250
+    data |= (LCD->RAM & 0x00FF);
251
+  }
252
+  return (uint32_t)data;
252 253
 }
253 254
 
254
-#endif // STM32F1 || STM32F1xx
255 255
 #endif // HAS_GRAPHICAL_LCD
256
+
257
+#endif // STM32F1 || STM32F1xx

+ 1
- 1
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp ファイルの表示

@@ -117,7 +117,7 @@ void GcodeSuite::M25() {
117 117
 
118 118
   // Set initial pause flag to prevent more commands from landing in the queue while we try to pause
119 119
   #if ENABLED(SDSUPPORT)
120
-    if (IS_SD_PRINTING()) { card.pauseSDPrint(); }
120
+    if (IS_SD_PRINTING()) card.pauseSDPrint();
121 121
   #endif
122 122
 
123 123
   #if ENABLED(PARK_HEAD_ON_PAUSE)

読み込み中…
キャンセル
保存