Browse Source

Other spacing tweaks

Scott Lahteine 8 years ago
parent
commit
a037ddbf7b
3 changed files with 26 additions and 26 deletions
  1. 4
    4
      Marlin/dac_dac084s085.cpp
  2. 21
    21
      Marlin/stepper.cpp
  3. 1
    1
      Marlin/twibus.cpp

+ 4
- 4
Marlin/dac_dac084s085.cpp View File

17
     uint8_t externalDac_buf[2] = {0x20,0x00};//all off
17
     uint8_t externalDac_buf[2] = {0x20,0x00};//all off
18
 
18
 
19
     // All SPI chip-select HIGH
19
     // All SPI chip-select HIGH
20
-    pinMode (DAC0_SYNC, OUTPUT);
20
+    pinMode(DAC0_SYNC, OUTPUT);
21
     digitalWrite( DAC0_SYNC , HIGH );
21
     digitalWrite( DAC0_SYNC , HIGH );
22
     #if EXTRUDERS > 1
22
     #if EXTRUDERS > 1
23
-      pinMode (DAC1_SYNC, OUTPUT);
23
+      pinMode(DAC1_SYNC, OUTPUT);
24
       digitalWrite( DAC1_SYNC , HIGH );
24
       digitalWrite( DAC1_SYNC , HIGH );
25
     #endif
25
     #endif
26
     digitalWrite( SPI_EEPROM1_CS , HIGH );
26
     digitalWrite( SPI_EEPROM1_CS , HIGH );
68
     else
68
     else
69
       externalDac_buf[0] |= (3 - channel << 6);
69
       externalDac_buf[0] |= (3 - channel << 6);
70
 
70
 
71
-    externalDac_buf[0] |= (value>>4);
72
-    externalDac_buf[1] |= (value<<4);
71
+    externalDac_buf[0] |= (value >> 4);
72
+    externalDac_buf[1] |= (value << 4);
73
     
73
     
74
     // All SPI chip-select HIGH
74
     // All SPI chip-select HIGH
75
     digitalWrite( DAC0_SYNC , HIGH );
75
     digitalWrite( DAC0_SYNC , HIGH );

+ 21
- 21
Marlin/stepper.cpp View File

1136
     E_AXIS_INIT(4);
1136
     E_AXIS_INIT(4);
1137
   #endif
1137
   #endif
1138
 
1138
 
1139
-#ifdef ARDUINO_ARCH_AVR
1140
-  // waveform generation = 0100 = CTC
1141
-  SET_WGM(1, CTC_OCRnA);
1142
-
1143
-  // output mode = 00 (disconnected)
1144
-  SET_COMA(1, NORMAL);
1145
-
1146
-  // Set the timer pre-scaler
1147
-  // Generally we use a divider of 8, resulting in a 2MHz timer
1148
-  // frequency on a 16MHz MCU. If you are going to change this, be
1149
-  // sure to regenerate speed_lookuptable.h with
1150
-  // create_speed_lookuptable.py
1151
-  SET_CS(1, PRESCALER_8);  //  CS 2 = 1/8 prescaler
1152
-
1153
-  // Init Stepper ISR to 122 Hz for quick starting
1154
-  OCR1A = 0x4000;
1155
-  TCNT1 = 0;
1156
-#else
1157
-  // Init Stepper ISR to 122 Hz for quick starting
1158
-  HAL_timer_start(STEP_TIMER_NUM, 122);
1159
-#endif
1139
+  #ifdef ARDUINO_ARCH_AVR
1140
+    // waveform generation = 0100 = CTC
1141
+    SET_WGM(1, CTC_OCRnA);
1142
+
1143
+    // output mode = 00 (disconnected)
1144
+    SET_COMA(1, NORMAL);
1145
+
1146
+    // Set the timer pre-scaler
1147
+    // Generally we use a divider of 8, resulting in a 2MHz timer
1148
+    // frequency on a 16MHz MCU. If you are going to change this, be
1149
+    // sure to regenerate speed_lookuptable.h with
1150
+    // create_speed_lookuptable.py
1151
+    SET_CS(1, PRESCALER_8);  //  CS 2 = 1/8 prescaler
1152
+
1153
+    // Init Stepper ISR to 122 Hz for quick starting
1154
+    OCR1A = 0x4000;
1155
+    TCNT1 = 0;
1156
+  #else
1157
+    // Init Stepper ISR to 122 Hz for quick starting
1158
+    HAL_timer_start(STEP_TIMER_NUM, 122);
1159
+  #endif
1160
 
1160
 
1161
   ENABLE_STEPPER_DRIVER_INTERRUPT();
1161
   ENABLE_STEPPER_DRIVER_INTERRUPT();
1162
 
1162
 

+ 1
- 1
Marlin/twibus.cpp View File

94
   serialprintPGM(prefix);
94
   serialprintPGM(prefix);
95
   SERIAL_ECHOPAIR(": from:", adr);
95
   SERIAL_ECHOPAIR(": from:", adr);
96
   SERIAL_ECHOPAIR(" bytes:", bytes);
96
   SERIAL_ECHOPAIR(" bytes:", bytes);
97
-  SERIAL_ECHOPGM (" data:");
97
+  SERIAL_ECHOPGM(" data:");
98
 }
98
 }
99
 
99
 
100
 // static
100
 // static

Loading…
Cancel
Save