[FL-2052] New build system based on scons (#1269)
This commit is contained in:
30
applications/desktop/application.fam
Normal file
30
applications/desktop/application.fam
Normal file
@@ -0,0 +1,30 @@
|
||||
App(
|
||||
appid="desktop",
|
||||
name="DesktopSrv",
|
||||
apptype=FlipperAppType.SERVICE,
|
||||
entry_point="desktop_srv",
|
||||
cdefines=["SRV_DESKTOP"],
|
||||
requires=[
|
||||
"gui",
|
||||
"dolphin",
|
||||
"storage",
|
||||
"input",
|
||||
],
|
||||
provides=["desktop_settings"],
|
||||
conflicts=["updater"],
|
||||
stack_size=2 * 1024,
|
||||
order=60,
|
||||
)
|
||||
|
||||
App(
|
||||
appid="desktop_settings",
|
||||
name="Desktop",
|
||||
apptype=FlipperAppType.SETTINGS,
|
||||
entry_point="desktop_settings_app",
|
||||
requires=[
|
||||
"desktop",
|
||||
"gui",
|
||||
],
|
||||
stack_size=1 * 1024,
|
||||
order=50,
|
||||
)
|
@@ -46,7 +46,10 @@ void desktop_debug_render(Canvas* canvas, void* model) {
|
||||
canvas_draw_str(canvas, 5, 19 + STATUS_BAR_Y_SHIFT, buffer);
|
||||
|
||||
ver = furi_hal_version_get_firmware_version();
|
||||
|
||||
const BleGlueC2Info* c2_ver = NULL;
|
||||
#ifdef SRV_BT
|
||||
c2_ver = ble_glue_get_c2_info();
|
||||
#endif
|
||||
if(!ver) {
|
||||
canvas_draw_str(canvas, 5, 29 + STATUS_BAR_Y_SHIFT, "No info");
|
||||
return;
|
||||
@@ -63,10 +66,11 @@ void desktop_debug_render(Canvas* canvas, void* model) {
|
||||
snprintf(
|
||||
buffer,
|
||||
sizeof(buffer),
|
||||
"%s%s [%s]",
|
||||
"%s%s [%s] %s",
|
||||
version_get_dirty_flag(ver) ? "[!] " : "",
|
||||
version_get_githash(ver),
|
||||
version_get_gitbranchnum(ver));
|
||||
version_get_gitbranchnum(ver),
|
||||
c2_ver ? c2_ver->StackTypeString : "<none>");
|
||||
canvas_draw_str(canvas, 5, 39 + STATUS_BAR_Y_SHIFT, buffer);
|
||||
|
||||
snprintf(
|
||||
|
Reference in New Issue
Block a user