From a037ddbf7b72bd4cd594f78bf313642f4eaafa6d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 24 Aug 2017 12:19:06 -0500 Subject: [PATCH] Other spacing tweaks --- Marlin/dac_dac084s085.cpp | 8 ++++---- Marlin/stepper.cpp | 42 +++++++++++++++++++-------------------- Marlin/twibus.cpp | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Marlin/dac_dac084s085.cpp b/Marlin/dac_dac084s085.cpp index bca359821..b1dacdec6 100644 --- a/Marlin/dac_dac084s085.cpp +++ b/Marlin/dac_dac084s085.cpp @@ -17,10 +17,10 @@ uint8_t externalDac_buf[2] = {0x20,0x00};//all off // All SPI chip-select HIGH - pinMode (DAC0_SYNC, OUTPUT); + pinMode(DAC0_SYNC, OUTPUT); digitalWrite( DAC0_SYNC , HIGH ); #if EXTRUDERS > 1 - pinMode (DAC1_SYNC, OUTPUT); + pinMode(DAC1_SYNC, OUTPUT); digitalWrite( DAC1_SYNC , HIGH ); #endif digitalWrite( SPI_EEPROM1_CS , HIGH ); @@ -68,8 +68,8 @@ else externalDac_buf[0] |= (3 - channel << 6); - externalDac_buf[0] |= (value>>4); - externalDac_buf[1] |= (value<<4); + externalDac_buf[0] |= (value >> 4); + externalDac_buf[1] |= (value << 4); // All SPI chip-select HIGH digitalWrite( DAC0_SYNC , HIGH ); diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 1a68f7f2f..e95ffa3cb 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -1136,27 +1136,27 @@ void Stepper::init() { E_AXIS_INIT(4); #endif -#ifdef ARDUINO_ARCH_AVR - // waveform generation = 0100 = CTC - SET_WGM(1, CTC_OCRnA); - - // output mode = 00 (disconnected) - SET_COMA(1, NORMAL); - - // Set the timer pre-scaler - // Generally we use a divider of 8, resulting in a 2MHz timer - // frequency on a 16MHz MCU. If you are going to change this, be - // sure to regenerate speed_lookuptable.h with - // create_speed_lookuptable.py - SET_CS(1, PRESCALER_8); // CS 2 = 1/8 prescaler - - // Init Stepper ISR to 122 Hz for quick starting - OCR1A = 0x4000; - TCNT1 = 0; -#else - // Init Stepper ISR to 122 Hz for quick starting - HAL_timer_start(STEP_TIMER_NUM, 122); -#endif + #ifdef ARDUINO_ARCH_AVR + // waveform generation = 0100 = CTC + SET_WGM(1, CTC_OCRnA); + + // output mode = 00 (disconnected) + SET_COMA(1, NORMAL); + + // Set the timer pre-scaler + // Generally we use a divider of 8, resulting in a 2MHz timer + // frequency on a 16MHz MCU. If you are going to change this, be + // sure to regenerate speed_lookuptable.h with + // create_speed_lookuptable.py + SET_CS(1, PRESCALER_8); // CS 2 = 1/8 prescaler + + // Init Stepper ISR to 122 Hz for quick starting + OCR1A = 0x4000; + TCNT1 = 0; + #else + // Init Stepper ISR to 122 Hz for quick starting + HAL_timer_start(STEP_TIMER_NUM, 122); + #endif ENABLE_STEPPER_DRIVER_INTERRUPT(); diff --git a/Marlin/twibus.cpp b/Marlin/twibus.cpp index 4e29ef883..bd3831af9 100644 --- a/Marlin/twibus.cpp +++ b/Marlin/twibus.cpp @@ -94,7 +94,7 @@ void TWIBus::echoprefix(uint8_t bytes, const char prefix[], uint8_t adr) { serialprintPGM(prefix); SERIAL_ECHOPAIR(": from:", adr); SERIAL_ECHOPAIR(" bytes:", bytes); - SERIAL_ECHOPGM (" data:"); + SERIAL_ECHOPGM(" data:"); } // static