Skip to content

Commit 2df7bcc

Browse files
elitewill1200jonpas
elitewill1200
and
jonpas
authored
PRC-152 - Add/Fix PGM Features (#1408)
Co-authored-by: jonpas <jonpas33@gmail.com>
1 parent de22cfb commit 2df7bcc

File tree

6 files changed

+987
-689
lines changed

6 files changed

+987
-689
lines changed

‎addons/sys_prc152/farris_menus/Main.sqf‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#include "..\script_component.hpp"
22
//#define DEBUG_MODE_FULL
33

4-
4+
#define GET_RADIO_VALUE(x) [x] call FUNC(CURRENT_RADIO_VALUE)
55
GVAR(OFF) = ["OFF", "OFF", "", MENUTYPE_STATIC, [],[ nil,nil, nil ] ];
66
[GVAR(OFF)] call FUNC(createMenu);
77

88
GVAR(INVALID_MODE) = ["INVALID_MODE", "INVALID_MODE", "",
99
MENUTYPE_STATIC,
1010
[
11-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
11+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
1212
[ROW_XLARGE_1, ALIGN_LEFT, "INVALID MODE"],
1313
[ROW_LARGE_2, ALIGN_LEFT, "ONLY PT SUPPORTED"]
1414
],
@@ -24,7 +24,7 @@ GVAR(INVALID_MODE) = ["INVALID_MODE", "INVALID_MODE", "",
2424
GVAR(VOLUME) = ["VOLUME", "VOLUME", "",
2525
MENUTYPE_STATIC,
2626
[
27-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
27+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
2828
[ROW_LARGE_2, ALIGN_CENTER, "VOLUME"]
2929
],
3030
[
@@ -48,8 +48,8 @@ GVAR(VOLUME) = ["VOLUME", "VOLUME", "",
4848
GVAR(NoItems) = ["ERROR_NOENTRY", "ERROR_NOENTRY", "",
4949
MENUTYPE_STATIC,
5050
[
51-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
52-
[ROW_LARGE_2, ALIGN_LEFT, "<NO ITEMS IN MENU>"],
51+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
52+
[ROW_LARGE_2, ALIGN_CENTER, "<NO ITEMS IN MENU>"],
5353
[ROW_SMALL_5, ALIGN_CENTER, "ENT OR CLR TO CONT"]
5454
],
5555
[
@@ -77,10 +77,10 @@ GVAR(VULOSHOME) = ["VULOSHOME", "VULOSHOME", "",
7777
["VULOSHOME-MAIN", "VULOSHOME-MAIN", "",
7878
MENUTYPE_STATIC,
7979
[
80-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
80+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
8181
[ROW_LARGE_2, ALIGN_LEFT, "$cch-number-$cch-description"],
82-
[ROW_LARGE_3, ALIGN_LEFT, "LOS VOC $cch-modulation --- --"],
83-
[ROW_SMALL_5, ALIGN_LEFT, "TYPE TRF MOD CHAN KEY"]
82+
[ROW_LARGE_3, ALIGN_LEFT, "LOS VOC $cch-modulation --- $cch-tek"],
83+
[ROW_SMALL_5, ALIGN_LEFT, " TYPE TRF MOD CHAN KEY"]
8484
],
8585
[
8686
nil,
@@ -109,7 +109,7 @@ GVAR(VULOSHOME) = ["VULOSHOME", "VULOSHOME", "",
109109
["VULOSHOME-CHANNEL", "VULOSHOME-CHANNEL", "",
110110
MENUTYPE_STATIC,
111111
[
112-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
112+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
113113
[ROW_LARGE_2, ALIGN_LEFT, "R: $cch-frequencyrx"],
114114
[ROW_LARGE_3, ALIGN_LEFT, "T: $cch-frequencytx ---"],
115115
[ROW_SMALL_5, ALIGN_LEFT, " FREQUENCY CHAN"]
@@ -141,9 +141,9 @@ GVAR(VULOSHOME) = ["VULOSHOME", "VULOSHOME", "",
141141
["VULOSHOME-DATA", "VULOSHOME-DATA", "",
142142
MENUTYPE_STATIC,
143143
[
144-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
145-
[ROW_LARGE_2, ALIGN_LEFT, "--- ----- --"],
146-
[ROW_LARGE_3, ALIGN_LEFT, "$cch-optioncode ---- ANLG -- OFF"],
144+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
145+
[ROW_LARGE_2, ALIGN_LEFT, "25K $cch-trafficrate.0K $cch-modulation"],
146+
[ROW_LARGE_3, ALIGN_LEFT, "$cch-optioncode ---- CLR -- OFF"],
147147
[ROW_SMALL_5, ALIGN_LEFT, "OPT DATA VOICE INTLV FEC"]
148148
],
149149
[
@@ -173,31 +173,14 @@ GVAR(VULOSHOME) = ["VULOSHOME", "VULOSHOME", "",
173173
["VULOSHOME-LARGEFONT", "VULOSHOME-LARGEFONT", "",
174174
MENUTYPE_STATIC,
175175
[
176-
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch ----- $cch-encryption"],
177-
[ROW_XLARGE_2, ALIGN_LEFT, "$cch-number*$cch-description"]
176+
[ROW_SMALL_1, ALIGN_LEFT, "$transmitting $bat $cch-channelmode $cch-squelch $cch-encryption"],
177+
[ROW_XLARGE_2, ALIGN_LEFT, "$cch-number-$cch-description"]
178178
],
179179
[
180180
nil, // onEntry
181181
nil, // onExit. Our parent static display generic event handler handles the 'Next' key
182182
nil,
183-
{
184-
[ICON_BATTERY, false] call FUNC(toggleIcon);
185-
[ICON_VOLUME, true] call FUNC(toggleIcon);
186-
[ICON_TRANSMIT, true] call FUNC(toggleIcon);
187-
[ICON_TRANSMITBAR, true] call FUNC(toggleIcon);
188-
189-
private _volume = GET_STATE("volume");
190-
private _display = uiNamespace getVariable [QGVAR(currentDisplay), displayNull];
191-
private _recStrength = SCRATCH_GET_DEF(GVAR(currentRadioID),"receivingSignal",0);
192-
193-
TRACE_2("Rendering VOLUME-STAGE-1",_volume,_display);
194-
if (!isNull _display) then {
195-
(_display displayCtrl ICON_VOLUME) progressSetPosition _volume;
196-
(_display displayCtrl ICON_VOLUME) ctrlCommit 0;
197-
(_display displayCtrl ICON_TRANSMITBAR) progressSetPosition _recStrength;
198-
(_display displayCtrl ICON_TRANSMITBAR) ctrlCommit 0;
199-
};
200-
}
183+
nil
201184
]
202185
]
203186
],

‎addons/sys_prc152/farris_menus/OPT.sqf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ GVAR(OPT) = ["OPT", "OPT", "OPT",
6464
MENUTYPE_LIST,
6565
[
6666
// TODO: Locks all but next. 1,3,7,9 series unlocks. Display "Keypad is Locked"
67+
6768
[nil, "LOCK KEYPAD", "", MENU_ACTION_SUBMENU, ["ERROR_NOENTRY"], nil ],
6869
[nil, "RADIO OPTIONS", "", MENU_ACTION_SUBMENU, ["RADIO_OPTIONS"], nil ],
6970
[nil, "WAVEFORM OPTIONS", "", MENU_ACTION_SUBMENU, ["ERROR_NOENTRY"], nil ],

0 commit comments

Comments
 (0)