Merge branch 'develop'

vladkorotnev · Nov 12, 2024 · eb27566 · eb27566
2 parents 135a5a3 + 6a5ef97
commit eb27566
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/data/lang/ja.lang b/data/lang/ja.lang
@@ -88,7 +88,7 @@
     "Blank display after (s)": "ブランキングまでの時間（秒）",
     "Turn display off after (s)": "消灯までの時間（秒）",
     "Use Fahrenheit for temperature": "温度の華氏度表示",
-    "FPS counter": "（開発向け）レンダリング間隔の表示,
+    "FPS counter": "（開発向け）レンダリング間隔の表示",
     "Weather effects": "天気予報により画面エフェクト",
     "Keypress beep": "ボタン操作音",
 

diff --git a/include/devices/big_clock.h b/include/devices/big_clock.h
@@ -3,7 +3,7 @@
 #include <hal/gpio_hal.h>
 #include <input/keypad.h>
 
-#define HAS_OTAFVU
+// #define HAS_OTAFVU
 #define HAS_OUTPUT_MD_PLASMA
 #define HAS_VARYING_BRIGHTNESS
 #define HAS_DISPLAY_BLANKING

diff --git a/src/network/otafvu.cpp b/src/network/otafvu.cpp
@@ -43,6 +43,7 @@ const font_range_t pixel_bar_font_ranges[] = {
 };
 
 const font_definition_t one_pixel_bar_font = {
+    .valid = true,
     .encoding = FONT_ENCODING_BESPOKE_ASCII,
     .glyph_format = SPRFMT_HORIZONTAL,
     .cursor_character = '|' - 1,