Skip to content

Commit

Permalink
populate licence in system info menu
Browse files Browse the repository at this point in the history
  • Loading branch information
df8oe committed Feb 22, 2017
1 parent 994c65f commit ed47933
Show file tree
Hide file tree
Showing 8 changed files with 1,204 additions and 1,176 deletions.
6 changes: 6 additions & 0 deletions mchf-eclipse/drivers/ui/menu/ui_menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,12 @@ const char* UiMenu_GetSystemInfo(uint32_t* m_clr_ptr, int info_item)
{
snprintf(out,32, "%s", ts.vbat_present?"Yes":"N/A");

}
break;
case INFO_LICENCE:
{
outs="";

}
break;
default:
Expand Down
3 changes: 2 additions & 1 deletion mchf-eclipse/drivers/ui/menu/ui_menu.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ enum MENU_INFO_ITEM
INFO_BL_VERSION,
INFO_BUILD,
INFO_RTC,
INFO_VBAT
INFO_VBAT,
INFO_LICENCE
};

const char* UiMenu_GetSystemInfo(uint32_t* m_clr_ptr, int info_item);
Expand Down
1 change: 1 addition & 0 deletions mchf-eclipse/drivers/ui/menu/ui_menu_structure.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ const MenuDescriptor infoGroup[] =
{ MENU_SYSINFO, MENU_INFO, INFO_VHFUHFMOD, NULL,"V/UHF Mod", UiMenuDesc("VHF/UHF bands expansion PCB present?") },
{ MENU_SYSINFO, MENU_INFO, INFO_VBAT, NULL,"Backup RAM Battery", UiMenuDesc("Battery Support for Backup RAM present?") },
{ MENU_SYSINFO, MENU_INFO, INFO_RTC, NULL,"Real Time Clock", UiMenuDesc("Battery Supported Real Time Clock present?") },
{ MENU_SYSINFO, MENU_INFO, INFO_LICENCE, NULL,"FW licensed under GNU GPLv3", UiMenuDesc("Display license of firmware") },
{ MENU_SYSINFO, MENU_STOP, 0, NULL, NULL, UiMenuDesc("") }
};

Expand Down
2 changes: 1 addition & 1 deletion mchf-eclipse/support/ui/menu/menu-handbook-build.timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2017-02-22 17:38:52.903547371 +0100
2017-02-22 18:41:17.826872600 +0100
11 changes: 9 additions & 2 deletions mchf-eclipse/support/ui/menu/ui_menu_structure_graph.gv
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# WARNING: generated data! DO NOT EDIT MANUALLY ! ! !
#
# generated at 2017-02-22T17:49:46 by "./ui_menu_structure_graph.py"
# generated at 2017-02-22T18:41:22 by "./ui_menu_structure_graph.py"
#
# mcHF SDR TRX v1.5.9 - Menu Structure Diagram in DOT-language
#
Expand All @@ -12,7 +12,7 @@
digraph mcHF_menus {

graph [ fontsize = 14,
label = "\nmcHF v1.5.9 - Menus Overview\ngenerated at 2017-02-22T17:49:46 by \"./ui_menu_structure_graph.py\"",
label = "\nmcHF v1.5.9 - Menus Overview\ngenerated at 2017-02-22T18:41:22 by \"./ui_menu_structure_graph.py\"",
];

rankdir=LR
Expand Down Expand Up @@ -962,6 +962,11 @@
shape = record
];

"INFO_LICENCE" [
label = "INFO_LICENCE | FW licensed under GNU GPLv3"
shape = record
];

"MENU_DEBUG_TX_AUDIO" [
label = "MENU_DEBUG_TX_AUDIO | TX Audio via USB"
shape = record
Expand Down Expand Up @@ -1335,6 +1340,8 @@

MENU_SYSINFO -> INFO_RTC

MENU_SYSINFO -> INFO_LICENCE

} ## END subgraph MENU_DEBUG

# - - - -
Expand Down
Binary file modified mchf-eclipse/support/ui/menu/ui_menu_structure_graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,352 changes: 1,182 additions & 1,170 deletions mchf-eclipse/support/ui/menu/ui_menu_structure_graph.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions mchf-eclipse/support/ui/menu/ui_menu_structure_mdtable.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[//]: # ( )
[//]: # ( WARNING: generated data! DO NOT EDIT MANUALLY ! ! ! )
[//]: # ( )
[//]: # ( generated at 2017-02-22T17:49:48 by "./ui_menu_structure_mdtable.py" )
[//]: # ( generated at 2017-02-22T18:41:23 by "./ui_menu_structure_mdtable.py" )
[//]: # ( )
[//]: # ( mcHF SDR TRX v1.5.9 - Menu Structure Diagram as MarkDown-Table )
[//]: # ( )
Expand All @@ -11,7 +11,7 @@

# mcHF FW v1.5.9 - UI Menu Overview

generated at 2017-02-22T17:49:48 by "./ui_menu_structure_mdtable.py"
generated at 2017-02-22T18:41:23 by "./ui_menu_structure_mdtable.py"



Expand Down Expand Up @@ -234,6 +234,7 @@ generated at 2017-02-22T17:49:48 by "./ui_menu_structure_mdtable.py"
| **V/UHF Mod** ( INFO_VHFUHFMOD) | VHF/UHF bands expansion PCB present? |
| **Backup RAM Battery** ( INFO_VBAT) | Battery Support for Backup RAM present? |
| **Real Time Clock** ( INFO_RTC) | Battery Supported Real Time Clock present? |
| **FW licensed under GNU GPLv3** ( INFO_LICENCE) | Display license of firmware |


## Debug/Exper. Settings (`MENU_DEBUG`)
Expand Down

0 comments on commit ed47933

Please sign in to comment.