Formatting

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

@@ -29,15 +29,15 @@
 using namespace FTDI;
 using namespace FTDI::SPI;
 
-void CLCD::enable (void) {
+void CLCD::enable(void) {
   mem_write_8(REG::PCLK, Pclk);
 }
 
-void CLCD::disable (void) {
+void CLCD::disable(void) {
   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));
 }
 
@@ -45,7 +45,7 @@ uint8_t CLCD::get_brightness() {
   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);
 }
 
@@ -1042,17 +1042,17 @@ template bool CLCD::CommandFifo::write(progmem_str, uint16_t);
 
 // CO_PROCESSOR COMMANDS
 
-void CLCD::CommandFifo::str (const char * data) {
+void CLCD::CommandFifo::str(const char * data) {
   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);
 }
 
 /******************* LCD INITIALIZATION ************************/
 
-void CLCD::init (void) {
+void CLCD::init(void) {
   spi_init();                                  // Set Up I/O Lines for SPI and FT800/810 Control
   ftdi_reset();                                // Power down/up the FT8xx with the apropriate delays
 

Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/commands.h

@@ -124,12 +124,12 @@ class CLCD {
     class CommandFifo;
     class FontMetrics;
 
-    static void init (void);
-    static void default_touch_transform (void);
-    static void default_display_orientation (void);
-    static void turn_on_backlight (void);
-    static void enable (void);
-    static void disable (void);
+    static void init(void);
+    static void default_touch_transform(void);
+    static void default_display_orientation(void);
+    static void turn_on_backlight(void);
+    static void enable(void);
+    static void disable(void);
     static void set_brightness (uint8_t brightness);
     static uint8_t get_brightness();
     static void host_cmd (unsigned char host_command, unsigned char byte2);
@@ -187,7 +187,7 @@ class CLCD::CommandFifo {
   public:
     CommandFifo() {start();}
 
-    static void reset (void);
+    static void reset(void);
     static bool is_processing();
     static bool has_fault();
 

Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/basic/spi.cpp

@@ -31,7 +31,7 @@ namespace FTDI {
     SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
   #endif
 
-  void SPI::spi_init (void) {
+  void SPI::spi_init(void) {
     SET_OUTPUT(CLCD_MOD_RESET); // Module Reset (a.k.a. PD, not SPI)
     WRITE(CLCD_MOD_RESET, 0); // start with module in power-down
 
@@ -63,20 +63,11 @@ namespace FTDI {
       uint8_t k;
 
       noInterrupts();
-      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, 1);
-        }
-        else {
-          WRITE(CLCD_SOFT_SPI_MOSI, 0);
-        }
+      for (k = 0; k < 8; k++) {  // Output and Read each bit of spiOutByte and spiInByte
+        WRITE(CLCD_SOFT_SPI_MOSI, (spiOutByte & spiIndex) ? 1 : 0); // Output MOSI Bit
         WRITE(CLCD_SOFT_SPI_SCLK, 1);   // Pulse Clock
         WRITE(CLCD_SOFT_SPI_SCLK, 0);
-
-        if (READ(CLCD_SOFT_SPI_MISO)) {
-          spiInByte |= spiIndex;
-        }
-
+        if (READ(CLCD_SOFT_SPI_MISO)) spiInByte |= spiIndex;
         spiIndex >>= 1;
       }
       interrupts();
@@ -86,20 +77,13 @@ namespace FTDI {
 
   #ifdef CLCD_USE_SOFT_SPI
     void SPI::_soft_spi_send (uint8_t spiOutByte) {
-      uint8_t spiIndex  = 0x80;
-      uint8_t k;
+      uint8_t k, spiIndex  = 0x80;
 
       noInterrupts();
-      for(k = 0; k <8; k++) {         // Output each bit of spiOutByte
-        if (spiOutByte & spiIndex) {   // Output MOSI Bit
-          WRITE(CLCD_SOFT_SPI_MOSI, 1);
-        }
-        else {
-          WRITE(CLCD_SOFT_SPI_MOSI, 0);
-        }
+      for (k = 0; k < 8; k++) {         // Output each bit of spiOutByte
+        WRITE(CLCD_SOFT_SPI_MOSI, (spiOutByte & spiIndex) ? 1 : 0); // Output MOSI Bit
         WRITE(CLCD_SOFT_SPI_SCLK, 1);   // Pulse Clock
         WRITE(CLCD_SOFT_SPI_SCLK, 0);
-
         spiIndex >>= 1;
       }
       interrupts();
@@ -122,7 +106,7 @@ namespace FTDI {
   }
 
   // CLCD SPI - Chip Select
-  void SPI::spi_ftdi_select (void) {
+  void SPI::spi_ftdi_select(void) {
     #ifndef CLCD_USE_SOFT_SPI
       ::SPI.beginTransaction(spi_settings);
     #endif
@@ -131,7 +115,7 @@ namespace FTDI {
   }
 
   // CLCD SPI - Chip Deselect
-  void SPI::spi_ftdi_deselect (void) {
+  void SPI::spi_ftdi_deselect(void) {
     WRITE(CLCD_SPI_CS, 1);
     #ifndef CLCD_USE_SOFT_SPI
       ::SPI.endTransaction();
@@ -158,7 +142,7 @@ namespace FTDI {
   #endif
 
   // Not really a SPI signal...
-  void SPI::ftdi_reset (void) {
+  void SPI::ftdi_reset(void) {
     WRITE(CLCD_MOD_RESET, 0);
     delay(6); /* minimum time for power-down is 5ms */
     WRITE(CLCD_MOD_RESET, 1);
@@ -166,8 +150,7 @@ namespace FTDI {
   }
 
   // Not really a SPI signal...
-  void SPI::test_pulse(void)
-  {
+  void SPI::test_pulse(void) {
     #ifdef CLCD_AUX_0
       WRITE(CLCD_AUX_0, 1);
       delayMicroseconds(10);