Browse Source

Tweak some formatting

Scott Lahteine 6 years ago
parent
commit
f2ba0a5ae7

+ 12
- 12
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp View File

739
 
739
 
740
 #endif // !USBCON && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
740
 #endif // !USBCON && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
741
 
741
 
742
+#ifdef INTERNAL_SERIAL_PORT
742
 
743
 
743
-#if defined(INTERNAL_SERIAL_PORT)
744
-
745
-    ISR(SERIAL_REGNAME(USART,INTERNAL_SERIAL_PORT,_RX_vect)) {
746
-      MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>>::store_rxd_char();
747
-    }
744
+  ISR(SERIAL_REGNAME(USART,INTERNAL_SERIAL_PORT,_RX_vect)) {
745
+    MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>>::store_rxd_char();
746
+  }
748
 
747
 
749
-    ISR(SERIAL_REGNAME(USART,INTERNAL_SERIAL_PORT,_UDRE_vect)) {
750
-      MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>>::_tx_udr_empty_irq();
751
-    }
748
+  ISR(SERIAL_REGNAME(USART,INTERNAL_SERIAL_PORT,_UDRE_vect)) {
749
+    MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>>::_tx_udr_empty_irq();
750
+  }
752
 
751
 
753
-    // Preinstantiate
754
-    template class MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>>;
752
+  // Preinstantiate
753
+  template class MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>>;
755
 
754
 
756
-    // Instantiate
757
-    MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>> internalSerial;
755
+  // Instantiate
756
+  MarlinSerial<MarlinInternalSerialCfg<INTERNAL_SERIAL_PORT>> internalSerial;
758
 
757
 
759
 #endif
758
 #endif
759
+
760
 // For AT90USB targets use the UART for BT interfacing
760
 // For AT90USB targets use the UART for BT interfacing
761
 #if defined(USBCON) && ENABLED(BLUETOOTH)
761
 #if defined(USBCON) && ENABLED(BLUETOOTH)
762
   HardwareSerial bluetoothSerial;
762
   HardwareSerial bluetoothSerial;

+ 1
- 1
Marlin/src/HAL/HAL_AVR/MarlinSerial.h View File

276
 #endif // !USBCON
276
 #endif // !USBCON
277
 
277
 
278
 
278
 
279
-#if defined(INTERNAL_SERIAL_PORT)
279
+#ifdef INTERNAL_SERIAL_PORT
280
   template <uint8_t serial>
280
   template <uint8_t serial>
281
   struct MarlinInternalSerialCfg {
281
   struct MarlinInternalSerialCfg {
282
     static constexpr int PORT               = serial;
282
     static constexpr int PORT               = serial;

+ 1
- 1
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h View File

47
   uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
47
   uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
48
   #define U8G_COM_SSD_I2C_HAL u8g_com_arduino_ssd_i2c_fn
48
   #define U8G_COM_SSD_I2C_HAL u8g_com_arduino_ssd_i2c_fn
49
 
49
 
50
-  #if defined(ARDUINO_ARCH_STM32F1)
50
+  #ifdef ARDUINO_ARCH_STM32F1
51
     uint8_t u8g_com_stm32duino_fsmc_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
51
     uint8_t u8g_com_stm32duino_fsmc_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
52
     #define U8G_COM_HAL_FSMC_FN u8g_com_stm32duino_fsmc_fn
52
     #define U8G_COM_HAL_FSMC_FN u8g_com_stm32duino_fsmc_fn
53
   #else
53
   #else

Loading…
Cancel
Save