Skip to content

M
MarlinKimbra
Commit fccc4b9a authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Fix DOG LCD fonts

parent bf24479b
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 354 deletions
MarlinKimbra/Marlin_main.cpp
View file @ fccc4b9a
......@@ -376,6 +376,7 @@ uint8_t debugLevel = 0;
#ifdef SCARA
float axis_scaling[3] = { 1, 1, 1 }; // Build size scaling, default to 1
static float delta[3] = { 0, 0, 0 };
#endif //SCARA
#ifdef FILAMENT_SENSOR
......@@ -2718,7 +2719,7 @@ inline void gcode_G28(boolean home_x=false, boolean home_y=false) {
//corrected_position.debug("position before G29");
plan_bed_level_matrix.set_to_identity();
vector_3 uncorrected_position = plan_get_position();
//uncorrected_position.debug("position durring G29");
//uncorrected_position.debug("position during G29");
current_position[X_AXIS] = uncorrected_position.x;
current_position[Y_AXIS] = uncorrected_position.y;
current_position[Z_AXIS] = uncorrected_position.z;
......@@ -2730,8 +2731,8 @@ inline void gcode_G28(boolean home_x=false, boolean home_y=false) {
#ifdef AUTO_BED_LEVELING_GRID
// probe at the points of a lattice grid
int xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (auto_bed_leveling_grid_points - 1);
int yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (auto_bed_leveling_grid_points - 1);
const int xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (auto_bed_leveling_grid_points - 1);
const int yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (auto_bed_leveling_grid_points - 1);
// solve the plane equation ax + by + d = z
// A is the matrix with rows [x y 1] for all the probed points
......@@ -6415,7 +6416,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
{
#if defined(KILL_PIN) && KILL_PIN > -1
static int killCount = 0; // make the inactivity button a bit less responsive
const int KILL_DELAY = 10000;
const int KILL_DELAY = 750;
#endif
#if defined(HOME_PIN) && HOME_PIN > -1
......
MarlinKimbra/dogm_font_data_ISO10646_1_Marlin.h 0 → 100644
View file @ fccc4b9a
/*
Fontname: ISO10646-1-Marlin
Copyright: A.Hardtung, public domain
Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 5 h=10 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len= 9
Font Bounding box w= 6 h= 9 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
Pure Font ascent = 7 descent=-1
X Font ascent = 7 descent=-1
Max Font ascent = 8 descent=-2
*/
#include <utility/u8g.h>
const u8g_fntpgm_uint8_t ISO10646_1_Marlin_5x7[2596] U8G_SECTION(".progmem.ISO10646_1_Marlin_5x7") = {
0,6,9,0,254,7,1,146,3,33,32,255,255,8,254,7,
255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6,
0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32,
120,160,112,40,240,32,5,7,7,6,0,0,192,200,16,32,
64,152,24,5,7,7,6,0,0,96,144,160,64,168,144,104,
2,3,3,6,1,4,192,64,128,3,7,7,6,1,0,32,
64,128,128,128,64,32,3,7,7,6,1,0,128,64,32,32,
32,64,128,5,5,5,6,0,1,32,168,112,168,32,5,5,
5,6,0,1,32,32,248,32,32,2,3,3,6,2,255,192,
64,128,5,1,1,6,0,3,248,2,2,2,6,2,0,192,
192,5,5,5,6,0,1,8,16,32,64,128,5,7,7,6,
0,0,112,136,136,136,136,136,112,3,7,7,6,1,0,64,
192,64,64,64,64,224,5,7,7,6,0,0,112,136,8,112,
128,128,248,5,7,7,6,0,0,248,16,32,16,8,8,240,
5,7,7,6,0,0,16,48,80,144,248,16,16,5,7,7,
6,0,0,248,128,240,8,8,136,112,5,7,7,6,0,0,
112,128,128,240,136,136,112,5,7,7,6,0,0,248,8,16,
32,32,32,32,5,7,7,6,0,0,112,136,136,112,136,136,
112,5,7,7,6,0,0,112,136,136,120,8,8,112,2,5,
5,6,2,0,192,192,0,192,192,2,6,6,6,2,255,192,
192,0,192,64,128,4,7,7,6,0,0,16,32,64,128,64,
32,16,5,3,3,6,0,2,248,0,248,4,7,7,6,1,
0,128,64,32,16,32,64,128,5,7,7,6,0,0,112,136,
8,16,32,0,32,5,7,7,6,0,0,112,136,8,104,168,
168,112,5,7,7,6,0,0,112,136,136,248,136,136,136,5,
7,7,6,0,0,240,136,136,240,136,136,240,5,7,7,6,
0,0,112,136,128,128,128,136,112,5,7,7,6,0,0,240,
136,136,136,136,136,240,5,7,7,6,0,0,248,128,128,240,
128,128,248,5,7,7,6,0,0,248,128,128,240,128,128,128,
5,7,7,6,0,0,112,136,128,184,136,136,112,5,7,7,
6,0,0,136,136,136,248,136,136,136,1,7,7,6,2,0,
128,128,128,128,128,128,128,5,7,7,6,0,0,56,16,16,
16,16,144,96,5,7,7,6,0,0,136,144,160,192,160,144,
136,5,7,7,6,0,0,128,128,128,128,128,128,248,5,7,
7,6,0,0,136,216,168,136,136,136,136,5,7,7,6,0,
0,136,136,200,168,152,136,136,5,7,7,6,0,0,112,136,
136,136,136,136,112,5,7,7,6,0,0,240,136,136,240,128,
128,128,5,7,7,6,0,0,112,136,136,136,168,144,104,5,
7,7,6,0,0,240,136,136,240,160,144,136,5,7,7,6,
0,0,120,128,128,112,8,8,240,5,7,7,6,0,0,248,
32,32,32,32,32,32,5,7,7,6,0,0,136,136,136,136,
136,136,112,5,7,7,6,0,0,136,136,136,136,136,80,32,
5,7,7,6,0,0,136,136,136,136,136,168,80,5,7,7,
6,0,0,136,136,80,32,80,136,136,5,7,7,6,0,0,
136,136,136,80,32,32,32,5,7,7,6,0,0,248,8,16,
32,64,128,248,3,7,7,6,1,0,224,128,128,128,128,128,
224,5,5,5,6,0,1,128,64,32,16,8,3,7,7,6,
1,0,224,32,32,32,32,32,224,5,3,3,6,0,4,32,
80,136,5,1,1,6,0,0,248,2,2,2,6,2,5,128,
64,5,5,5,6,0,0,112,8,120,136,120,5,7,7,6,
0,0,128,128,176,200,136,136,240,5,5,5,6,0,0,112,
128,128,136,112,5,7,7,6,0,0,8,8,104,152,136,136,
120,5,5,5,6,0,0,112,136,248,128,112,5,7,7,6,
0,0,48,72,224,64,64,64,64,5,6,6,6,0,255,112,
136,136,120,8,112,5,7,7,6,0,0,128,128,176,200,136,
136,136,1,7,7,6,2,0,128,0,128,128,128,128,128,3,
8,8,6,1,255,32,0,32,32,32,32,160,64,4,7,7,
6,0,0,128,128,144,160,192,160,144,3,7,7,6,1,0,
192,64,64,64,64,64,224,5,5,5,6,0,0,208,168,168,
168,168,5,5,5,6,0,0,176,200,136,136,136,5,5,5,
6,0,0,112,136,136,136,112,5,6,6,6,0,255,240,136,
136,240,128,128,5,6,6,6,0,255,120,136,136,120,8,8,
5,5,5,6,0,0,176,200,128,128,128,5,5,5,6,0,
0,112,128,112,8,240,4,7,7,6,0,0,64,64,224,64,
64,64,48,5,5,5,6,0,0,136,136,136,152,104,5,5,
5,6,0,0,136,136,136,80,32,5,5,5,6,0,0,136,
136,168,168,80,5,5,5,6,0,0,136,80,32,80,136,5,
6,6,6,0,255,136,136,136,120,8,112,5,5,5,6,0,
0,248,16,32,64,248,3,7,7,6,1,0,32,64,64,128,
64,64,32,1,7,7,6,2,0,128,128,128,128,128,128,128,
3,7,7,6,1,0,128,64,64,32,64,64,128,5,2,2,
6,0,2,104,144,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,1,7,7,6,2,0,128,0,128,128,128,128,128,5,7,
7,6,0,0,32,112,168,160,168,112,32,5,7,7,6,0,
0,48,64,64,224,64,80,168,5,5,5,6,0,0,136,112,
80,112,136,5,7,7,6,0,0,136,80,32,248,32,248,32,
1,7,7,6,2,0,128,128,128,0,128,128,128,5,8,8,
6,0,0,48,72,32,80,80,32,144,96,3,1,1,6,1,
7,160,5,7,7,6,0,0,248,136,184,184,184,136,248,5,
7,7,6,0,1,112,8,120,136,120,0,248,5,5,5,6,
0,1,40,80,160,80,40,5,3,3,6,0,1,248,8,8,
2,2,2,6,2,6,64,128,5,7,7,6,0,0,248,136,
168,136,152,168,248,5,1,1,6,0,6,248,4,4,4,6,
0,3,96,144,144,96,5,7,7,6,0,0,32,32,248,32,
32,0,248,4,5,5,6,0,3,96,144,32,64,240,3,5,
5,6,0,3,224,32,224,32,224,2,2,2,6,2,6,64,
128,5,8,8,6,0,255,136,136,136,136,152,232,128,128,5,
7,7,6,0,0,120,152,152,120,24,24,24,2,2,2,6,
2,2,192,192,2,2,2,6,2,255,64,128,3,5,5,6,
0,3,64,192,64,64,224,5,7,7,6,0,1,112,136,136,
136,112,0,248,5,5,5,6,0,1,160,80,40,80,160,5,
7,7,6,0,0,136,144,168,88,184,8,8,5,7,7,6,
0,0,136,144,184,72,152,32,56,5,8,8,6,0,0,192,
64,192,72,216,56,8,8,5,7,7,6,0,0,32,0,32,
64,128,136,112,5,8,8,6,0,0,64,32,0,112,136,248,
136,136,5,8,8,6,0,0,16,32,0,112,136,248,136,136,
5,8,8,6,0,0,32,80,0,112,136,248,136,136,5,8,
8,6,0,0,104,144,0,112,136,248,136,136,5,8,8,6,
0,0,80,0,112,136,136,248,136,136,5,8,8,6,0,0,
32,80,32,112,136,248,136,136,5,7,7,6,0,0,56,96,
160,184,224,160,184,5,8,8,6,0,255,112,136,128,128,136,
112,32,96,5,8,8,6,0,0,64,32,0,248,128,240,128,
248,5,8,8,6,0,0,8,16,0,248,128,240,128,248,5,
8,8,6,0,0,32,80,0,248,128,240,128,248,5,7,7,
6,0,0,80,0,248,128,240,128,248,3,8,8,6,1,0,
128,64,0,224,64,64,64,224,3,8,8,6,1,0,32,64,
0,224,64,64,64,224,3,8,8,6,1,0,64,160,0,224,
64,64,64,224,3,7,7,6,1,0,160,0,224,64,64,64,
224,5,7,7,6,0,0,112,72,72,232,72,72,112,5,8,
8,6,0,0,104,144,0,136,200,168,152,136,5,8,8,6,
0,0,64,32,112,136,136,136,136,112,5,8,8,6,0,0,
16,32,112,136,136,136,136,112,5,8,8,6,0,0,32,80,
0,112,136,136,136,112,5,8,8,6,0,0,104,144,0,112,
136,136,136,112,5,8,8,6,0,0,80,0,112,136,136,136,
136,112,5,5,5,6,0,1,136,80,32,80,136,5,8,8,
6,0,255,16,112,168,168,168,168,112,64,5,8,8,6,0,
0,64,32,136,136,136,136,136,112,5,8,8,6,0,0,16,
32,136,136,136,136,136,112,5,8,8,6,0,0,32,80,0,
136,136,136,136,112,5,8,8,6,0,0,80,0,136,136,136,
136,136,112,5,8,8,6,0,0,16,32,136,80,32,32,32,
32,5,9,9,6,0,255,192,64,112,72,72,112,64,64,224,
4,8,8,6,1,255,96,144,144,160,144,144,224,128,5,8,
8,6,0,0,64,32,0,112,8,120,136,120,5,8,8,6,
0,0,16,32,0,112,8,120,136,120,5,8,8,6,0,0,
32,80,0,112,8,120,136,120,5,8,8,6,0,0,104,144,
0,112,8,120,136,120,5,7,7,6,0,0,80,0,112,8,
120,136,120,5,8,8,6,0,0,32,80,32,112,8,120,136,
120,5,6,6,6,0,0,208,40,120,160,168,80,5,6,6,
6,0,255,112,128,136,112,32,96,5,8,8,6,0,0,64,
32,0,112,136,248,128,112,5,8,8,6,0,0,16,32,0,
112,136,248,128,112,5,8,8,6,0,0,32,80,0,112,136,
248,128,112,5,7,7,6,0,0,80,0,112,136,248,128,112,
3,8,8,6,1,0,128,64,0,64,192,64,64,224,3,8,
8,6,1,0,32,64,0,64,192,64,64,224,3,8,8,6,
1,0,64,160,0,64,192,64,64,224,3,7,7,6,1,0,
160,0,64,192,64,64,224,5,7,7,6,0,0,160,64,160,
16,120,136,112,5,8,8,6,0,0,104,144,0,176,200,136,
136,136,5,8,8,6,0,0,64,32,0,112,136,136,136,112,
5,8,8,6,0,0,16,32,0,112,136,136,136,112,5,8,
8,6,0,0,32,80,0,112,136,136,136,112,5,8,8,6,
0,0,104,144,0,112,136,136,136,112,5,7,7,6,0,0,
80,0,112,136,136,136,112,5,5,5,6,0,1,32,0,248,
0,32,5,8,8,6,0,0,64,240,200,136,136,152,120,16,
5,8,8,6,0,0,192,248,136,136,136,136,136,248,5,5,
5,6,0,1,32,48,248,48,32,5,8,8,6,0,0,32,
112,248,32,32,32,32,224,5,9,9,6,0,255,32,112,168,
168,184,136,136,112,32,5,9,9,6,0,255,224,128,192,176,
168,40,48,40,40,5,9,9,6,0,255,248,168,136,136,136,
136,136,168,248,5,10,10,6,0,254,32,80,80,80,80,136,
168,168,136,112};
MarlinKimbra/dogm_font_data_marlin.h deleted 100644 → 0
View file @ bf24479b
/*
Fontname: -Misc-Fixed-Medium-R-Normal--9-90-75-75-C-60-ISO10646-1
Copyright: Public domain font. Share and enjoy.
Capital A Height: 6, '1' Height: 6
Calculated Max Values w= 6 h= 9 x= 2 y= 7 dx= 6 dy= 0 ascent= 7 len= 9
Font Bounding box w= 6 h= 9 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
Pure Font ascent = 6 descent=-2
X Font ascent = 6 descent=-2
Max Font ascent = 7 descent=-2
*/
#include <utility/u8g.h>
const u8g_fntpgm_uint8_t u8g_font_6x9[2300] U8G_SECTION(".progmem.u8g_font_6x9") = {
0,6,9,0,254,6,1,137,2,254,32,255,254,7,254,6,
254,0,0,0,6,0,7,1,6,6,6,2,0,128,128,128,
128,0,128,3,3,3,6,1,3,160,160,160,5,7,7,6,
0,255,80,80,248,80,248,80,80,5,9,9,6,0,254,32,
112,168,160,112,40,168,112,32,6,8,8,6,0,255,64,168,
72,16,32,72,84,8,5,7,7,6,0,255,96,144,144,96,
152,144,104,1,3,3,6,2,3,128,128,128,2,7,7,6,
2,255,64,128,128,128,128,128,64,2,7,7,6,2,255,128,
64,64,64,64,64,128,5,5,5,6,0,0,136,80,248,80,
136,5,5,5,6,0,0,32,32,248,32,32,2,4,4,6,
2,254,192,64,64,128,5,1,1,6,0,2,248,2,2,2,
6,2,0,192,192,4,6,6,6,1,0,16,16,32,64,128,
128,4,6,6,6,1,0,96,144,144,144,144,96,3,6,6,
6,1,0,64,192,64,64,64,224,4,6,6,6,1,0,96,
144,16,32,64,240,4,6,6,6,1,0,240,32,96,16,16,
224,5,6,6,6,0,0,16,48,80,144,248,16,4,6,6,
6,1,0,240,128,224,16,16,224,4,6,6,6,1,0,96,
128,224,144,144,96,4,6,6,6,1,0,240,16,16,32,64,
64,4,6,6,6,1,0,96,144,96,144,144,96,4,6,6,
6,1,0,96,144,144,112,16,96,2,5,5,6,2,0,192,
192,0,192,192,2,7,7,6,2,254,192,192,0,192,64,64,
128,5,5,5,6,0,0,24,96,128,96,24,5,3,3,6,
0,1,248,0,248,5,5,5,6,0,0,192,48,8,48,192,
4,7,7,6,1,0,96,144,16,96,64,0,64,5,6,6,
6,0,0,112,144,168,176,128,112,5,6,6,6,0,0,32,
80,136,248,136,136,5,6,6,6,0,0,240,136,240,136,136,
240,4,6,6,6,1,0,96,144,128,128,144,96,4,6,6,
6,1,0,224,144,144,144,144,224,4,6,6,6,1,0,240,
128,224,128,128,240,4,6,6,6,1,0,240,128,224,128,128,
128,4,6,6,6,1,0,96,144,128,176,144,96,4,6,6,
6,1,0,144,144,240,144,144,144,3,6,6,6,1,0,224,
64,64,64,64,224,5,6,6,6,0,0,56,16,16,16,144,
96,4,6,6,6,1,0,144,160,192,160,144,144,4,6,6,
6,1,0,128,128,128,128,128,240,5,6,6,6,0,0,136,
216,168,168,136,136,4,6,6,6,1,0,144,208,176,144,144,
144,5,6,6,6,0,0,112,136,136,136,136,112,4,6,6,
6,1,0,224,144,144,224,128,128,4,7,7,6,1,255,96,
144,144,208,176,96,16,4,6,6,6,1,0,224,144,144,224,
144,144,4,6,6,6,1,0,96,144,64,32,144,96,5,6,
6,6,0,0,248,32,32,32,32,32,4,6,6,6,1,0,
144,144,144,144,144,96,4,6,6,6,1,0,144,144,144,240,
96,96,5,6,6,6,0,0,136,136,168,168,216,136,5,6,
6,6,0,0,136,80,32,32,80,136,5,6,6,6,0,0,
136,136,80,32,32,32,4,6,6,6,1,0,240,16,32,64,
128,240,3,6,6,6,1,0,224,128,128,128,128,224,4,6,
6,6,1,0,128,128,64,32,16,16,3,6,6,6,1,0,
224,32,32,32,32,224,5,3,3,6,0,3,32,80,136,5,
1,1,6,0,254,248,2,2,2,6,2,4,128,64,4,4,
4,6,1,0,112,144,144,112,4,6,6,6,1,0,128,128,
224,144,144,224,4,4,4,6,1,0,112,128,128,112,4,6,
6,6,1,0,16,16,112,144,144,112,4,4,4,6,1,0,
96,176,192,112,4,6,6,6,1,0,32,80,64,224,64,64,
4,6,6,6,1,254,96,144,144,112,16,96,4,6,6,6,
1,0,128,128,224,144,144,144,3,6,6,6,1,0,64,0,
192,64,64,224,3,8,8,6,1,254,32,0,96,32,32,32,
160,64,4,6,6,6,1,0,128,128,160,192,160,144,3,6,
6,6,1,0,192,64,64,64,64,224,5,4,4,6,0,0,
208,168,168,136,4,4,4,6,1,0,224,144,144,144,4,4,
4,6,1,0,96,144,144,96,4,6,6,6,1,254,224,144,
144,224,128,128,4,6,6,6,1,254,112,144,144,112,16,16,
4,4,4,6,1,0,160,208,128,128,4,4,4,6,1,0,
112,192,48,224,4,6,6,6,1,0,64,64,224,64,80,32,
4,4,4,6,1,0,144,144,144,112,4,4,4,6,1,0,
144,144,96,96,5,4,4,6,0,0,136,168,168,80,4,4,
4,6,1,0,144,96,96,144,4,6,6,6,1,254,144,144,
144,112,144,96,4,4,4,6,1,0,240,32,64,240,3,7,
7,6,1,0,32,64,64,128,64,64,32,1,7,7,6,2,
255,128,128,128,128,128,128,128,3,7,7,6,1,0,128,64,
64,32,64,64,128,4,2,2,6,1,3,80,160,255,255,255,
255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,
0,6,0,7,1,6,6,6,2,0,128,0,128,128,128,128,
4,6,6,6,1,255,32,112,160,160,112,32,5,7,7,6,
0,255,48,72,64,240,64,64,248,5,5,5,6,0,0,168,
80,136,80,168,5,6,6,6,0,0,136,80,248,32,248,32,
1,7,7,6,2,255,128,128,128,0,128,128,128,4,7,7,
6,1,255,112,128,96,144,96,16,224,3,1,1,6,1,5,
160,6,7,7,6,0,0,120,132,148,164,148,132,120,3,5,
5,6,1,1,96,160,96,0,224,5,5,5,6,0,0,40,
80,160,80,40,4,3,3,6,1,0,240,16,16,4,1,1,
6,1,2,240,6,7,7,6,0,0,120,132,180,164,164,132,
120,4,1,1,6,1,5,240,4,3,3,6,1,2,96,144,
96,5,7,7,6,0,255,32,32,248,32,32,0,248,3,5,
5,6,1,1,64,160,32,64,224,3,5,5,6,1,1,192,
32,64,32,192,2,2,2,6,2,4,64,128,4,5,5,6,
1,255,144,144,176,208,128,5,6,6,6,0,0,120,232,232,
104,40,40,1,1,1,6,2,2,128,2,2,2,6,2,254,
64,128,3,5,5,6,1,1,64,192,64,64,224,3,5,5,
6,1,1,64,160,64,0,224,5,5,5,6,0,0,160,80,
40,80,160,5,8,8,6,0,255,64,192,64,80,112,48,120,
16,5,8,8,6,0,255,64,192,64,80,104,8,16,56,5,
8,8,6,0,255,192,32,64,48,240,48,120,16,4,7,7,
6,1,0,32,0,32,96,128,144,96,5,7,7,6,0,0,
64,32,32,80,112,136,136,5,7,7,6,0,0,16,32,32,
80,112,136,136,5,7,7,6,0,0,32,80,32,80,112,136,
136,5,7,7,6,0,0,40,80,32,80,112,136,136,5,7,
7,6,0,0,80,0,32,80,112,136,136,5,7,7,6,0,
0,32,80,32,80,112,136,136,5,6,6,6,0,0,120,160,
240,160,160,184,4,8,8,6,1,254,96,144,128,128,144,96,
32,64,4,7,7,6,1,0,64,32,240,128,224,128,240,4,
7,7,6,1,0,32,64,240,128,224,128,240,4,7,7,6,
1,0,32,80,240,128,224,128,240,4,7,7,6,1,0,80,
0,240,128,224,128,240,3,7,7,6,1,0,128,64,224,64,
64,64,224,3,7,7,6,1,0,32,64,224,64,64,64,224,
3,7,7,6,1,0,64,160,224,64,64,64,224,3,7,7,
6,1,0,160,0,224,64,64,64,224,5,6,6,6,0,0,
112,72,232,72,72,112,4,7,7,6,1,0,80,160,144,208,
176,144,144,4,7,7,6,1,0,64,32,96,144,144,144,96,
4,7,7,6,1,0,32,64,96,144,144,144,96,4,7,7,
6,1,0,32,80,96,144,144,144,96,4,7,7,6,1,0,
80,160,96,144,144,144,96,4,7,7,6,1,0,80,0,96,
144,144,144,96,5,5,5,6,0,0,136,80,32,80,136,4,
8,8,6,1,255,16,112,176,176,208,208,224,128,4,7,7,
6,1,0,64,32,144,144,144,144,96,4,7,7,6,1,0,
32,64,144,144,144,144,96,4,7,7,6,1,0,32,80,144,
144,144,144,96,4,7,7,6,1,0,80,0,144,144,144,144,
96,5,7,7,6,0,0,16,32,136,80,32,32,32,4,6,
6,6,1,0,128,224,144,144,224,128,4,6,6,6,1,0,
96,144,160,160,144,160,4,7,7,6,1,0,64,32,0,112,
144,144,112,4,7,7,6,1,0,32,64,0,112,144,144,112,
4,7,7,6,1,0,32,80,0,112,144,144,112,4,7,7,
6,1,0,80,160,0,112,144,144,112,4,6,6,6,1,0,
80,0,112,144,144,112,4,7,7,6,1,0,32,80,32,112,
144,144,112,5,4,4,6,0,0,112,168,176,120,4,6,6,
6,1,254,112,128,128,112,32,64,4,7,7,6,1,0,64,
32,0,96,176,192,112,4,7,7,6,1,0,32,64,0,96,
176,192,112,4,7,7,6,1,0,32,80,0,96,176,192,112,
4,6,6,6,1,0,80,0,96,176,192,112,3,7,7,6,
1,0,128,64,0,192,64,64,224,3,7,7,6,1,0,32,
64,0,192,64,64,224,3,7,7,6,1,0,64,160,0,192,
64,64,224,3,6,6,6,1,0,160,0,192,64,64,224,4,
7,7,6,1,0,48,96,16,112,144,144,96,4,7,7,6,
1,0,80,160,0,224,144,144,144,4,7,7,6,1,0,64,
32,0,96,144,144,96,4,7,7,6,1,0,32,64,0,96,
144,144,96,4,7,7,6,1,0,32,80,0,96,144,144,96,
4,7,7,6,1,0,80,160,0,96,144,144,96,4,6,6,
6,1,0,80,0,96,144,144,96,5,5,5,6,0,0,32,
0,248,0,32,4,4,4,6,1,0,112,176,208,224,4,7,
7,6,1,0,64,32,0,144,144,144,112,4,7,7,6,1,
0,32,64,0,144,144,144,112,4,7,7,6,1,0,32,80,
0,144,144,144,112,4,6,6,6,1,0,80,0,144,144,144,
112,4,9,9,6,1,254,32,64,0,144,144,144,112,144,96,
4,8,8,6,1,254,128,128,224,144,144,224,128,128,4,8,
8,6,1,254,80,0,144,144,144,112,144,96};
// STB Marlin
/*
Fontname: u8g_font_6x10_marlin
Copyright: Public domain terminal emulator font. Share and enjoy.
Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 6 h=10 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len=10
Font Bounding box w= 6 h= 9 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
Pure Font ascent = 7 descent=-2
X Font ascent = 7 descent=-2
Max Font ascent = 8 descent=-2
*/
#include <utility/u8g.h>
const u8g_fntpgm_uint8_t u8g_font_6x10_marlin[2617] U8G_SECTION(".progmem.u8g_font_6x10_marlin") = {
0,6,9,0,254,7,1,153,3,43,32,255,254,8,254,7,
254,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,3,3,6,1,4,160,160,160,5,7,7,
6,0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,
32,112,160,112,40,112,32,5,7,7,6,0,0,72,168,80,
32,80,168,144,5,7,7,6,0,0,64,160,160,64,168,144,
104,1,3,3,6,2,4,128,128,128,3,7,7,6,1,0,
32,64,128,128,128,64,32,3,7,7,6,1,0,128,64,32,
32,32,64,128,5,5,5,6,0,1,136,80,248,80,136,5,
5,5,6,0,1,32,32,248,32,32,3,3,3,6,1,255,
96,64,128,5,1,1,6,0,3,248,3,3,3,6,1,255,
64,224,64,5,7,7,6,0,0,8,8,16,32,64,128,128,
5,7,7,6,0,0,32,80,136,136,136,80,32,5,7,7,
6,0,0,32,96,160,32,32,32,248,5,7,7,6,0,0,
112,136,8,48,64,128,248,5,7,7,6,0,0,248,8,16,
48,8,136,112,5,7,7,6,0,0,16,48,80,144,248,16,
16,5,7,7,6,0,0,248,128,176,200,8,136,112,5,7,
7,6,0,0,48,64,128,176,200,136,112,5,7,7,6,0,
0,248,8,16,16,32,64,64,5,7,7,6,0,0,112,136,
136,112,136,136,112,5,7,7,6,0,0,112,136,152,104,8,
16,96,3,7,7,6,1,255,64,224,64,0,64,224,64,3,
7,7,6,1,255,64,224,64,0,96,64,128,4,7,7,6,
1,0,16,32,64,128,64,32,16,5,3,3,6,0,2,248,
0,248,4,7,7,6,1,0,128,64,32,16,32,64,128,5,
7,7,6,0,0,112,136,16,32,32,0,32,5,7,7,6,
0,0,112,136,152,168,176,128,112,5,7,7,6,0,0,32,
80,136,136,248,136,136,5,7,7,6,0,0,240,72,72,112,
72,72,240,5,7,7,6,0,0,112,136,128,128,128,136,112,
5,7,7,6,0,0,240,72,72,72,72,72,240,5,7,7,
6,0,0,248,128,128,240,128,128,248,5,7,7,6,0,0,
248,128,128,240,128,128,128,5,7,7,6,0,0,112,136,128,
128,152,136,112,5,7,7,6,0,0,136,136,136,248,136,136,
136,3,7,7,6,1,0,224,64,64,64,64,64,224,5,7,
7,6,0,0,56,16,16,16,16,144,96,5,7,7,6,0,
0,136,144,160,192,160,144,136,5,7,7,6,0,0,128,128,
128,128,128,128,248,5,7,7,6,0,0,136,136,216,168,136,
136,136,5,7,7,6,0,0,136,136,200,168,152,136,136,5,
7,7,6,0,0,112,136,136,136,136,136,112,5,7,7,6,
0,0,240,136,136,240,128,128,128,5,8,8,6,0,255,112,
136,136,136,136,168,112,8,5,7,7,6,0,0,240,136,136,
240,160,144,136,5,7,7,6,0,0,112,136,128,112,8,136,
112,5,7,7,6,0,0,248,32,32,32,32,32,32,5,7,
7,6,0,0,136,136,136,136,136,136,112,5,7,7,6,0,
0,136,136,136,80,80,80,32,5,7,7,6,0,0,136,136,
136,168,168,216,136,5,7,7,6,0,0,136,136,80,32,80,
136,136,5,7,7,6,0,0,136,136,80,32,32,32,32,5,
7,7,6,0,0,248,8,16,32,64,128,248,3,7,7,6,
1,0,224,128,128,128,128,128,224,5,7,7,6,0,0,128,
128,64,32,16,8,8,3,7,7,6,1,0,224,32,32,32,
32,32,224,5,3,3,6,0,4,32,80,136,5,1,1,6,
0,255,248,2,2,2,6,2,6,128,64,5,5,5,6,0,
0,112,8,120,136,120,5,7,7,6,0,0,128,128,176,200,
136,200,176,5,5,5,6,0,0,112,136,128,136,112,5,7,
7,6,0,0,8,8,104,152,136,152,104,5,5,5,6,0,
0,112,136,248,128,112,5,7,7,6,0,0,48,72,64,240,
64,64,64,5,7,7,6,0,254,120,136,136,120,8,136,112,
5,7,7,6,0,0,128,128,176,200,136,136,136,3,7,7,
6,1,0,64,0,192,64,64,64,224,4,9,9,6,1,254,
16,0,48,16,16,16,144,144,96,5,7,7,6,0,0,128,
128,136,144,224,144,136,3,7,7,6,1,0,192,64,64,64,
64,64,224,5,5,5,6,0,0,208,168,168,168,136,5,5,
5,6,0,0,176,200,136,136,136,5,5,5,6,0,0,112,
136,136,136,112,5,7,7,6,0,254,176,200,136,200,176,128,
128,5,7,7,6,0,254,104,152,136,152,104,8,8,5,5,
5,6,0,0,176,200,128,128,128,5,5,5,6,0,0,112,
128,112,8,240,5,7,7,6,0,0,64,64,240,64,64,72,
48,5,5,5,6,0,0,136,136,136,152,104,5,5,5,6,
0,0,136,136,80,80,32,5,5,5,6,0,0,136,136,168,
168,80,5,5,5,6,0,0,136,80,32,80,136,5,7,7,
6,0,254,136,136,152,104,8,136,112,5,5,5,6,0,0,
248,16,32,64,248,4,7,7,6,1,0,48,64,32,192,32,
64,48,1,7,7,6,2,0,128,128,128,128,128,128,128,4,
7,7,6,1,0,192,32,64,48,64,32,192,5,3,3,6,
0,4,72,168,144,0,0,0,1,0,0,0,0,0,1,0,
0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,
0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,
0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,
0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
0,0,1,0,0,0,0,0,1,0,0,0,0,0,6,0,
0,1,7,7,6,2,0,128,0,128,128,128,128,128,5,7,
7,6,0,255,32,120,160,160,160,120,32,5,7,7,6,0,
0,48,72,64,224,64,72,176,5,5,5,6,0,0,136,112,
80,112,136,5,8,8,6,0,255,136,136,80,32,248,32,32,
32,1,7,7,6,2,0,128,128,128,0,128,128,128,5,8,
8,6,0,255,112,128,224,144,72,56,8,112,3,1,1,6,
1,7,160,5,7,7,6,0,0,112,136,168,200,168,136,112,
4,6,6,6,1,1,112,144,176,80,0,240,6,5,5,6,
0,0,36,72,144,72,36,4,2,2,6,1,2,240,16,4,
1,1,6,1,3,240,5,7,7,6,0,0,112,136,232,200,
200,136,112,5,1,1,6,0,7,248,3,3,3,6,1,4,
64,160,64,5,6,6,6,0,0,32,32,248,32,32,248,4,
5,5,6,1,3,96,144,32,64,240,4,5,5,6,1,3,
224,16,96,16,224,2,2,2,6,2,6,64,128,5,6,6,
6,0,255,136,136,136,200,176,128,5,7,7,6,0,0,120,
232,232,104,40,40,40,1,1,1,6,2,3,128,2,2,2,
6,2,254,64,128,3,5,5,6,1,3,64,192,64,64,224,
4,6,6,6,1,1,96,144,144,96,0,240,6,5,5,6,
0,0,144,72,36,72,144,6,9,9,6,0,255,64,192,64,
64,228,12,20,60,4,6,9,9,6,0,255,64,192,64,64,
232,20,4,8,28,5,9,9,6,0,255,192,32,64,32,200,
24,40,120,8,5,7,7,6,0,0,32,0,32,32,64,136,
112,5,8,8,6,0,0,64,32,112,136,136,248,136,136,5,
8,8,6,0,0,16,32,112,136,136,248,136,136,5,8,8,
6,0,0,32,80,112,136,136,248,136,136,5,8,8,6,0,
0,72,176,112,136,136,248,136,136,5,8,8,6,0,0,80,
0,112,136,136,248,136,136,5,8,8,6,0,0,32,80,112,
136,136,248,136,136,6,7,7,6,0,0,60,80,144,156,240,
144,156,5,9,9,6,0,254,112,136,128,128,128,136,112,32,
64,5,8,8,6,0,0,64,248,128,128,240,128,128,248,5,
8,8,6,0,0,16,248,128,128,240,128,128,248,5,8,8,
6,0,0,32,248,128,128,240,128,128,248,5,8,8,6,0,
0,80,248,128,128,240,128,128,248,3,8,8,6,1,0,128,
64,224,64,64,64,64,224,3,8,8,6,1,0,32,64,224,
64,64,64,64,224,3,8,8,6,1,0,64,160,224,64,64,
64,64,224,3,8,8,6,1,0,160,0,224,64,64,64,64,
224,5,7,7,6,0,0,240,72,72,232,72,72,240,5,8,
8,6,0,0,40,80,136,200,168,152,136,136,5,8,8,6,
0,0,64,32,112,136,136,136,136,112,5,8,8,6,0,0,
16,32,112,136,136,136,136,112,5,8,8,6,0,0,32,80,
112,136,136,136,136,112,5,8,8,6,0,0,40,80,112,136,
136,136,136,112,5,8,8,6,0,0,80,0,112,136,136,136,
136,112,5,5,5,6,0,0,136,80,32,80,136,5,7,7,
6,0,0,112,152,152,168,200,200,112,5,8,8,6,0,0,
64,32,136,136,136,136,136,112,5,8,8,6,0,0,16,32,
136,136,136,136,136,112,5,8,8,6,0,0,32,80,0,136,
136,136,136,112,5,8,8,6,0,0,80,0,136,136,136,136,
136,112,5,8,8,6,0,0,16,32,136,136,80,32,32,32,
5,7,7,6,0,0,128,240,136,240,128,128,128,5,7,7,
6,0,0,112,136,144,160,144,136,176,5,8,8,6,0,0,
64,32,0,112,8,120,136,120,5,8,8,6,0,0,16,32,
0,112,8,120,136,120,5,8,8,6,0,0,32,80,0,112,
8,120,136,120,5,8,8,6,0,0,40,80,0,112,8,120,
136,120,5,7,7,6,0,0,80,0,112,8,120,136,120,5,
8,8,6,0,0,32,80,32,112,8,120,136,120,6,5,5,
6,0,0,120,20,124,144,124,5,7,7,6,0,254,112,136,
128,136,112,32,64,5,8,8,6,0,0,64,32,0,112,136,
248,128,112,5,8,8,6,0,0,16,32,0,112,136,248,128,
112,5,8,8,6,0,0,32,80,0,112,136,248,128,112,5,
7,7,6,0,0,80,0,112,136,248,128,112,3,8,8,6,
1,0,128,64,0,192,64,64,64,224,3,8,8,6,1,0,
64,128,0,192,64,64,64,224,3,8,8,6,1,0,64,160,
0,192,64,64,64,224,6,10,10,6,0,254,164,168,0,252,
132,128,128,128,132,252,6,10,10,6,0,254,84,148,0,252,
132,4,4,4,132,252,5,8,8,6,0,0,40,80,0,176,
200,136,136,136,5,8,8,6,0,0,64,32,0,112,136,136,
136,112,4,10,10,6,2,254,48,64,128,144,144,144,144,144,
144,144,4,10,10,6,0,254,192,32,16,144,144,144,144,144,
144,144,6,7,7,6,0,1,68,140,140,132,128,64,60,6,
7,7,6,0,1,136,196,196,132,4,8,240,5,5,5,6,
0,1,32,0,248,0,32,5,8,8,6,0,0,64,240,200,
136,136,152,120,16,5,8,8,6,0,0,224,248,136,136,136,
136,136,248,5,5,5,6,0,1,32,48,248,48,32,5,8,
8,6,0,0,32,112,248,32,32,32,32,224,5,9,9,6,
0,255,32,112,168,168,184,136,136,80,32,5,9,9,6,0,
255,224,128,192,176,168,168,48,40,40,5,9,9,6,0,255,
248,168,136,136,136,136,136,168,248,5,10,10,6,0,254,32,
80,80,80,80,136,168,168,136,112};
MarlinKimbra/dogm_lcd_implementation.h
View file @ fccc4b9a
......@@ -32,7 +32,7 @@
#include <U8glib.h>
#include "DOGMbitmaps.h"
#include "dogm_font_data_marlin.h"
#include "dogm_font_data_ISO10646_1_Marlin.h"
#include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h"
......@@ -48,8 +48,7 @@
*/
#define USE_BIG_EDIT_FONT // save 3120 bytes of PROGMEM by commenting out this line
#define FONT_STATUSMENU u8g_font_6x9
#define FONT_MENU u8g_font_6x10_marlin
#define FONT_MENU ISO10646_1_Marlin_5x7
// DOGM parameters (size in pixels)
#define DOG_CHAR_WIDTH 6
......@@ -60,12 +59,14 @@
#define DOG_CHAR_HEIGHT_EDIT 18
#define LCD_WIDTH_EDIT 14
#else
#define FONT_MENU_EDIT u8g_font_6x10_marlin
#define FONT_MENU_EDIT ISO10646_1_Marlin_5x7
#define DOG_CHAR_WIDTH_EDIT 6
#define DOG_CHAR_HEIGHT_EDIT 12
#define LCD_WIDTH_EDIT 22
#endif
#define FONT_STATUSMENU FONT_MENU
#define START_ROW 0
/* Custom characters defined in font font_6x10_marlin.c */
......@@ -153,10 +154,10 @@ static void _draw_heater_status(int x, int heater) {
bool isBed = heater < 0;
int y = 17 + (isBed ? 1 : 0);
u8g.setFont(FONT_STATUSMENU);
u8g.setPrintPos(x,6);
u8g.setPrintPos(x,7);
u8g.print(itostr3(int((heater >= 0 ? degTargetHotend(heater) : degTargetBed()) + 0.5)));
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
u8g.setPrintPos(x,27);
u8g.setPrintPos(x,28);
u8g.print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5));
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
if (!isHeatingHotend(0)) {
......
MarlinKimbra/fonts/make_fonts.bat 0 → 100644
View file @ fccc4b9a
.\bdf2u8g.exe -b 1 -e 9 Marlin_symbols.bdf Marlin_symbols dogm_font_data_Marlin_symbols.h
.\bdf2u8g.exe -b 16 -e 255 HD44780_W.bdf HD44780_W_5x7 dogm_font_data_HD44780_W.h
.\bdf2u8g.exe -b 32 -e 255 HD44780_C.bdf HD44780_C_5x7 dogm_font_data_HD44780_C.h
.\bdf2u8g.exe -b 32 -e 255 HD44780_J.bdf HD44780_J_5x7 dogm_font_data_HD44780_J.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646-1.bdf ISO10646_1_5x7 dogm_font_data_ISO10646_1.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646-1-Marlin.bdf ISO10646_1_Marlin_5x7 dogm_font_data_ISO10646_1_Marlin.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646_5_Cyrillic.bdf ISO10646_5_Cyrillic_5x7 dogm_font_data_ISO10646_5_Cyrillic.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646_Kana.bdf ISO10646_Kana_5x7 dogm_font_data_ISO10646_Kana.h
MarlinKimbra/ultralcd.cpp
View file @ fccc4b9a
......@@ -77,7 +77,9 @@ static void lcd_control_volumetric_menu();
#if defined(DOGLCD) && LCD_CONTRAST >= 0
static void lcd_set_contrast();
#endif
#ifdef FWRETRACT
static void lcd_control_retract_menu();
#endif
static void lcd_sdcard_menu();
#ifdef DELTA
......@@ -418,7 +420,7 @@ static void lcd_main_menu() {
END_MENU();
}
#ifdef SDSUPPORT
#if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
static void lcd_autostart_sd() {
card.autostart_index = 0;
card.setroot();
......@@ -752,10 +754,8 @@ void lcd_level_bed()
static void lcd_prepare_menu() {
START_MENU();
MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
#ifdef SDSUPPORT
#ifdef MENU_ADDAUTOSTART
MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
#endif
#if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
#endif
MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
......@@ -804,7 +804,8 @@ static void lcd_prepare_menu() {
}
#ifdef DELTA
static void lcd_delta_calibrate_menu() {
static void lcd_delta_calibrate_menu()
{
START_MENU();
MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
......@@ -1445,7 +1446,7 @@ void lcd_update() {
}
#endif//CARDINSERTED
long ms = millis();
uint32_t ms = millis();
if (ms > lcd_next_update_millis) {
#ifdef ULTIPANEL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment