MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #8341 from Bob-the-Kuhn/u8g-try-4-Arduino-IDE-compatibility

Browse Source 
2.0.x - U8G HAL LCD support - Arduino IDE compatibility
This commit is contained in:
Bob-the-Kuhn 2017-11-08 21:15:50 -06:00 committed by GitHub
commit 10896b9431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp
View File

@ -64,7 +64,7 @@
// #include "src/core/macros.h" // #include "src/core/macros.h"
// #include "Configuration.h" // #include "Configuration.h"
#include <lib/u8g.h> #include <U8glib.h>
#define SPI_FULL_SPEED 0 #define SPI_FULL_SPEED 0
#define SPI_HALF_SPEED 1 #define SPI_HALF_SPEED 1

2
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
View File

@ -77,7 +77,7 @@
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include <lib/u8g.h> #include <U8glib.h>
#define I2C_SLA (0x3c*2) #define I2C_SLA (0x3c*2)
//#define I2C_CMD_MODE 0x080 //#define I2C_CMD_MODE 0x080

2
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_sw_i2c.cpp under construction
View File

@ -64,7 +64,7 @@
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include <lib/u8g.h> #include <U8glib.h>
void delayMicroseconds(uint32_t us); void delayMicroseconds(uint32_t us);
//void pinMode(int16_t pin, uint8_t mode); //void pinMode(int16_t pin, uint8_t mode);

2
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
View File

@ -62,7 +62,7 @@
// #include "src/core/macros.h" // #include "src/core/macros.h"
// #include "Configuration.h" // #include "Configuration.h"
#include <lib/u8g.h> #include <U8glib.h>
#define SPI_FULL_SPEED 0 #define SPI_FULL_SPEED 0
#define SPI_HALF_SPEED 1 #define SPI_HALF_SPEED 1

2
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
View File

@ -57,7 +57,7 @@
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include <lib/u8g.h> #include <U8glib.h>
#include <lpc17xx_pinsel.h> #include <lpc17xx_pinsel.h>

1
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp
View File

@ -60,7 +60,6 @@
#if defined (TARGET_LPC1768) #if defined (TARGET_LPC1768)
#include <lib/u8g.h>
#include <U8glib.h> #include <U8glib.h>
#include <lpc17xx_pinsel.h> #include <lpc17xx_pinsel.h>

14
Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
View File

@ -69,8 +69,8 @@
* beginning. * beginning.
*/ */
#include <lib/u8g.h> #include <U8glib.h>
#include <src/lcd/dogm/HAL_LCD_com_defines.h> #include "HAL_LCD_com_defines.h"
#define WIDTH 128 #define WIDTH 128
#define HEIGHT 64 #define HEIGHT 64
@ -150,11 +150,6 @@ uint8_t u8g_dev_sh1106_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t m
} }
uint8_t u8g_dev_sh1106_128x64_2x_buf[WIDTH*2] U8G_NOCOMMON ;
u8g_pb_t u8g_dev_sh1106_128x64_2x_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_sh1106_128x64_2x_buf};
u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c = { u8g_dev_sh1106_128x64_2x_2_wire_fn, &u8g_dev_sh1106_128x64_2x_pb, U8G_COM_SSD_I2C_HAL };
uint8_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf[WIDTH*2] U8G_NOCOMMON ; uint8_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf[WIDTH*2] U8G_NOCOMMON ;
u8g_pb_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf}; u8g_pb_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf};
u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire = { u8g_dev_sh1106_128x64_2x_2_wire_fn, &u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb, U8G_COM_SSD_I2C_HAL }; u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire = { u8g_dev_sh1106_128x64_2x_2_wire_fn, &u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb, U8G_COM_SSD_I2C_HAL };
@ -229,11 +224,6 @@ uint8_t u8g_dev_ssd1306_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t
} }
uint8_t u8g_dev_ssd1306_128x64_2x_buf[WIDTH*2] U8G_NOCOMMON ;
u8g_pb_t u8g_dev_ssd1306_128x64_2x_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_ssd1306_128x64_2x_buf};
u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c = { u8g_dev_ssd1306_128x64_2x_2_wire_fn, &u8g_dev_ssd1306_128x64_2x_pb, U8G_COM_SSD_I2C_HAL };
uint8_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf[WIDTH*2] U8G_NOCOMMON ; uint8_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf[WIDTH*2] U8G_NOCOMMON ;
u8g_pb_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf}; u8g_pb_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf};
u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire = { u8g_dev_ssd1306_128x64_2x_2_wire_fn, &u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb, U8G_COM_SSD_I2C_HAL }; u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire = { u8g_dev_ssd1306_128x64_2x_2_wire_fn, &u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb, U8G_COM_SSD_I2C_HAL };

4
Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
View File

@ -57,9 +57,9 @@
*/ */
#include <lib/u8g.h> #include <U8glib.h>
#include <src/lcd/dogm/HAL_LCD_com_defines.h> #include "HAL_LCD_com_defines.h"
#define WIDTH 128 #define WIDTH 128
#define HEIGHT 64 #define HEIGHT 64

4
Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
View File

@ -56,9 +56,9 @@
*/ */
#include <lib/u8g.h> #include <U8glib.h>
#include <src/lcd/dogm/HAL_LCD_com_defines.h> #include "HAL_LCD_com_defines.h"
#define WIDTH 128 #define WIDTH 128
#define HEIGHT 64 #define HEIGHT 64

2
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
View File

@ -25,7 +25,7 @@
#ifndef U8G_HAL_LINKS #ifndef U8G_HAL_LINKS
#include <src/Marlin.h> #include "../../Marlin.h"
//#if ENABLED(U8GLIB_ST7920) //#if ENABLED(U8GLIB_ST7920)
//#if ( ENABLED(SHARED_SPI) || !ENABLED(SHARED_SPI) && (defined(LCD_PINS_D4) && LCD_PINS_D4 >= 0) && (defined(LCD_PINS_ENABLE) && LCD_PINS_ENABLE >= 0)) //#if ( ENABLED(SHARED_SPI) || !ENABLED(SHARED_SPI) && (defined(LCD_PINS_D4) && LCD_PINS_D4 >= 0) && (defined(LCD_PINS_ENABLE) && LCD_PINS_ENABLE >= 0))

2
Marlin/src/lcd/ultralcd_impl_DOGM.h
View File

@ -59,7 +59,7 @@
#endif #endif
#include <U8glib.h> #include <U8glib.h>
#include <src/lcd/dogm/HAL_LCD_class_defines.h> #include "dogm/HAL_LCD_class_defines.h"
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
#include "../feature/bedlevel/ubl/ubl.h" #include "../feature/bedlevel/ubl/ubl.h"

11
platformio.ini
View File

@ -19,7 +19,7 @@ env_default = megaatmega2560
[common] [common]
lib_deps = lib_deps =
U8glib-HAL
LiquidCrystal_I2C@1.1.2 LiquidCrystal_I2C@1.1.2
https://github.com/lincomatic/LiquidTWI2.git https://github.com/lincomatic/LiquidTWI2.git
https://github.com/teemuatlut/TMC2130Stepper.git https://github.com/teemuatlut/TMC2130Stepper.git
@ -51,7 +51,6 @@ board = megaatmega2560
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
board_f_cpu = 16000000L board_f_cpu = 16000000L
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -64,7 +63,6 @@ board = megaatmega1280
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
board_f_cpu = 16000000L board_f_cpu = 16000000L
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -76,7 +74,6 @@ framework = arduino
board = sanguino_atmega1284p board = sanguino_atmega1284p
upload_speed = 57600 upload_speed = 57600
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -91,7 +88,6 @@ framework = arduino
board = due board = due
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -154,7 +150,6 @@ board = reprap_rambo
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
board_f_cpu = 16000000L board_f_cpu = 16000000L
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -165,7 +160,6 @@ platform = atmelavr
framework = arduino framework = arduino
board = sanguino_atmega644p board = sanguino_atmega644p
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
[env:STM32F1] [env:STM32F1]
@ -174,7 +168,6 @@ framework = arduino
board = genericSTM32F103RE board = genericSTM32F103RE
build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -191,7 +184,6 @@ board = teensy20pp
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
#board_f_cpu = 20000000L ; Bug in Arduino framework disallows boards running at 20Mhz #board_f_cpu = 20000000L ; Bug in Arduino framework disallows boards running at 20Mhz
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
# #
@ -203,6 +195,5 @@ framework = arduino
board = teensy35 board = teensy35
build_flags = -I $BUILDSRC_DIR build_flags = -I $BUILDSRC_DIR
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
U8glib-HAL
lib_ignore = Adafruit NeoPixel lib_ignore = Adafruit NeoPixel
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}