thomas
/
marlin
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 0 Wiki Attività
Sfoglia il codice sorgente

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

Scott Lahteine 2 anni fa
parent
e7e1c51402
commit
cd55b5f5cc
Nessun account collegato all'indirizzo email del committer
55 ha cambiato i file con 55 aggiunte e 55 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1
    1
      Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
  2. 1
    1
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
  3. 1
    1
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
  4. 1
    1
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
  5. 1
    1
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
  6. 1
    1
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
  7. 1
    1
      Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
  8. 1
    1
      Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
  9. 1
    1
      Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
  10. 1
    1
      Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
  11. 1
    1
      Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
  12. 1
    1
      Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
  13. 1
    1
      Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
  14. 1
    1
      Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
  15. 1
    1
      Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
  16. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_an.h
  17. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_bg.h
  18. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_ca.h
  19. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_cz.h
  20. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_da.h
  21. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_de.h
  22. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_el.h
  23. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
  24. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_en.h
  25. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_es.h
  26. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_eu.h
  27. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_fi.h
  28. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_fr.h
  29. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_gl.h
  30. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_hr.h
  31. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_hu.h
  32. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_it.h
  33. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
  34. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
  35. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_nl.h
  36. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_pl.h
  37. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_pt.h
  38. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
  39. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_ro.h
  40. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_ru.h
  41. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_sk.h
  42. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_test.h
  43. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_tr.h
  44. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_uk.h
  45. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_vi.h
  46. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
  47. 1
    1
      Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
  48. 1
    1
      Marlin/src/lcd/dogm/marlinui_DOGM.h
  49. 1
    1
      Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
  50. 1
    1
      Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
  51. 1
    1
      Marlin/src/lcd/dogm/u8g_fontutf8.h
  52. 1
    1
      Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
  53. 1
    1
      buildroot/share/fonts/genallfont.sh
  54. 1
    1
      buildroot/share/fonts/uxggenpages.sh
  55. 1
    1
      ini/features.ini

+ 1
- 1
Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp Vedi File 

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

+ 1
- 1
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp Vedi File 

@@ -60,7 +60,7 @@
60 60
61 61 
 #if HAS_MARLINUI_U8GLIB
62 62
63 
-#include <U8glib.h>
63 
+#include <U8glib-HAL.h>
64 64
65 65 
 #include "../../../MarlinCore.h"
66 66

+ 1
- 1
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp Vedi File 

@@ -62,7 +62,7 @@
62 62 
 #include "../../../inc/MarlinConfig.h"
63 63 
 #include "../../shared/Delay.h"
64 64
65 
-#include <U8glib.h>
65 
+#include <U8glib-HAL.h>
66 66
67 67 
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
68 68

+ 1
- 1
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp Vedi File 

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

+ 1
- 1
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp Vedi File 

@@ -62,7 +62,7 @@
62 62 
 #include "../../../inc/MarlinConfig.h"
63 63 
 #include "../../shared/Delay.h"
64 64
65 
-#include <U8glib.h>
65 
+#include <U8glib-HAL.h>
66 66
67 67 
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
68 68

+ 1
- 1
Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h Vedi File 

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

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp Vedi File 

@@ -59,7 +59,7 @@
59 59
60 60 
 #if HAS_MARLINUI_U8GLIB
61 61
62 
-#include <U8glib.h>
62 
+#include <U8glib-HAL.h>
63 63 
 #include "../../shared/HAL_SPI.h"
64 64
65 65 
 #ifndef LCD_SPI_SPEED

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp Vedi File 

@@ -79,7 +79,7 @@
79 79
80 80 
 #if HAS_MARLINUI_U8GLIB
81 81
82 
-#include <U8glib.h>
82 
+#include <U8glib-HAL.h>
83 83
84 84 
 #define I2C_SLA         (0x3C*2)
85 85 
 //#define I2C_CMD_MODE  0x080

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp Vedi File 

@@ -59,7 +59,7 @@
59 59
60 60 
 #if HAS_MARLINUI_U8GLIB
61 61
62 
-#include <U8glib.h>
62 
+#include <U8glib-HAL.h>
63 63 
 #include "../../shared/HAL_SPI.h"
64 64 
 #include "../../shared/Delay.h"
65 65

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp Vedi File 

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

+ 1
- 1
Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp Vedi File 

@@ -71,7 +71,7 @@
71 71 
 #include <LPC17xx.h>
72 72 
 #include <gpio.h>
73 73
74 
-#include <U8glib.h>
74 
+#include <U8glib-HAL.h>
75 75
76 76 
 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 ) {
77 77

+ 1
- 1
Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_an.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_bg.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_ca.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_cz.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_da.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_de.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_el.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_en.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_es.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_eu.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_fi.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_fr.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_gl.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_hr.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_hu.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_it.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_nl.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_pl.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_pt.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_ro.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_ru.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_sk.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_test.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_tr.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_uk.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_vi.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/marlinui_DOGM.h Vedi File 

@@ -27,7 +27,7 @@
27 27
28 28 
 #include "../../inc/MarlinConfigPre.h"
29 29
30 
-#include <U8glib.h>
30 
+#include <U8glib-HAL.h>
31 31 
 #include "HAL_LCD_class_defines.h"
32 32
33 33 
 //#define ALTERNATIVE_LCD

+ 1
- 1
Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp Vedi File 

@@ -24,7 +24,7 @@
24 24 
 #if HAS_MARLINUI_U8GLIB
25 25
26 26 
 #include "HAL_LCD_com_defines.h"
27 
-#include <U8glib.h>
27 
+#include <U8glib-HAL.h>
28 28
29 29 
 #define WIDTH 128
30 30 
 #define HEIGHT 64

+ 1
- 1
Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp Vedi File 

@@ -57,7 +57,7 @@
57 57
58 58 
 #if HAS_MARLINUI_U8GLIB
59 59
60 
-#include <U8glib.h>
60 
+#include <U8glib-HAL.h>
61 61 
 #include "HAL_LCD_com_defines.h"
62 62
63 63 
 #define WIDTH 128

+ 1
- 1
Marlin/src/lcd/dogm/u8g_fontutf8.h Vedi File 

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

+ 1
- 1
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h Vedi File 

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

+ 1
- 1
buildroot/share/fonts/genallfont.sh Vedi File 

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

+ 1
- 1
buildroot/share/fonts/uxggenpages.sh Vedi File 

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

+ 1
- 1
ini/features.ini Vedi File 

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

Write Preview
Loading…
Annulla
Salva