Racked radio speakers by TheMagnetar · Pull Request #481 · IDI-Systems/acre2

TheMagnetar · 2018-02-04T01:11:48Z

When merged this pull request will:

Adds rack radio speakers. Since no GUI is available for racks, the activation/deactivation of the speaker is done over ace interaction.
Note: to be merged after AN/VRC-64 #480

jonpas · 2018-02-09T15:33:13Z

Will review once #480 is merged.

Conflicts: addons/sys_rack/fnc_addRack.sqf addons/sys_rack/fnc_initVehicle.sqf addons/sys_rack/fnc_initializeRack.sqf addons/sys_rack/stringtable.xml

ColinM9991-zz · 2018-04-22T16:41:59Z

@jonpas

What's the update on your previous comment? It looks like #480 has been merged.

TheMagnetar · 2018-04-22T18:46:30Z

@ColinM9991 That it has been merged, it does not mean that it is going to be reviewed immediately. Note that this PR is labelled for 2.7 and 2.6 is not out yet.

tbeswick96 · 2018-04-30T15:12:39Z

Have an issue where once a radio speaker is turned on in a vehicle, it cannot be turned off, and any attempts to resolve it seem to bug the radio out, making it unusable

TheMagnetar · 2018-04-30T16:37:34Z

Ah, fixed internally. I never really pushed it.

Conflicts: addons/api/fnc_addRackToVehicle.sqf addons/sys_prc77/radio/fnc_initializeRadio.sqf addons/sys_rack/CfgAcreRacks.hpp addons/sys_rack/CfgVehicles.hpp addons/sys_rack/vrc64/__PREP__.sqf addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf addons/sys_rack/vrc64/fnc_vrc64MountableRadio.sqf addons/sys_rack/vrc64/fnc_vrc64UnmountRadio.sqf

jonpas · 2018-10-30T21:23:20Z

addons/ace_interact/fnc_radioChildrenActions.sqf

+    // Loudspeakers
+    if (_radio in ACRE_ACCESSIBLE_RACK_RADIOS) then {
+        if ([_radio, "isExternalAudio"] call EFUNC(sys_data,dataEvent)) then {
+            _action = ["acre_loudspeaker", localize ELSTRING(sys_rack,turnOffSpeaker), "", {[((_this select 2) select 0), false] call EFUNC(sys_rack,activateRackSpeaker)}, {true}, {}, _params] call ace_interact_menu_fnc_createAction;


jonpas · 2018-10-30T21:28:03Z

addons/sys_prc77/radio/fnc_getExternalAudioPosition.sqf

+private _obj = [_radioId] call EFUNC(sys_radio,getRadioObject);
+private _pos = getPosASL _obj;
+
+private _rackId = [_radioId] call EFUNC(sys_rack,getRackFromRadio);


This is all same for all radios, with just 2 cases based on handheld or rack radio. An outside function with arguments for that would probably be a good idea.

jonpas · 2018-10-30T21:28:20Z

addons/sys_prc77/radio/fnc_isExternalAudio.sqf

-false;
+params ["_radioId", "_event", "_eventData", "_radioData"];
+
+(HASH_GET(_radioData, "audioPath") == "RACKSPEAKER")


No need for outer parentheses.

jonpas · 2018-10-30T21:29:06Z

addons/sys_rack/fnc_activateRackSpeaker.sqf

+ #include "script_component.hpp"
+/*
+ * Author: ACRE2Team
+ * Sets the mounted radio external audio to ON/OFF.


* Toggles the mounted radio external audio.
Maybe rename the function accordingly as well.

jonpas · 2018-10-30T21:29:26Z

addons/sys_rack/fnc_activateRackSpeaker.sqf

+
+params ["_radioId", "_active", ["_rackId",""]];
+
+// TODO: For version 2.7. Implement check if rack has an external speaker


jonpas · 2018-10-30T21:31:24Z

addons/sys_rack/stringtable.xml

            <French>Arrêter de tout utiliser</French>
        </Key>
+        <Key ID="STR_ACRE_sys_rack_turnOnSpeaker">
+            <English>Turn On Speaker</English>


Does maybe Speaker On and Speaker Off fit better with the rest of action naming? (I am not sure.)

Soldia1138 · 2018-11-05T09:23:59Z

addons/sys_prc117f/fnc_initializeRadio.sqf

 HASH_SET(_radioData,"radioOn", 1);
 HASH_SET(_radioData,"pressedButton", -1);
-HASH_SET(_radioData,"powerSource", "BAT");
+HASH_SET(_radioData,"powerSource","BAT");


Our macro definition has spaces #define HASH_SET(hash, key, val)
To be consistent, I suggest:

Suggested change

HASH_SET(_radioData,"powerSource","BAT");

HASH_SET(_radioData," volume", 1);

HASH_SET(_radioData," currentChannel", 0);

HASH_SET(_radioData," radioOn", 1);

HASH_SET(_radioData," pressedButton", -1);

HASH_SET(_radioData," powerSource", "BAT");

HASH_SET(_radioData," pgm_pa_mode", "ON");

HASH_SET(_radioData," audioPath", "HEADSET");

Soldia1138 · 2018-11-05T09:27:47Z

addons/sys_prc152/fnc_initializeRadio.sqf

 HASH_SET(_radioData,"currentChannel",0);
 HASH_SET(_radioData,"radioOn",1);
-HASH_SET(_radioData,"audioPath", "TOPAUDIO");
+HASH_SET(_radioData,"audioPath","TOPAUDIO");


Same as above:

Suggested change

HASH_SET(_radioData,"audioPath","TOPAUDIO");

HASH_SET(_radioData, "volume", 1);

HASH_SET(_radioData, "currentChannel", 0);

HASH_SET(_radioData, "radioOn", 1);

HASH_SET(_radioData, "audioPath", "TOPAUDIO");

HASH_SET(_radioData, "powerSource", "BAT");

Soldia1138 · 2018-11-05T09:28:12Z

addons/sys_prc77/radio/fnc_initializeRadio.sqf

-HASH_SET(_radioData,"CTCSSTx", 150);
-HASH_SET(_radioData,"CTCSSRx", 150);
+HASH_SET(_radioData,"CTCSSTx",150);
+HASH_SET(_radioData,"CTCSSRx",150);


Same as above

Soldia1138 · 2018-11-05T09:30:08Z

addons/sys_rack/fnc_initializeRack.sqf

 HASH_SET(_rackData,"mountedRadio",_mountedRadio);
 HASH_SET(_rackData,"isRadioRemovable",_isRadioRemovable);
 HASH_SET(_rackData,"wiredIntercoms",_intercoms);
+HASH_SET(_rackData,"rackPosition",_rackPosition);


Same as above:

Suggested change

HASH_SET(_rackData,"rackPosition",_rackPosition);

HASH_SET(_rackData, "name", _displayName);

HASH_SET(_rackData, "shortName", _shortName);

HASH_SET(_rackData, "allowed", _allowed);

HASH_SET(_rackData, "disabled", _disabled);

HASH_SET(_rackData, "mountedRadio", _mountedRadio);

HASH_SET(_rackData, "isRadioRemovable", _isRadioRemovable);

HASH_SET(_rackData, "wiredIntercoms", _intercoms);

HASH_SET(_rackData, "rackPosition", _rackPosition);

HASH_SET(_rackData, "vehicle", _vehicle);

Soldia1138 · 2018-11-05T09:31:08Z

addons/sys_sem52sl/radio/fnc_initializeRadio.sqf

 HASH_SET(_radioData,"programmingStep", 0);
 HASH_SET(_radioData,"lastActiveChannel",0);
-HASH_SET(_radioData,"audioPath", "HEADSET");
+HASH_SET(_radioData,"audioPath","HEADSET");


Suggested change

HASH_SET(_radioData,"audioPath","HEADSET");

HASH_SET(_radioData, "volume", 1);

HASH_SET(_radioData, "radioOn", 1);

HASH_SET(_radioData, "currentChannel", 0);

HASH_SET(_radioData, "channelKnobPosition", 2); // Channel 1 (after on/off options)

HASH_SET(_radioData, "volumeKnobPosition", 0);// mid-way

HASH_SET(_radioData, "programmingStep", 0);

HASH_SET(_radioData, "lastActiveChannel", 0);

HASH_SET(_radioData, "audioPath", "HEADSET");

Soldia1138 · 2018-11-05T09:32:21Z

addons/sys_sem70/radio/fnc_initializeRadio.sqf

 //HASH_SET(_radioData,"lastActiveChannel",GVAR(manualChannel));
-HASH_SET(_radioData,"audioPath", "HEADSET");
-HASH_SET(_radioData,"powerSource", "BAT");
+HASH_SET(_radioData,"audioPath","HEADSET");


Suggested change

HASH_SET(_radioData,"audioPath","HEADSET");

// General

HASH_SET(_radioData, "radioOn", 1);

HASH_SET(_radioData, "volume", 1);

HASH_SET(_radioData, "currentChannel", GVAR(manualChannel)); // Manual Channel

HASH_SET(_radioData, "audioPath", "HEADSET");

HASH_SET(_radioData, "powerSource", "BAT");

// Channel

HASH_SET(_radioData, "manualChannelSelection", 1); // Manual Frequency Selection Flag

HASH_SET(_radioData, "power", 4000);

HASH_SET(_radioData, "channelSpacing", 0); // 0: 25kHz, 1: 50kHz

HASH_SET(_radioData, "CTCSS", 0);

HASH_SET(_radioData, "modulation", "FM");

HASH_SET(_radioData, "encryption", 0);

HASH_SET(_radioData, "squelch", 0);

// Knobs

HASH_SET(_radioData, "mainKnobPosition", 2); // High Power Setting

HASH_SET(_radioData, "functionKnobPosition", 2); // Manual Frequency Selection (no Relais)

HASH_SET(_radioData, "volumeKnobPosition", 5);

HASH_SET(_radioData, "channelSpacingKnobPosition", 1); // 0-3

HASH_SET(_radioData, "kHzKnobPosition", 0);

HASH_SET(_radioData, "MHzKnobPosition", 0);

HASH_SET(_radioData, "MemorySlotKnobPosition", 0);

HASH_SET(_radioData, "NetworkKnobPosition", [ARR_3(1,2,3)]);

Jason-Terry · 2019-08-15T15:50:23Z

Greetings, TheMagnetar are you still working on this?

TheMagnetar · 2019-08-15T16:16:33Z

Yes. But other systems need to be in place before

Quantx · 2022-11-22T10:23:13Z

Any progress on this? Is there any work that needs to be done on this that I can help contribute to in terms of code? This is a huge feature request of mine and I'd love to see it in ACRE2!

jonpas · 2022-11-22T13:00:29Z

Negative, currently we are not working on this.

Anyone is welcome to finish it however, it needs the addressed reviews and bringing it up-to-date with current codebase, as a starter.

TheMagnetar added 6 commits January 19, 2018 20:28

ANVRC64

05965fd

AN/VRC-64

df73459

Fix Tank rack

0a8fa26

Delete semi-colon

e5876eb

Merge branch 'anvrc64' into rackedRadioSpeakers

c03283c

Acre racks speakers

0868bcb

TheMagnetar added the enhancement label Feb 4, 2018

TheMagnetar added this to the 2.6.0 milestone Feb 4, 2018

TheMagnetar requested review from Soldia1138 and jonpas February 4, 2018 01:11

TheMagnetar added the needs testing label Feb 4, 2018

Missing file

679b8f2

jonpas modified the milestones: 2.6.0, 2.7.0 Feb 12, 2018

TheMagnetar added 4 commits February 15, 2018 00:11

Fix showing loudspeaker action without racks

b28f344

Merge branch 'master' into rackedRadioSpeakers

e6c0591

Conflicts: addons/sys_rack/fnc_addRack.sqf addons/sys_rack/fnc_initVehicle.sqf addons/sys_rack/fnc_initializeRack.sqf addons/sys_rack/stringtable.xml

Merge branch 'master' into rackedRadioSpeakers

7a747ed

Fixed API functions

a92855e

TheMagnetar added 2 commits October 16, 2018 11:15

Includes on top

f648539

jonpas requested changes Oct 30, 2018

View reviewed changes

Soldia1138 requested changes Nov 5, 2018

View reviewed changes

TheMagnetar modified the milestones: 2.7.0, 2.7.1 May 19, 2019

jonpas removed the enhancement label Aug 5, 2019

jonpas added the feature request label Aug 5, 2019

jonpas modified the milestones: 2.7.1, 2.8.0 Aug 5, 2019

jonpas modified the milestones: 2.7.2, 2.7.3 Nov 24, 2019

jonpas modified the milestones: 2.7.3, Backlog Apr 5, 2020


		params ["_radioId", "_active", ["_rackId",""]];

		// TODO: For version 2.7. Implement check if rack has an external speaker

-HASH_SET(_radioData,"powerSource","BAT");
+HASH_SET(_radioData," volume", 1);
+HASH_SET(_radioData," currentChannel", 0);
+HASH_SET(_radioData," radioOn", 1);
+HASH_SET(_radioData," pressedButton", -1);
+HASH_SET(_radioData," powerSource", "BAT");
+HASH_SET(_radioData," pgm_pa_mode", "ON");
+HASH_SET(_radioData," audioPath", "HEADSET");

-HASH_SET(_radioData,"audioPath","TOPAUDIO");
+HASH_SET(_radioData, "volume", 1);
+HASH_SET(_radioData, "currentChannel", 0);
+HASH_SET(_radioData, "radioOn", 1);
+HASH_SET(_radioData, "audioPath", "TOPAUDIO");
+HASH_SET(_radioData, "powerSource", "BAT");

-HASH_SET(_rackData,"rackPosition",_rackPosition);
+HASH_SET(_rackData, "name", _displayName);
+HASH_SET(_rackData, "shortName", _shortName);
+HASH_SET(_rackData, "allowed", _allowed);
+HASH_SET(_rackData, "disabled", _disabled);
+HASH_SET(_rackData, "mountedRadio", _mountedRadio);
+HASH_SET(_rackData, "isRadioRemovable", _isRadioRemovable);
+HASH_SET(_rackData, "wiredIntercoms", _intercoms);
+HASH_SET(_rackData, "rackPosition", _rackPosition);
+HASH_SET(_rackData, "vehicle", _vehicle);

-HASH_SET(_radioData,"audioPath","HEADSET");
+HASH_SET(_radioData, "volume", 1);
+HASH_SET(_radioData, "radioOn", 1);
+HASH_SET(_radioData, "currentChannel", 0);
+HASH_SET(_radioData, "channelKnobPosition",  2); // Channel 1 (after on/off options)
+HASH_SET(_radioData, "volumeKnobPosition",  0);// mid-way
+HASH_SET(_radioData, "programmingStep",  0);
+HASH_SET(_radioData, "lastActiveChannel", 0);
+HASH_SET(_radioData, "audioPath", "HEADSET");

-HASH_SET(_radioData,"audioPath","HEADSET");
+// General
+HASH_SET(_radioData, "radioOn", 1);
+HASH_SET(_radioData, "volume", 1);
+HASH_SET(_radioData, "currentChannel", GVAR(manualChannel)); // Manual Channel
+HASH_SET(_radioData, "audioPath", "HEADSET");
+HASH_SET(_radioData, "powerSource", "BAT");
+// Channel
+HASH_SET(_radioData, "manualChannelSelection", 1); // Manual Frequency Selection Flag
+HASH_SET(_radioData, "power", 4000);
+HASH_SET(_radioData, "channelSpacing", 0); // 0: 25kHz, 1: 50kHz
+HASH_SET(_radioData, "CTCSS", 0);
+HASH_SET(_radioData, "modulation", "FM");
+HASH_SET(_radioData, "encryption", 0);
+HASH_SET(_radioData, "squelch", 0);
+// Knobs
+HASH_SET(_radioData, "mainKnobPosition", 2); // High Power Setting
+HASH_SET(_radioData, "functionKnobPosition", 2); // Manual Frequency Selection (no Relais)
+HASH_SET(_radioData, "volumeKnobPosition", 5);
+HASH_SET(_radioData, "channelSpacingKnobPosition", 1); // 0-3
+HASH_SET(_radioData, "kHzKnobPosition", 0);
+HASH_SET(_radioData, "MHzKnobPosition", 0);
+HASH_SET(_radioData, "MemorySlotKnobPosition", 0);
+HASH_SET(_radioData, "NetworkKnobPosition", [ARR_3(1,2,3)]);

Conversation

TheMagnetar commented Feb 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonpas commented Feb 9, 2018

Uh oh!

ColinM9991-zz commented Apr 22, 2018

Uh oh!

TheMagnetar commented Apr 22, 2018

Uh oh!

tbeswick96 commented Apr 30, 2018

Uh oh!

TheMagnetar commented Apr 30, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jason-Terry commented Aug 15, 2019

Uh oh!

TheMagnetar commented Aug 15, 2019

Uh oh!

Quantx commented Nov 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonpas commented Nov 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

TheMagnetar commented Feb 4, 2018 •

edited

Loading

Quantx commented Nov 22, 2022 •

edited

Loading