M harmony_changelog.md => harmony_changelog.md +1 -0
@@ 17,6 17,7 @@
* Added switching SDRAM to self-refresh before entering WFI for further power consumption reduction
* Added watchdog protection to WFI mode
* Added low battery warning when the alarm is activated
+* Added new 32px and 170px fonts
### Changed / Improved
M module-apps/apps-common/widgets/TimeSetSpinner.hpp => module-apps/apps-common/widgets/TimeSetSpinner.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 54,7 54,7 @@ namespace gui
{style::window::font::large, "alarm_large_colon_W_M"},
{style::window::font::supersizeme, "alarm_colon_select_W_M"},
{style::window::font::supersizemelight, "alarm_colon_select_W_M"},
- {style::window::font::huge, "alarm_colon_clock_W_M"},
+ {style::window::font::huge, "alarm_colon_huge_W_M"},
{style::window::font::gargantuan, "alarm_colon_clock_W_M"}};
// clang-format off
M module-gui/gui/widgets/Style.hpp => module-gui/gui/widgets/Style.hpp +48 -1
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 58,27 58,74 @@ namespace style
inline constexpr auto default_rect_yaps = 10U;
namespace font
{
+ /// numeric
+ /// 220 px (regular)
inline constexpr auto gargantuan = "gargantuan";
+ /// numeric
+ /// 200 px (light)
inline constexpr auto colossal = "colossal";
+ /// numeric
+ /// 170 px (regular)
inline constexpr auto huge = "huge";
+ /// alpha-numeric (with special characters)
+ /// 90 px (regular)
inline constexpr auto supersizeme = "supersizeme";
+ /// alpha-numeric (with special characters)
+ /// 90 px (light)
inline constexpr auto supersizemelight = "supersizemelight";
+ /// alpha-numeric (with special characters)
+ /// 46 px (light)
inline constexpr auto largelight = "largelight";
+ /// alpha-numeric (with special characters)
+ /// 46 px (regular)
inline constexpr auto large = "large";
+ /// alpha-numeric (without special characters)
+ /// 40 px (light)
inline constexpr auto veryverybiglight = "veryverybiglight";
+ /// alpha-numeric (with special characters)
+ /// 38 px (light)
inline constexpr auto verybiglight = "verybiglight";
+ /// alpha-numeric (with special characters)
+ /// 38 px (regular)
inline constexpr auto verybig = "verybig";
+ /// alpha-numeric (with special characters)
+ /// 38 px (bold)
inline constexpr auto verybigbold = "verybigbold";
+ /// alpha-numeric (with special characters)
+ /// 32 px (light)
+ inline constexpr auto mediumbiglight = "mediumbiglight";
+ /// alpha-numeric (with special characters)
+ /// 32 px (bold)
inline constexpr auto mediumbigbold = "mediumbigbold";
+ /// alpha-numeric (with special characters)
+ /// 30 px (bold)
inline constexpr auto bigbold = "bigbold";
+ /// alpha-numeric (with special characters)
+ /// 30 px (regular)
inline constexpr auto big = "big";
+ /// alpha-numeric (with special characters)
+ /// 30 px (light)
inline constexpr auto biglight = "biglight";
+ /// alpha-numeric (with special characters)
+ /// 27 px (bold)
inline constexpr auto mediumbold = "mediumbold";
+ /// alpha-numeric (with special characters)
+ /// 27 px (regular)
inline constexpr auto medium = "medium";
+ /// alpha-numeric (with special characters)
+ /// 27 px (light)
inline constexpr auto mediumlight = "mediumlight";
+ /// alpha-numeric (with special characters)
+ /// 24 px (bold)
inline constexpr auto smallbold = "smallbold";
+ /// alpha-numeric (with special characters)
+ /// 24 px (regular)
inline constexpr auto small = "small";
+ /// alpha-numeric (with special characters)
+ /// 20 px (bold)
inline constexpr auto verysmallbold = "verysmallbold";
+ /// alpha-numeric (with special characters)
+ /// 20 px (regular)
inline constexpr auto verysmall = "verysmall";
}; // namespace font
M products/BellHybrid/CMakeLists.txt => products/BellHybrid/CMakeLists.txt +2 -2
@@ 143,14 143,14 @@ download_asset_release_json(json-common-target
${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json
${SYSROOT_PATH}/system_a/
MuditaOSPublicAssets
- 0.0.20
+ 0.0.21
${MUDITA_CACHE_DIR}
)
download_asset_release_json(json-community-target
${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json
${SYSROOT_PATH}/system_a/
MuditaOSPublicAssets
- 0.0.20
+ 0.0.21
${MUDITA_CACHE_DIR}
)
download_asset_json(json-rt1051-target
M products/BellHybrid/assets/assets_common.json => products/BellHybrid/assets/assets_common.json +1 -0
@@ 37,6 37,7 @@
{"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_status_empty_W_M.vpi", "output": "assets/images/bell_battery_status_empty_W_M.vpi"},
{"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_very_big_logo_W_G.vpi", "output": "assets/images/bell_very_big_logo_W_G.vpi"},
{"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_clock_W_M.vpi", "output": "assets/images/alarm_colon_clock_W_M.vpi"},
+ {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_huge_W_M.vpi", "output": "assets/images/alarm_colon_huge_W_M.vpi"},
{"name": "release.tgz", "tarfile" :"image/assets/images/bell/icon_folder_W_M.vpi", "output": "assets/images/icon_folder_W_M.vpi"},
{"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_namaste_W_G.vpi", "output": "assets/images/big_namaste_W_G.vpi"},
{"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl3_W_M.vpi", "output": "assets/images/bell_battery_lvl3_W_M.vpi"},
M products/BellHybrid/assets/assets_proprietary.json => products/BellHybrid/assets/assets_proprietary.json +14 -5
@@ 10,6 10,10 @@
"output": "assets/fonts/dejavu_sans_bold_27.mpf"
},
{
+ "name": "./fonts/pure/gt_pressura_bold_32.mpf",
+ "output":"assets/fonts/gt_pressura/gt_pressura_bold_32.mpf"
+ },
+ {
"name": "./fonts/bell/gt_pressura_regular_38.mpf",
"output": "assets/fonts/gt_pressura/gt_pressura_regular_38.mpf",
"ref": "fd168040c5d1216d457e6cf223e8ea9bb76bf7b"
@@ 30,11 34,6 @@
"output": "assets/fonts/gt_pressura/gt_pressura_regular_90.mpf"
},
{
- "name": "./fonts/bell/gt_pressura_regular_190.mpf",
- "ref": "10c74fcb09c2022325767cad735c0183b6f5393a",
- "output": "assets/fonts/gt_pressura/gt_pressura_regular_190.mpf"
- },
- {
"name": "./fonts/bell/gt_pressura_light_200.mpf",
"ref": "6e0731ffcc08a682010bb7724a5e1f230a273e2a",
"output": "assets/fonts/gt_pressura/gt_pressura_light_200.mpf"
@@ 78,6 77,16 @@
"name": "./fonts/bell/gt_pressura_bold_38.mpf",
"output": "assets/fonts/gt_pressura/gt_pressura_bold_38.mpf",
"ref": "a5a432e1330f2728d7f943ccc9dbb678c3f9ebca"
+ },
+ {
+ "name": "./fonts/bell/gt_pressura_regular_170.mpf",
+ "output": "assets/fonts/gt_pressura/gt_pressura_regular_170.mpf",
+ "ref": "0cf242e02002bc0af4216a00ac7501a1fbe1ba1e"
+ },
+ {
+ "name": "./fonts/bell/gt_pressura_light_32.mpf",
+ "output": "assets/fonts/gt_pressura/gt_pressura_light_32.mpf",
+ "ref": "bb0da198fd4711072bf69e19136feae28db4e375"
}
]
}