SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up some trailing white-space

Browse source
This commit is contained in:
Scott Lahteine 2017-11-10 02:28:53 -06:00
parent 2f9848ede3
commit 81b91b3f9d
48 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/default/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View file

@ -1714,7 +1714,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Anet/A6/Configuration.h
View file

@ -1853,7 +1853,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Anet/A8/Configuration.h
View file

@ -1702,7 +1702,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View file

@ -1689,7 +1689,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View file

@ -1685,7 +1685,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file

@ -1695,7 +1695,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View file

@ -1685,7 +1685,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Cartesio/Configuration.h
View file

@ -1693,7 +1693,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View file

@ -1704,7 +1704,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Felix/Configuration.h
View file

@ -1676,7 +1676,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Felix/DUAL/Configuration.h
View file

@ -1676,7 +1676,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View file

@ -1691,7 +1691,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

@ -1709,7 +1709,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View file

@ -1698,7 +1698,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Malyan/M150/Configuration.h
View file

@ -1722,7 +1722,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
View file

@ -1698,7 +1698,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
View file

@ -1698,7 +1698,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Mks/Sbase/Configuration.h
View file

@ -1669,7 +1669,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/RigidBot/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/SCARA/Configuration.h
View file

@ -1706,7 +1706,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/STM32F10/Configuration.h
View file

@ -1697,7 +1697,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Sanguinololu/Configuration.h
View file

@ -1725,7 +1725,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/TinyBoy2/Configuration.h
View file

@ -1750,7 +1750,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View file

@ -1695,7 +1695,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Velleman/K8200/Configuration.h
View file

@ -1729,7 +1729,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Velleman/K8400/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View file

@ -1694,7 +1694,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

@ -1828,7 +1828,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

@ -1821,7 +1821,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/delta/generic/Configuration.h
View file

@ -1816,7 +1816,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

@ -1819,7 +1819,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

@ -1819,7 +1819,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

@ -1828,7 +1828,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
View file

@ -1708,7 +1708,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .5 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/makibox/Configuration.h
View file

@ -1697,7 +1697,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View file

@ -1689,7 +1689,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/config/examples/wt150/Configuration.h
View file

@ -1699,7 +1699,7 @@
* Default extrusion settings
*
* These settings control basic extrusion from within the Marlin firmware.
*
*
*/
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
#define DEFAULT_NOZZLE_SIZE .4 // (mm) Diameter of primary nozzle. Used by G26 Mesh Validation Pattern tool.

2
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
View file

@ -57,7 +57,7 @@
#define U8G_COM_SSD_I2C_HAL u8g_com_HAL_LPC1768_ssd_hw_i2c_fn
#else // need to give them some definition or else get compiler errors
uint8_t u8g_com_null_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
uint8_t u8g_com_null_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
#define U8G_COM_HAL_SW_SPI_FN u8g_com_null_fn
#define U8G_COM_HAL_HW_SPI_FN u8g_com_null_fn
#define U8G_COM_ST7920_HAL_SW_SPI u8g_com_null_fn

2
Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
View file

@ -196,7 +196,7 @@ u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_hw_spi = { u8g_dev_st7920_128x64_HAL_4x_f
#ifdef U8G_HAL_LINKS
// Also use this device for HAL version of rrd class. This results in the same device being used
// Also use this device for HAL version of rrd class. This results in the same device being used
// for the ST7920 for HAL systems no matter what is selected in ultralcd_impl_DOGM.h.
u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_st7920_128x64_HAL_4x_fn, &u8g_dev_st7920_128x64_HAL_4x_pb, U8G_COM_ST7920_HAL_SW_SPI };
#endif

10
Marlin/src/lcd/ultralcd_impl_DOGM.h
View file

@ -166,12 +166,12 @@
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes, HW SPI
//U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 2 stripes, SW SPI
#elif ENABLED(U8GLIB_ST7920)
#elif ENABLED(U8GLIB_ST7920)
// RepRap Discount Full Graphics Smart Controller
//U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_RS); // 2 stripes, HW SPI
//U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 2 stripes, SW SPI
//U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 2 stripes, SW SPI
U8GLIB_ST7920_128X64_RRD u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
// AVR version ignores these pin settings
// AVR version ignores these pin settings
// HAL version uses these pin settings
#elif ENABLED(CARTESIO_UI)
// The CartesioUI display
@ -190,7 +190,7 @@
#elif ENABLED(U8GLIB_SSD1306)
// Generic support for SSD1306 OLED I2C LCDs
//U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes
U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
//U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
#elif ENABLED(MKS_12864OLED)
@ -200,7 +200,7 @@
#elif ENABLED(U8GLIB_SH1106)
// Generic support for SH1106 OLED I2C LCDs
//U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 8 stripes
U8GLIB_SH1106_128X64_2X_I2C_2_WIRE u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
U8GLIB_SH1106_128X64_2X_I2C_2_WIRE u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
//U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
#elif ENABLED(MINIPANEL)
// The MINIPanel display

2
Marlin/src/pins/pins_RURAMPS4D.h
View file

@ -55,7 +55,7 @@
#define SERVO0_PIN 5
#define SERVO1_PIN 3
#define SERVO2_PIN -1
#define SERVO3_PIN 1
#define SERVO3_PIN 1
//
// Limit Switches

2
platformio.ini
View file

@ -26,7 +26,7 @@ lib_deps =
https://github.com/trinamic/TMC26XStepper.git
https://github.com/adafruit/Adafruit_NeoPixel.git
https://github.com/ameyer/Arduino-L6470.git
default_src_filter = +<src/*> -<src/config>