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

📌 Require U8glib-HAL@~0.5.0 (#22324)

Browse Source
This commit is contained in:
Scott Lahteine 2021-07-09 16:02:27 -05:00 committed by Scott Lahteine
parent e9a1c10b34
commit 69b44c2309
55 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
View File

@ -62,7 +62,7 @@
#include "../shared/Marduino.h" #include "../shared/Marduino.h"
#include "../shared/Delay.h" #include "../shared/Delay.h"
#include <U8glib.h> #include <U8glib-HAL.h>
uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock; uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock;
volatile uint8_t *u8g_outData, *u8g_outClock; volatile uint8_t *u8g_outData, *u8g_outClock;

2
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
View File

@ -60,7 +60,7 @@
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
#include <U8glib.h> #include <U8glib-HAL.h>
#include "../../../MarlinCore.h" #include "../../../MarlinCore.h"

2
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
View File

@ -62,7 +62,7 @@
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#include "../../shared/Delay.h" #include "../../shared/Delay.h"
#include <U8glib.h> #include <U8glib-HAL.h>
#include "u8g_com_HAL_DUE_sw_spi_shared.h" #include "u8g_com_HAL_DUE_sw_spi_shared.h"

2
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
View File

@ -64,7 +64,7 @@
#include "../../shared/Marduino.h" #include "../../shared/Marduino.h"
#include "../../shared/Delay.h" #include "../../shared/Delay.h"
#include <U8glib.h> #include <U8glib-HAL.h>
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_3 #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_3

2
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
View File

@ -62,7 +62,7 @@
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#include "../../shared/Delay.h" #include "../../shared/Delay.h"
#include <U8glib.h> #include <U8glib-HAL.h>
#include "u8g_com_HAL_DUE_sw_spi_shared.h" #include "u8g_com_HAL_DUE_sw_spi_shared.h"

2
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
View File

@ -23,7 +23,7 @@
#include "../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#include "../../shared/Marduino.h" #include "../../shared/Marduino.h"
#include <U8glib.h> #include <U8glib-HAL.h>
void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index); void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index);
void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level); void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level);

2
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
View File

@ -59,7 +59,7 @@
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
#include <U8glib.h> #include <U8glib-HAL.h>
#include "../../shared/HAL_SPI.h" #include "../../shared/HAL_SPI.h"
#ifndef LCD_SPI_SPEED #ifndef LCD_SPI_SPEED

2
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
View File

@ -79,7 +79,7 @@
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
#include <U8glib.h> #include <U8glib-HAL.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/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
View File

@ -59,7 +59,7 @@
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
#include <U8glib.h> #include <U8glib-HAL.h>
#include "../../shared/HAL_SPI.h" #include "../../shared/HAL_SPI.h"
#include "../../shared/Delay.h" #include "../../shared/Delay.h"

2
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
View File

@ -59,7 +59,7 @@
#if ENABLED(U8GLIB_ST7920) #if ENABLED(U8GLIB_ST7920)
#include <U8glib.h> #include <U8glib-HAL.h>
#include <SoftwareSPI.h> #include <SoftwareSPI.h>
#include "../../shared/Delay.h" #include "../../shared/Delay.h"
#include "../../shared/HAL_SPI.h" #include "../../shared/HAL_SPI.h"

2
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
View File

@ -71,7 +71,7 @@
#include <LPC17xx.h> #include <LPC17xx.h>
#include <gpio.h> #include <gpio.h>
#include <U8glib.h> #include <U8glib-HAL.h>
uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) { uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {

2
Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
View File

@ -22,7 +22,7 @@
#if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI) #if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
#include <U8glib.h> #include <U8glib-HAL.h>
#include "../../shared/HAL_SPI.h" #include "../../shared/HAL_SPI.h"
#ifndef LCD_SPI_SPEED #ifndef LCD_SPI_SPEED

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

@ -23,7 +23,7 @@
// Use this file to select the com driver for device drivers that are NOT in the U8G library // Use this file to select the com driver for device drivers that are NOT in the U8G library
#include <U8glib.h> #include <U8glib-HAL.h>
#ifndef U8G_HAL_LINKS // Defined by LPC1768/9 environments in platform.ini #ifndef U8G_HAL_LINKS // Defined by LPC1768/9 environments in platform.ini

2
Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
View File

@ -32,7 +32,7 @@
X Font ascent = 6 descent=-2 X Font ascent = 6 descent=-2
Max Font ascent = 7 descent=-2 Max Font ascent = 7 descent=-2
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t u8g_font_6x9[2434] U8G_FONT_SECTION(".progmem.u8g_font_6x9") = { const u8g_fntpgm_uint8_t u8g_font_6x9[2434] U8G_FONT_SECTION(".progmem.u8g_font_6x9") = {
0x00,0x06,0x09,0x00,0xFE,0x06,0x02,0x0F,0x03,0x84,0x01,0xFF,0xFE,0x07,0xFE,0x06, 0x00,0x06,0x09,0x00,0xFE,0x06,0x02,0x0F,0x03,0x84,0x01,0xFF,0xFE,0x07,0xFE,0x06,
0xFE,0x05,0x07,0x07,0x00,0x00,0x00,0x40,0xF0,0xC8,0x88,0x98,0x78,0x10,0x05,0x07, 0xFE,0x05,0x07,0x07,0x00,0x00,0x00,0x40,0xF0,0xC8,0x88,0x98,0x78,0x10,0x05,0x07,

2
Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
* *
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7) #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
// reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH

2
Marlin/src/lcd/dogm/fontdata/langdata_an.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_bg.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = { const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xFF,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xFF,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_ca.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_cz.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = { const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8D,0x00,0x0A,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8D,0x00,0x0A,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_da.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_de.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_el.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = { const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = { const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_en.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_es.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_eu.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_fi.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_fr.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_gl.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_hr.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = { const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_hu.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_241_241[31] U8G_FONT_SECTION("fontpage_2_241_241") = { const u8g_fntpgm_uint8_t fontpage_2_241_241[31] U8G_FONT_SECTION("fontpage_2_241_241") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x08,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x08,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_it.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = { const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = { const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = {
0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00, 0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_nl.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_pl.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_132_133[45] U8G_FONT_SECTION("fontpage_2_132_133") = { const u8g_fntpgm_uint8_t fontpage_2_132_133[45] U8G_FONT_SECTION("fontpage_2_132_133") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x84,0x85,0x00,0x07,0xFE,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x84,0x85,0x00,0x07,0xFE,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_pt.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_ro.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

2
Marlin/src/lcd/dogm/fontdata/langdata_ru.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_8_144_168[348] U8G_FONT_SECTION("fontpage_8_144_168") = { const u8g_fntpgm_uint8_t fontpage_8_144_168[348] U8G_FONT_SECTION("fontpage_8_144_168") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0xA8,0x00,0x0A,0xFE,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0xA8,0x00,0x0A,0xFE,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_sk.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = { const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8F,0x00,0x0A,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8F,0x00,0x0A,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_test.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = { const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x00,0x0A,0xFE,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x00,0x0A,0xFE,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_tr.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_158_159[49] U8G_FONT_SECTION("fontpage_2_158_159") = { const u8g_fntpgm_uint8_t fontpage_2_158_159[49] U8G_FONT_SECTION("fontpage_2_158_159") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9E,0x9F,0x00,0x0A,0xFE,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9E,0x9F,0x00,0x0A,0xFE,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_uk.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = { const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_vi.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_2_131_131[31] U8G_FONT_SECTION("fontpage_2_131_131") = { const u8g_fntpgm_uint8_t fontpage_2_131_131[31] U8G_FONT_SECTION("fontpage_2_131_131") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x08,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x08,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_64_157_157[26] U8G_FONT_SECTION("fontpage_64_157_157") = { const u8g_fntpgm_uint8_t fontpage_64_157_157[26] U8G_FONT_SECTION("fontpage_64_157_157") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9D,0x9D,0x00,0x07,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9D,0x9D,0x00,0x07,0x00,0x00,

2
Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
View File

@ -3,7 +3,7 @@
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
const u8g_fntpgm_uint8_t fontpage_69_191_191[28] U8G_FONT_SECTION("fontpage_69_191_191") = { const u8g_fntpgm_uint8_t fontpage_69_191_191[28] U8G_FONT_SECTION("fontpage_69_191_191") = {
0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x05,0x00,0x00, 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x05,0x00,0x00,

2
Marlin/src/lcd/dogm/marlinui_DOGM.h
View File

@ -27,7 +27,7 @@
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#include <U8glib.h> #include <U8glib-HAL.h>
#include "HAL_LCD_class_defines.h" #include "HAL_LCD_class_defines.h"
//#define ALTERNATIVE_LCD //#define ALTERNATIVE_LCD

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

@ -24,7 +24,7 @@
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
#include "HAL_LCD_com_defines.h" #include "HAL_LCD_com_defines.h"
#include <U8glib.h> #include <U8glib-HAL.h>
#define WIDTH 128 #define WIDTH 128
#define HEIGHT 64 #define HEIGHT 64

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

@ -57,7 +57,7 @@
#if HAS_MARLINUI_U8GLIB #if HAS_MARLINUI_U8GLIB
#include <U8glib.h> #include <U8glib-HAL.h>
#include "HAL_LCD_com_defines.h" #include "HAL_LCD_com_defines.h"
#define WIDTH 128 #define WIDTH 128

2
Marlin/src/lcd/dogm/u8g_fontutf8.h
View File

@ -8,7 +8,7 @@
*/ */
#pragma once #pragma once
#include <U8glib.h> #include <U8glib-HAL.h>
#include "../fontutils.h" #include "../fontutils.h"
// the macro to indicate a UTF-8 string // the macro to indicate a UTF-8 string

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

@ -35,7 +35,7 @@
#define PAGE_HEIGHT 16 // 256 byte framebuffer #define PAGE_HEIGHT 16 // 256 byte framebuffer
//#define PAGE_HEIGHT 32 // 512 byte framebuffer //#define PAGE_HEIGHT 32 // 512 byte framebuffer
#include <U8glib.h> #include <U8glib-HAL.h>
void ST7920_SWSPI_SND_8BIT(uint8_t val); void ST7920_SWSPI_SND_8BIT(uint8_t val);

2
buildroot/share/fonts/genallfont.sh
View File

@ -119,7 +119,7 @@ if [ 1 = 1 ]; then
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
* *
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
#if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7) #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
// reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH

2
buildroot/share/fonts/uxggenpages.sh
View File

@ -169,7 +169,7 @@ cat <<EOF >fontutf8-data.h
* Contents will be REPLACED by future processing! * Contents will be REPLACED by future processing!
* Use genallfont.sh to generate font data for updated languages. * Use genallfont.sh to generate font data for updated languages.
*/ */
#include <U8glib.h> #include <U8glib-HAL.h>
$TMPA $TMPA
#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data } #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {$TMPB}; static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {$TMPB};

2
ini/features.ini
View File

@ -36,7 +36,7 @@ USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7 USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
HAS_WIRED_LCD = src_filter=+<src/lcd/lcdprint.cpp> HAS_WIRED_LCD = src_filter=+<src/lcd/lcdprint.cpp>
HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780> HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780>
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.4.5 HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.5.0
src_filter=+<src/lcd/dogm> src_filter=+<src/lcd/dogm>
HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io> HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp> HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>