Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Racks - Fix AN/VRC-64 (PRC-77) connector #1284

Merged
merged 5 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 9 additions & 0 deletions addons/sys_components/fnc_attachComplexComponent.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/

params ["_parentComponentId", "_parentConnector", "_childComponentId", "_childConnector", "_attributes", ["_force",false]];
TRACE_6("attachComplexComponent",_parentComponentId,_parentConnector,_childComponentId,_childConnector,_attributes,_force);

private _return = false;

Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions addons/sys_components/script_acre_component_defines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion addons/sys_prc77/CfgAcreRadios.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_rack/CfgAcreRacks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_rack/vrc64/fnc_vrc64MountRadio.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 1 addition & 0 deletions docs/wiki/frameworks/vehicle-racks.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
9 changes: 5 additions & 4 deletions docs/wiki/user/vehicle-racks.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
PabstMirror marked this conversation as resolved.
Show resolved Hide resolved

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.

Expand Down