DPS mode & Settings Screen

opendps/Makefile

@@ -31,8 +31,8 @@ DEBUG ?= 0
 WDOG ?= 1
 
 # Font file
-METER_FONT_FILE ?= gfx/Ubuntu-C.ttf
-METER_FONT_SMALL_SIZE ?= 18
+METER_FONT_FILE ?= gfx/nf.ttf
+METER_FONT_SMALL_SIZE ?= 16
 METER_FONT_MEDIUM_SIZE ?= 24
 METER_FONT_LARGE_SIZE ?= 48
 FULL_FONT_FILE ?= gfx/ProggyClean.ttf
@@ -44,13 +44,20 @@ COLORSPACE ?= 0
 # Colors for the main UI elements -- see ili9163c.h for list of colors
 COLOR_VOLTAGE ?= WHITE
 COLOR_AMPERAGE ?= WHITE
+COLOR_WATTAGE ?= WHITE
 COLOR_INPUT ?= WHITE
 
 # Optional tinting for UI elements
 TINT ?= ffffff
 
+# Enable DPS-look-alike mode
+DPSMODE_ENABLE ?= 1
+
 # Enable CC mode
-CC_ENABLE ?= 1
+CC_ENABLE ?= 0
+
+# Enable CV mode
+CV_ENABLE ?= 0
 
 # Enable CV mode
 CV_ENABLE ?= 1
@@ -61,6 +68,9 @@ CL_ENABLE ?= 1
 # Enable function generator mode
 FUNCGEN_ENABLE ?= 1
 
+# Enable settings 
+SETTINGS_ENABLE ?= 1
+
 # Enable invert color feature
 INVERT_ENABLE ?= 0
 
@@ -82,6 +92,7 @@ CFLAGS += \
           -DCOLORSPACE=$(COLORSPACE) \
           -DCOLOR_VOLTAGE=$(COLOR_VOLTAGE) \
           -DCOLOR_AMPERAGE=$(COLOR_AMPERAGE) \
+          -DCOLOR_WATTAGE=$(COLOR_WATTAGE) \
           -DCOLOR_INPUT=$(COLOR_INPUT) \
           -D$(MODEL)
 
@@ -94,6 +105,7 @@ OBJS = \
     crc16.o \
     uui.o \
     uui_number.o \
+    uui_time.o \
     settings_calibration.o \
     hw.o \
     pwrctl.o \
@@ -164,11 +176,21 @@ ifeq ($(CL_ENABLE),1)
 	OBJS += func_cl.o
 endif
 
+ifeq ($(DPSMODE_ENABLE),1)
+	CFLAGS +=-DCONFIG_DPSMODE_ENABLE
+	OBJS += func_dpsmode.o gfx-cvbar.o gfx-ccbar.o gfx-ppbar.o gfx-oppbar.o gfx-tmbar.o gfx-m1bar.o gfx-m2bar.o gfx-iconpower.o
+endif
+
 ifeq ($(FUNCGEN_ENABLE),1)
 	CFLAGS +=-DCONFIG_FUNCGEN_ENABLE
 	OBJS += func_gen.o uui_icon.o gfx-square.o gfx-saw.o gfx-sin.o
 endif
 
+ifeq ($(SETTINGS_ENABLE),1)
+	CFLAGS +=-DCONFIG_SETTINGS_ENABLE
+	OBJS += func_settings.o gfx-gear.o
+endif
+
 ifeq ($(SPLASH_SCREEN),1)
 	CFLAGS +=-DCONFIG_SPLASH_SCREEN
 endif

opendps/event.h

@@ -26,25 +26,40 @@
 #define __EVENT_H__
 
 typedef enum {
-	event_none = 0,
-	event_button_m1,
-	event_button_m2,
-  event_buttom_m1_and_m2,
-	event_button_sel,
-	event_button_enable,
-  event_rot_left,
-  event_rot_right,
-  event_rot_left_set,
-  event_rot_right_set,
-	event_rot_press,
-	event_uart_rx,
-	event_ocp,
-	event_ovp
+    event_none = 0,
+    event_button_m1,
+    event_button_m2,
+    event_button_m1_and_m2,
+    event_button_sel,
+
+    event_button_sel_m1,
+    event_button_sel_m2,
+
+    event_button_enable,
+    event_rot_left,
+    event_rot_right,
+    event_rot_left_set,
+    event_rot_right_set,
+    event_rot_left_m1,
+    event_rot_right_m1,
+    event_rot_left_m2,
+    event_rot_right_m2,
+    event_rot_left_down,
+    event_rot_right_down,
+    event_rot_press,
+
+    event_uart_rx,
+    event_ocp,
+    event_ovp,
+    event_opp,
+
+    event_shutoff,
+    event_timer
 } event_t;
 
 typedef enum {
-	press_short = 0,
-	press_long,
+    press_short = 0,
+    press_long,
 } button_press_t;
 
 

opendps/font-meter_large.h

@@ -5,17 +5,17 @@
 
 #include <stdint.h>
 
-#define FONT_METER_LARGE_MAX_GLYPH_HEIGHT (35)
-#define FONT_METER_LARGE_MAX_GLYPH_WIDTH  (22)
+#define FONT_METER_LARGE_MAX_GLYPH_HEIGHT (25)
+#define FONT_METER_LARGE_MAX_GLYPH_WIDTH  (20)
 #define FONT_METER_LARGE_MAX_DIGIT_WIDTH  (17)
-#define FONT_METER_LARGE_DOT_WIDTH        (5)
+#define FONT_METER_LARGE_DOT_WIDTH        (6)
 #define FONT_METER_LARGE_SPACING          (4)
-#define FONT_METER_LARGE_SPACE_WIDTH      (9)
+#define FONT_METER_LARGE_SPACE_WIDTH      (20)
 
 extern const uint32_t font_meter_large_height;
 extern const uint8_t font_meter_large_widths[96];
 extern const uint8_t font_meter_large_sizes[96];
 extern const uint16_t font_meter_large_offsets[96];
-extern const uint8_t font_meter_large_pixdata[1745];
+extern const uint8_t font_meter_large_pixdata[1396];
 
-#endif // __FONT_METER_LARGE_H__
+#endif // __FONT_METER_LARGE_H__

opendps/font-meter_medium.c

@@ -1,69 +1,87 @@
-/** Font generated from `./gen_lookup.py -f gfx/Ubuntu-C.ttf -s 24 -o meter_medium` */
+/** Font generated from gfx/nf.ttf 24pt */
 
 #include "font-meter_medium.h"
 
-const uint32_t font_meter_medium_height = 17;
-const uint8_t font_meter_medium_pixdata[444] = {
+const uint32_t font_meter_medium_height = 18;
+const uint8_t font_meter_medium_pixdata[728] = {
   /* '0', offset=0 */
-  0xe0, 0x0b, 0xf8, 0x3f, 0x7c, 0x7c, 0x3d, 0xb4, 0x2e, 0xf4, 0x1e, 0xf0, 0x1e, 0xf0, 0x1e, 0xf0,
-  0x1e, 0xf0, 0x1e, 0xf0, 0x1e, 0xf0, 0x1e, 0xf0, 0x2e, 0xf4, 0x3d, 0xb4, 0x7c, 0x7c, 0xf8, 0x3f,
-  0xe0, 0x0b,
-  /* '1', offset=34 */
-  0xd0, 0xc2, 0xcb, 0xef, 0xbb, 0xd6, 0x42, 0x0b, 0x2d, 0xb4, 0xd0, 0x42, 0x0b, 0x2d, 0xb4, 0xd0,
-  0x42, 0x0b, 0x2d, 0xb4, 0xd0, 0x02,
-  /* '2', offset=56 */
-  0xf8, 0x0b, 0xfe, 0x3f, 0x09, 0x7d, 0x00, 0x7c, 0x00, 0x78, 0x00, 0x7c, 0x00, 0x3c, 0x00, 0x1e,
-  0x40, 0x0f, 0xc0, 0x03, 0xe0, 0x02, 0xf4, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x2d, 0x00, 0xfe, 0xff,
-  0xfe, 0xff,
-  /* '3', offset=90 */
-  0xf8, 0x07, 0xfe, 0x1f, 0x08, 0x3e, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x2f, 0xf0, 0x0b,
-  0xf0, 0x1f, 0x00, 0x3e, 0x00, 0x78, 0x00, 0xb4, 0x00, 0xb4, 0x00, 0xb8, 0x05, 0x7d, 0xff, 0x2f,
-  0xf9, 0x07,
-  /* '4', offset=124 */
-  0x00, 0x3d, 0x00, 0xfc, 0x00, 0xf4, 0x03, 0xf0, 0x0f, 0xd0, 0x3d, 0xc0, 0xf3, 0x00, 0xc7, 0x03,
-  0x0e, 0x0f, 0x2c, 0x3c, 0x74, 0xf0, 0xe0, 0xc0, 0xc3, 0xff, 0xbf, 0xff, 0xff, 0x02, 0xf0, 0x00,
-  0xc0, 0x03, 0x00, 0x0f, 0x00, 0x3c, 0x00,
-  /* '5', offset=163 */
-  0xf4, 0x7f, 0xf4, 0x7f, 0xb4, 0x00, 0x74, 0x00, 0x74, 0x00, 0x74, 0x00, 0xf8, 0x06, 0xf8, 0x1f,
-  0x40, 0x3f, 0x00, 0x7c, 0x00, 0xb8, 0x00, 0xb4, 0x00, 0xb4, 0x00, 0x7c, 0x04, 0x3e, 0xfe, 0x1f,
-  0xfd, 0x06,
-  /* '6', offset=197 */
-  0x00, 0x39, 0x80, 0x7f, 0xe0, 0x07, 0xf0, 0x00, 0x78, 0x00, 0x3c, 0x00, 0xfc, 0x1f, 0xfd, 0x7f,
-  0x2d, 0xf8, 0x2d, 0xf0, 0x2d, 0xf0, 0x2d, 0xf0, 0x3d, 0xf0, 0x3c, 0xf0, 0x7c, 0xb8, 0xf4, 0x7f,
-  0xd0, 0x1f,
-  /* '7', offset=231 */
-  0xff, 0xff, 0xff, 0xff, 0x00, 0xb4, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x1e, 0x00, 0x0f, 0x40, 0x0b,
-  0x80, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xd0, 0x02, 0xe0, 0x01, 0xf0, 0x01, 0xf0, 0x00, 0xf0, 0x00,
-  0xf0, 0x00,
-  /* '8', offset=265 */
-  0xe0, 0x1f, 0xf8, 0x7f, 0x3d, 0xb8, 0x2d, 0xf0, 0x2d, 0xf0, 0x2d, 0xb4, 0x3c, 0x38, 0xf0, 0x1e,
-  0xf0, 0x0f, 0x78, 0x3e, 0x2d, 0xb8, 0x1e, 0xf0, 0x0f, 0xf0, 0x1f, 0xf0, 0x3e, 0xf8, 0xfc, 0x3f,
-  0xe0, 0x0b,
-  /* '9', offset=299 */
-  0xe0, 0x0b, 0xf8, 0x3f, 0x7c, 0x7c, 0x2d, 0xb4, 0x2e, 0xf0, 0x1e, 0xf0, 0x2e, 0xf0, 0x2d, 0xf0,
-  0x7c, 0xf0, 0xf8, 0xff, 0xe0, 0xff, 0x00, 0xb4, 0x00, 0x3c, 0x00, 0x3d, 0x90, 0x0f, 0xfc, 0x07,
-  0xb8, 0x00,
-  /* '.', offset=333 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfa, 0x2c,
-  /* 'V', offset=346 */
-  0x3d, 0x00, 0x3c, 0x0f, 0x00, 0xcf, 0x03, 0xc0, 0xf3, 0x01, 0xb4, 0xb8, 0x00, 0x2e, 0x3d, 0xc0,
-  0x07, 0x0f, 0xf0, 0xc0, 0x03, 0x3c, 0xe0, 0x41, 0x0b, 0xb4, 0xe0, 0x01, 0x3c, 0x3c, 0x00, 0x0f,
-  0x0b, 0x80, 0xd7, 0x01, 0xc0, 0x3e, 0x00, 0xf0, 0x0f, 0x00, 0xf8, 0x02, 0x00, 0x7d, 0x00,
-  /* 'A', offset=393 */
-  0x00, 0x7d, 0x00, 0x00, 0xbe, 0x00, 0x00, 0xff, 0x00, 0x00, 0xeb, 0x00, 0x40, 0xd7, 0x01, 0x80,
-  0xc3, 0x02, 0xc0, 0xc3, 0x03, 0xd0, 0x82, 0x07, 0xe0, 0x41, 0x0b, 0xf0, 0x00, 0x0f, 0xf0, 0x00,
-  0x0f, 0xf4, 0xff, 0x1f, 0xf8, 0xff, 0x2f, 0x7c, 0x00, 0x3d, 0x3c, 0x00, 0x3c, 0x3c, 0x00, 0x7c,
-  0x2d, 0x00, 0x78,
+  0x00, 0xfe, 0x01, 0xd0, 0xff, 0x0f, 0xf0, 0x42, 0x2f, 0xf8, 0x00, 0x3e, 0x7c, 0x00, 0x7f, 0x3c,
+  0x80, 0xbf, 0x3d, 0xc0, 0xbb, 0x3d, 0xf0, 0xf8, 0x3d, 0x78, 0xf8, 0x3d, 0x3c, 0xf4, 0x3d, 0x0f,
+  0xf8, 0xbd, 0x07, 0xb8, 0xfc, 0x03, 0xbc, 0xfc, 0x00, 0x7c, 0xf8, 0x00, 0x3d, 0xf0, 0x42, 0x2f,
+  0xd0, 0xff, 0x0f, 0x00, 0xfe, 0x01,
+  /* '1', offset=54 */
+  0x40, 0x3f, 0x00, 0xfd, 0x0f, 0xd0, 0xef, 0x03, 0xb8, 0xf0, 0x00, 0x01, 0x3c, 0x00, 0x00, 0x0f,
+  0x00, 0xc0, 0x03, 0x00, 0xf0, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x0f, 0x00, 0xc0, 0x03, 0x00, 0xf0,
+  0x00, 0x00, 0x3c, 0x00, 0x00, 0x0f, 0x00, 0xc0, 0x03, 0x00, 0xf0, 0x00, 0xfc, 0xff, 0x3f, 0xff,
+  0xff, 0x0f,
+  /* '2', offset=104 */
+  0xe4, 0x6f, 0xc0, 0xff, 0xff, 0xf0, 0x01, 0xbe, 0x04, 0x00, 0x3e, 0x00, 0x00, 0x1f, 0x00, 0xc0,
+  0x03, 0x00, 0xf4, 0x00, 0x00, 0x2f, 0x00, 0xd0, 0x03, 0x00, 0x7d, 0x00, 0xc0, 0x07, 0x00, 0xbc,
+  0x00, 0xc0, 0x0b, 0x00, 0xbc, 0x00, 0xc0, 0x0b, 0x00, 0xf8, 0x00, 0x00, 0xff, 0xff, 0xdf, 0xff,
+  0xff, 0x07,
+  /* '3', offset=154 */
+  0xf9, 0x7f, 0xc0, 0xff, 0xff, 0xa0, 0x01, 0xfd, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x0f, 0x00, 0xd0,
+  0x03, 0x00, 0xbd, 0x40, 0xff, 0x07, 0xd0, 0xff, 0x01, 0x00, 0xf8, 0x02, 0x00, 0xf4, 0x00, 0x00,
+  0x7c, 0x00, 0x00, 0x2e, 0x00, 0xc0, 0x0b, 0x00, 0xf4, 0x1d, 0x80, 0x3f, 0xff, 0xff, 0x43, 0xfe,
+  0x1f, 0x00,
+  /* '4', offset=204 */
+  0x00, 0xc0, 0x0f, 0x00, 0xe0, 0x0f, 0x00, 0xf4, 0x0f, 0x00, 0x7c, 0x0f, 0x00, 0x5d, 0x0f, 0x00,
+  0x4f, 0x0f, 0x80, 0x43, 0x0f, 0xd0, 0x42, 0x0f, 0xf0, 0x40, 0x0f, 0xb4, 0x40, 0x0f, 0x3c, 0x40,
+  0x0f, 0x1e, 0x40, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x40, 0x0f, 0x00, 0x40, 0x0f,
+  0x00, 0x40, 0x0f, 0x00, 0x40, 0x0f,
+  /* '5', offset=258 */
+  0xfe, 0xff, 0x87, 0xff, 0xff, 0xe1, 0x02, 0x00, 0xb8, 0x00, 0x00, 0x2e, 0x00, 0x80, 0x0b, 0x00,
+  0xe0, 0xff, 0x06, 0xf8, 0xff, 0x0b, 0x05, 0xe0, 0x0b, 0x00, 0xe0, 0x03, 0x00, 0xf0, 0x01, 0x00,
+  0x7c, 0x00, 0x00, 0x1f, 0x00, 0xc0, 0x07, 0x00, 0xf8, 0x1c, 0x80, 0x2f, 0xff, 0xff, 0x42, 0xfe,
+  0x1b, 0x00,
+  /* '6', offset=308 */
+  0x00, 0xfd, 0x0b, 0xc0, 0xff, 0x2f, 0xf0, 0x07, 0x14, 0xf4, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x3c,
+  0x00, 0x00, 0x3d, 0xfd, 0x02, 0x7d, 0xff, 0x1f, 0xfd, 0x02, 0x3e, 0xfd, 0x00, 0xbc, 0x7d, 0x00,
+  0xf8, 0x3d, 0x00, 0xf4, 0x3c, 0x00, 0xf4, 0x7c, 0x00, 0xf8, 0xf8, 0x00, 0xbc, 0xf0, 0x02, 0x3f,
+  0xd0, 0xff, 0x1f, 0x40, 0xfe, 0x02,
+  /* '7', offset=362 */
+  0xff, 0xff, 0xef, 0xff, 0xff, 0x07, 0x00, 0xf0, 0x00, 0x00, 0x2e, 0x00, 0xc0, 0x07, 0x00, 0xf4,
+  0x00, 0x00, 0x2e, 0x00, 0xc0, 0x07, 0x00, 0xf4, 0x00, 0x00, 0x2f, 0x00, 0xc0, 0x03, 0x00, 0xf8,
+  0x00, 0x00, 0x1f, 0x00, 0xd0, 0x03, 0x00, 0xb8, 0x00, 0x00, 0x1f, 0x00, 0xe0, 0x03, 0x00, 0xbc,
+  0x00, 0x00,
+  /* '8', offset=412 */
+  0x40, 0xff, 0x02, 0xf0, 0xff, 0x1f, 0xf8, 0x01, 0x3f, 0xbc, 0x00, 0x7c, 0x7c, 0x00, 0x7c, 0xbc,
+  0x00, 0x3c, 0xf0, 0x01, 0x2f, 0x80, 0xff, 0x07, 0xd0, 0xff, 0x0b, 0xf4, 0x01, 0x3f, 0x7c, 0x00,
+  0x7c, 0x3d, 0x00, 0xf8, 0x3d, 0x00, 0xf8, 0x3d, 0x00, 0xf8, 0x7c, 0x00, 0xbc, 0xfc, 0x01, 0x3f,
+  0xf0, 0xff, 0x1f, 0x80, 0xff, 0x02,
+  /* '9', offset=466 */
+  0x80, 0xff, 0x01, 0xf0, 0xff, 0x0f, 0xf8, 0x41, 0x2f, 0x7c, 0x00, 0x3d, 0x3d, 0x00, 0x7c, 0x3d,
+  0x00, 0xbc, 0x3d, 0x00, 0xbc, 0x3d, 0x00, 0xfc, 0x7c, 0x00, 0xfd, 0xf8, 0x41, 0xff, 0xf0, 0xff,
+  0xb7, 0x80, 0xbf, 0xb8, 0x00, 0x00, 0x78, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3e, 0x20, 0x80, 0x0f,
+  0xf0, 0xff, 0x07, 0xe0, 0xbf, 0x00,
+  /* '.', offset=520 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xf4, 0xdb, 0x6f, 0xbf, 0xfd, 0xf6, 0x0b,
+  /* 'V', offset=543 */
+  0x1f, 0x00, 0xf0, 0xbe, 0x00, 0xc0, 0xe7, 0x03, 0x40, 0x4f, 0x0f, 0x00, 0x3e, 0x7c, 0x00, 0x7c,
+  0xf0, 0x02, 0xf0, 0x40, 0x0f, 0xd0, 0x03, 0x3c, 0x80, 0x0b, 0xf0, 0x01, 0x1f, 0x80, 0x0b, 0x3c,
+  0x00, 0x3d, 0xf4, 0x00, 0xf0, 0xe0, 0x02, 0xc0, 0xc7, 0x03, 0x00, 0x2d, 0x0f, 0x00, 0xf0, 0x2d,
+  0x00, 0xc0, 0x7f, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xf4, 0x03, 0x00,
+  /* 'A', offset=602 */
+  0x00, 0xf4, 0x03, 0x00, 0x80, 0x3f, 0x00, 0x00, 0xfc, 0x07, 0x00, 0xc0, 0xb7, 0x00, 0x00, 0x2e,
+  0x0f, 0x00, 0xf0, 0xf1, 0x01, 0x00, 0x0f, 0x2e, 0x00, 0xb4, 0xd0, 0x03, 0x80, 0x07, 0x3c, 0x00,
+  0x3c, 0x80, 0x07, 0xd0, 0x03, 0xf4, 0x00, 0xfe, 0xff, 0x0f, 0xf0, 0xff, 0xff, 0x01, 0x0f, 0x00,
+  0x2e, 0xf8, 0x00, 0xd0, 0xc3, 0x0b, 0x00, 0x7c, 0x7c, 0x00, 0xc0, 0xdb, 0x03, 0x00, 0xf8,
+  /* 'W', offset=665 */
+  0x1f, 0x00, 0x00, 0xff, 0x01, 0x00, 0xf0, 0x2e, 0x00, 0x00, 0xdf, 0x02, 0x00, 0xf4, 0x3d, 0xf0,
+  0x42, 0xcf, 0x43, 0x2f, 0xb4, 0x3c, 0xf4, 0x83, 0xcb, 0x83, 0x3b, 0x78, 0x7c, 0x7c, 0xc7, 0x83,
+  0xc7, 0xb2, 0x3c, 0xb4, 0x1d, 0xcb, 0x43, 0xdb, 0xf0, 0x3c, 0xf0, 0x0e, 0xde, 0x02, 0xff, 0xd0,
+  0x1e, 0xf0, 0x0b, 0xfc, 0x01, 0x7f, 0xc0, 0x0f, 0xe0, 0x03, 0xf8, 0x00, 0x3d, 0x80, 0x0f,
 };
 
 const uint8_t font_meter_medium_widths[96] = {
-     5u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,    0u,    0u,    0u,    0u,    0u,    3u,    0u,
-     8u,    5u,    8u,    8u,    9u,    8u,    8u,    8u,
-     8u,    8u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,   12u,    0u,    0u,    0u,    0u,    0u,    0u,
+    14u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
+     0u,    0u,    0u,    0u,    0u,    0u,    5u,    0u,
+    12u,   11u,   11u,   11u,   12u,   11u,   12u,   11u,
+    12u,   12u,    0u,    0u,    0u,    0u,    0u,    0u,
+     0u,   14u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,    0u,    0u,    0u,    0u,    0u,   11u,    0u,
+     0u,    0u,    0u,    0u,    0u,    0u,   13u,   14u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
@@ -73,12 +91,12 @@ const uint8_t font_meter_medium_widths[96] = {
 
 const uint8_t font_meter_medium_sizes[96] = {
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,    0u,    0u,    0u,    0u,    0u,   13u,    0u,
-    34u,   22u,   34u,   34u,   39u,   34u,   34u,   34u,
-    34u,   34u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,   51u,    0u,    0u,    0u,    0u,    0u,    0u,
+     0u,    0u,    0u,    0u,    0u,    0u,   23u,    0u,
+    54u,   50u,   50u,   50u,   54u,   50u,   54u,   50u,
+    54u,   54u,    0u,    0u,    0u,    0u,    0u,    0u,
+     0u,   63u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,    0u,    0u,    0u,    0u,    0u,   47u,    0u,
+     0u,    0u,    0u,    0u,    0u,    0u,   59u,   63u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
@@ -88,12 +106,12 @@ const uint8_t font_meter_medium_sizes[96] = {
 
 const uint16_t font_meter_medium_offsets[96] = {
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,    0u,    0u,    0u,    0u,    0u,  333u,    0u,
-     0u,   34u,   56u,   90u,  124u,  163u,  197u,  231u,
-   265u,  299u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,  393u,    0u,    0u,    0u,    0u,    0u,    0u,
+     0u,    0u,    0u,    0u,    0u,    0u,  520u,    0u,
+     0u,   54u,  104u,  154u,  204u,  258u,  308u,  362u,
+   412u,  466u,    0u,    0u,    0u,    0u,    0u,    0u,
+     0u,  602u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
-     0u,    0u,    0u,    0u,    0u,    0u,  346u,    0u,
+     0u,    0u,    0u,    0u,    0u,    0u,  543u,  665u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,
      0u,    0u,    0u,    0u,    0u,    0u,    0u,    0u,

opendps/font-meter_medium.h

@@ -1,21 +1,21 @@
-/** Font generated from `./gen_lookup.py -f gfx/Ubuntu-C.ttf -s 24 -o meter_medium` */
+/** Font generated from gfx/nf.ttf 24pt */
 
 #ifndef __FONT_METER_MEDIUM_H__
 #define __FONT_METER_MEDIUM_H__
 
 #include <stdint.h>
 
-#define FONT_METER_MEDIUM_MAX_GLYPH_HEIGHT (17)
-#define FONT_METER_MEDIUM_MAX_GLYPH_WIDTH  (12)
-#define FONT_METER_MEDIUM_MAX_DIGIT_WIDTH  (9)
-#define FONT_METER_MEDIUM_DOT_WIDTH        (3)
+#define FONT_METER_MEDIUM_MAX_GLYPH_HEIGHT (18)
+#define FONT_METER_MEDIUM_MAX_GLYPH_WIDTH  (14)
+#define FONT_METER_MEDIUM_MAX_DIGIT_WIDTH  (12)
+#define FONT_METER_MEDIUM_DOT_WIDTH        (5)
 #define FONT_METER_MEDIUM_SPACING          (2)
-#define FONT_METER_MEDIUM_SPACE_WIDTH      (5)
+#define FONT_METER_MEDIUM_SPACE_WIDTH      (14)
 
 extern const uint32_t font_meter_medium_height;
 extern const uint8_t font_meter_medium_widths[96];
 extern const uint8_t font_meter_medium_sizes[96];
 extern const uint16_t font_meter_medium_offsets[96];
-extern const uint8_t font_meter_medium_pixdata[444];
+extern const uint8_t font_meter_medium_pixdata[728];
 
 #endif // __FONT_METER_MEDIUM_H__