From f04741538662f0f169d045ca2787882fed8bc5ea Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 17 Sep 2023 13:01:43 -0500 Subject: [PATCH 1/5] Racks - Fix VRC64 / PRC-77 connector --- addons/sys_components/fnc_attachComplexComponent.sqf | 9 +++++++++ addons/sys_components/script_acre_component_defines.hpp | 1 + addons/sys_prc77/CfgAcreRadios.hpp | 3 ++- addons/sys_rack/CfgAcreRacks.hpp | 2 +- addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf | 2 +- docs/wiki/frameworks/vehicle-racks.md | 1 + 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/addons/sys_components/fnc_attachComplexComponent.sqf b/addons/sys_components/fnc_attachComplexComponent.sqf index 4f22fb74d..24ca44779 100644 --- a/addons/sys_components/fnc_attachComplexComponent.sqf +++ b/addons/sys_components/fnc_attachComplexComponent.sqf @@ -21,6 +21,7 @@ */ params ["_parentComponentId", "_parentConnector", "_childComponentId", "_childConnector", "_attributes", ["_force",false]]; +TRACE_6("attachComplexComponent",_parentComponentId,_parentConnector,_childComponentId,_childConnector,_attributes,_force); private _return = false; @@ -41,6 +42,14 @@ if (_componentSimple == 1) exitWith { private _parentConnectorType = ((getArray(_parentComponentClass >> "connectors")) select _parentConnector) select 1; private _childConnectorType = ((getArray(_childComponentClass >> "connectors")) select _childConnector) select 1; +if (isNil {_parentConnectorType}) exitWith { + WARNING_2("Parent %1 does not have connector index %2",configName _parentComponentClass,_parentConnector); + false +}; +if (isNil {_childConnectorType}) exitWith { + WARNING_2("Child %1 does not have connector index %2",configName _childComponentClass,_childConnector); + false +}; if (_parentConnectorType == _childConnectorType) then { private _exit = false; diff --git a/addons/sys_components/script_acre_component_defines.hpp b/addons/sys_components/script_acre_component_defines.hpp index 07b7acefe..e428a0c81 100644 --- a/addons/sys_components/script_acre_component_defines.hpp +++ b/addons/sys_components/script_acre_component_defines.hpp @@ -22,3 +22,4 @@ #define ACRE_CONNECTOR_CONN_26PIN 7 // Harris 26 AIC pin - 117F to VRC103 #define ACRE_CONNECTOR_CONN_18PIN 8 // 18pin for the 148 Side connector #define ACRE_CONNECTOR_CONN_57PIN 9 // 57pin is the SEM70/80/90 interconnecting connector +#define ACRE_CONNECTOR_CONN_14PIN 10 // 14 pin CX-4655 diff --git a/addons/sys_prc77/CfgAcreRadios.hpp b/addons/sys_prc77/CfgAcreRadios.hpp index 84a5d58aa..12f98ee5e 100644 --- a/addons/sys_prc77/CfgAcreRadios.hpp +++ b/addons/sys_prc77/CfgAcreRadios.hpp @@ -16,7 +16,8 @@ class CfgAcreComponents { connectors[] = { {"Antenna", ACRE_CONNECTOR_3_8}, - {"Audio/Data", ACRE_CONNECTOR_U_283} + {"Audio/Data", ACRE_CONNECTOR_U_283}, + {"Radio", ACRE_CONNECTOR_CONN_14PIN}, }; defaultComponents[] = { { 0,"ACRE_AT271_38" } diff --git a/addons/sys_rack/CfgAcreRacks.hpp b/addons/sys_rack/CfgAcreRacks.hpp index af9a95fa3..a9b97fa0e 100644 --- a/addons/sys_rack/CfgAcreRacks.hpp +++ b/addons/sys_rack/CfgAcreRacks.hpp @@ -8,7 +8,7 @@ class CfgAcreComponents { {"Audio In", ACRE_CONNECTOR_U_283}, {"Audio Out", ACRE_CONNECTOR_U_283}, {"Power In", ACRE_CONNECTOR_U_283}, - {"Radio", ACRE_CONNECTOR_CONN_32PIN} + {"Radio", ACRE_CONNECTOR_CONN_14PIN} }; defaultComponents[] = { {0, "ACRE_AS1729_38"} diff --git a/addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf b/addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf index cca9f0bf0..e7f0459ca 100644 --- a/addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf +++ b/addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf @@ -19,7 +19,7 @@ params ["_rackId", "", "_eventData", ""]; private _radioId = _eventData; -// 26 Pin Connector +// 14 Pin Connector private _attributes = HASH_CREATE; [_rackId, 4, _radioId, 2, _attributes, false] call EFUNC(sys_components,attachComplexComponent); diff --git a/docs/wiki/frameworks/vehicle-racks.md b/docs/wiki/frameworks/vehicle-racks.md index eb712979b..d45b54a3d 100644 --- a/docs/wiki/frameworks/vehicle-racks.md +++ b/docs/wiki/frameworks/vehicle-racks.md @@ -118,6 +118,7 @@ The framework recognises the following entries and wildcards for the configurati - `"external"`: rack can be used only externally. - `"all"` can be combined with `"cargo"`, `"turret"`, `"ffv"` and `"turnedout"` and selects all entries of this category. For example `{{"cargo", 1}, {"ffv", "all"}}`. - **Racks**: + - `"ACRE_VRC64"`: Can mount a `"ACRE_PRC77"` - `"ACRE_VRC103"`: Can mount a `"ACRE_PRC117F"`. - `"ACRE_VRC110"`: Can mount a `"ACRE_PRC152"`. - `"ACRE_VRC111"`: Can mount a `"ACRE_PRC148"` (20W version). From 9c5ae4eb1d5adfc13e305c0a66ebfe44e506fec3 Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 22 Sep 2023 17:31:10 +0200 Subject: [PATCH 2/5] Update docs/wiki/frameworks/vehicle-racks.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jouni Järvinen --- docs/wiki/frameworks/vehicle-racks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/wiki/frameworks/vehicle-racks.md b/docs/wiki/frameworks/vehicle-racks.md index d45b54a3d..ab1599516 100644 --- a/docs/wiki/frameworks/vehicle-racks.md +++ b/docs/wiki/frameworks/vehicle-racks.md @@ -118,7 +118,7 @@ The framework recognises the following entries and wildcards for the configurati - `"external"`: rack can be used only externally. - `"all"` can be combined with `"cargo"`, `"turret"`, `"ffv"` and `"turnedout"` and selects all entries of this category. For example `{{"cargo", 1}, {"ffv", "all"}}`. - **Racks**: - - `"ACRE_VRC64"`: Can mount a `"ACRE_PRC77"` + - `"ACRE_VRC64"`: Can mount a `"ACRE_PRC77"`. - `"ACRE_VRC103"`: Can mount a `"ACRE_PRC117F"`. - `"ACRE_VRC110"`: Can mount a `"ACRE_PRC152"`. - `"ACRE_VRC111"`: Can mount a `"ACRE_PRC148"` (20W version). From a47e1eef43243d8b317d2fbc9973c3904127c97f Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 25 Sep 2023 17:33:11 +0200 Subject: [PATCH 3/5] Document AN/VRC-64 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b27f5790e..71be6d478 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The project is entirely **open-source** and all contributions are welcome. Core ### Features - Accurate simulations of AN/PRC-343, AN/PRC-77, AN/PRC-148, AN/PRC-117F, AN/PRC-152, SEM 52 SL, SEM 70, BF-888S. -- Vehicle racks AN/VRC-103, AN/VRC-110, AN/VRC-111, SEM90. +- Vehicle racks AN/VRC-64, AN/VRC-103, AN/VRC-110, AN/VRC-111, SEM90. - Deployable antennas. - Real time voice occlusion for world objects, including buildings. - Babel language system that allows you to implement virtual languages on other players. From bc93330d4e31d8adf8e1cdeeadfe34022ad58092 Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 25 Sep 2023 17:40:44 +0200 Subject: [PATCH 4/5] Document VRC-64 and fix VRC-110 power --- docs/wiki/user/vehicle-racks.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/wiki/user/vehicle-racks.md b/docs/wiki/user/vehicle-racks.md index a25ce3e45..cb45e2a94 100644 --- a/docs/wiki/user/vehicle-racks.md +++ b/docs/wiki/user/vehicle-racks.md @@ -6,10 +6,11 @@ title: Vehicle Racks ACRE2 allows the possibility of using racks in vehicles in order to increase the transmission power of a particular radio. There are different types of vehicle racks: -- **AN/VRC 103**: Allows mounting an *AN/PRC 117F*. Such radio will see its transmitting power increase from 20W to 50W. -- **AN/VRC 110**: Allows mounting an *AN/PRC 152*. A mounted radio will see its transmitting power increased from 5W to 50W. -- **AN/VRC 111**: Allows mounting an *AN/PRC 148*. A mounted radio will see its transmitting power increased from 5W to 20W. -- **SEM 90**: Allows mounting a *SEM 70*. This will increase transmitting power to 4W on low power and 40W on high power for the SEM 70. +- **AN/VRC 64**: Allows mounting an *AN/PRC 77*, increasing its transmitting power from 3.5W to 50W. +- **AN/VRC 103**: Allows mounting an *AN/PRC 117F*, increasing its transmitting power from 20W to 50W. +- **AN/VRC 110**: Allows mounting an *AN/PRC 152*, increasing its transmitting power from 5W to 20W. +- **AN/VRC 111**: Allows mounting an *AN/PRC 148*, increasing its transmitting power from 5W to 20W. +- **SEM 90**: Allows mounting a *SEM 70*, maintaining its transmitting power at 4W on low poer or increasing it to 40W on high power. In order to use and mount and unmount (when possible) a vehicle rack, ACE3 Interaction Menu is needed: simply interact with the vehicle when being in a seat with access to vehicle racks and select *use radio*. Multiple players will be able to use the radio simultaneously, except for the case of sending a transmission when the radio is already transmitting! Some vehicle racks, however, can be also accessed from outside the vehicle. From 1b95cfcb84c4379317a58fd6b9e32e8e7e5be7c2 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 25 Sep 2023 13:22:28 -0500 Subject: [PATCH 5/5] Update docs/wiki/user/vehicle-racks.md --- docs/wiki/user/vehicle-racks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/wiki/user/vehicle-racks.md b/docs/wiki/user/vehicle-racks.md index cb45e2a94..ae4f064a0 100644 --- a/docs/wiki/user/vehicle-racks.md +++ b/docs/wiki/user/vehicle-racks.md @@ -10,7 +10,7 @@ ACRE2 allows the possibility of using racks in vehicles in order to increase the - **AN/VRC 103**: Allows mounting an *AN/PRC 117F*, increasing its transmitting power from 20W to 50W. - **AN/VRC 110**: Allows mounting an *AN/PRC 152*, increasing its transmitting power from 5W to 20W. - **AN/VRC 111**: Allows mounting an *AN/PRC 148*, increasing its transmitting power from 5W to 20W. -- **SEM 90**: Allows mounting a *SEM 70*, maintaining its transmitting power at 4W on low poer or increasing it to 40W on high power. +- **SEM 90**: Allows mounting a *SEM 70*, maintaining its transmitting power at 4W on low power or increasing it to 40W on high power. In order to use and mount and unmount (when possible) a vehicle rack, ACE3 Interaction Menu is needed: simply interact with the vehicle when being in a seat with access to vehicle racks and select *use radio*. Multiple players will be able to use the radio simultaneously, except for the case of sending a transmission when the radio is already transmitting! Some vehicle racks, however, can be also accessed from outside the vehicle.