Browse Source

General cleanup

Scott Lahteine 4 years ago
parent
commit
fd35d1b8a6

+ 1
- 1
Marlin/src/feature/bedlevel/abl/abl.cpp View File

168
       // cancelled out in bed_level_virt_cmr and does not impact the result. Return 0.0 rather than
168
       // cancelled out in bed_level_virt_cmr and does not impact the result. Return 0.0 rather than
169
       // making this function more complex by extrapolating two points.
169
       // making this function more complex by extrapolating two points.
170
       return 0.0;
170
       return 0.0;
171
-    }    
171
+    }
172
     if (!x || x == ABL_TEMP_POINTS_X - 1) {
172
     if (!x || x == ABL_TEMP_POINTS_X - 1) {
173
       if (x) {
173
       if (x) {
174
         ep = GRID_MAX_POINTS_X - 1;
174
         ep = GRID_MAX_POINTS_X - 1;

+ 2
- 2
Marlin/src/feature/power_monitor.cpp View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/feature/power_monitor.h View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/gcode/feature/controllerfan/M710.cpp View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/gcode/feature/power_monitor/M430.cpp View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/lcd/menu/menu_power_monitor.cpp View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 1
- 1
Marlin/src/pins/ramps/pins_RAMPS_S_12.h View File

263
   #ifndef SD_DETECT_PIN
263
   #ifndef SD_DETECT_PIN
264
     #define SD_DETECT_PIN                     38
264
     #define SD_DETECT_PIN                     38
265
   #endif
265
   #endif
266
-  
266
+
267
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
267
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
268
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
268
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
269
   #endif
269
   #endif

+ 2
- 2
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h View File

243
 #endif
243
 #endif
244
 
244
 
245
 // Use the on-board card socket labeled SD_Extender
245
 // Use the on-board card socket labeled SD_Extender
246
-#if SD_CONNECTION_IS(CUSTOM_CABLE) 
246
+#if SD_CONNECTION_IS(CUSTOM_CABLE)
247
   #define SCK_PIN                           PC12
247
   #define SCK_PIN                           PC12
248
   #define MISO_PIN                          PC8
248
   #define MISO_PIN                          PC8
249
   #define MOSI_PIN                          PD2
249
   #define MOSI_PIN                          PD2
300
   #define FSMC_DMA_CHANNEL               DMA_CH5
300
   #define FSMC_DMA_CHANNEL               DMA_CH5
301
 
301
 
302
   #define TFT_BUFFER_SIZE                  14400
302
   #define TFT_BUFFER_SIZE                  14400
303
-  #if ENABLED(TFT_CLASSIC_UI)  
303
+  #if ENABLED(TFT_CLASSIC_UI)
304
     #define TFT_MARLINBG_COLOR            0x3186  // White
304
     #define TFT_MARLINBG_COLOR            0x3186  // White
305
     #define TFT_MARLINUI_COLOR            0xC7B6  // green
305
     #define TFT_MARLINUI_COLOR            0xC7B6  // green
306
     #define TFT_BTARROWS_COLOR            0xDEE6  // Yellow
306
     #define TFT_BTARROWS_COLOR            0xDEE6  // Yellow

Loading…
Cancel
Save