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

Documentation -- Function Headers -- sys_prc343 #110

Merged
merged 8 commits into from
Mar 2, 2017

Conversation

TheMagnetar
Copy link
Member

When merged this pull request will:

@Sniperhid Sniperhid modified the milestones: 2.5.0, 2.4.0 Feb 5, 2017
Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No semi-colons in header examples.

*
* Return Value:
* RETURN VALUE <TYPE>
* true <BOOL>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True <BOOL>

*
* Return Value:
* RETURN VALUE <TYPE>
* Current channel id <NUMBER>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ID

* 0: ARGUMENT ONE <TYPE>
* 1: ARGUMENT TWO <TYPE>
* 0: Radio ID <STRING>
* 1: Event (Unused) <STRING>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<STRING> (Unused) move unused to end.

* 1: ARGUMENT TWO <TYPE>
* 0: Radio ID <STRING>
* 1: Event (Unused) <STRING>
* 2: Event data (Unused) <NUMBER>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move unused to end.

*
* Arguments:
* 0: ARGUMENT ONE <TYPE>
* 1: ARGUMENT TWO <TYPE>
* 0: Radio ID (Unused) <STRING>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move unused to end.

*
* Arguments:
* 0: ARGUMENT ONE <TYPE>
* 1: ARGUMENT TWO <TYPE>
* 0: Radio ID <STRING>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the unused ones.

* 0: ARGUMENT ONE <TYPE>
* 1: ARGUMENT TWO <TYPE>
* 0: Radio ID (Unused) <STRING>
* 1: Event with the value "getChannelData" (Unused) <STRING>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move unused to end.

* 1: ARGUMENT TWO <TYPE>
* 0: Radio ID (Unused) <STRING>
* 1: Event with the value "getChannelData" (Unused) <STRING>
* 2: Event data with the channel number (Unused) <NUMBER>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move unused to end.

* 0: Radio ID (Unused) <STRING>
* 1: Event with the value "getChannelData" (Unused) <STRING>
* 2: Event data with the channel number (Unused) <NUMBER>
* 3: Radio data (Unused) <HASH>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move unused to end.

@@ -1,16 +1,18 @@
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
* Close radio GUI when calling this function. Event rised by onUnload (PRC343_RadioDialog).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

raised, no when calling this function, that's rather obvious.

@TheMagnetar
Copy link
Member Author

Sorry I should have uploaded the changes.

@@ -10,7 +10,7 @@
* RETURN VALUE <TYPE>
*
* Example:
* [ARGUMENTS] call acre_COMPONENT_fnc_FUNCTIONNAME
* [ARGUMENTS] call acre_sys_prc343_fnc_onChannelKnobPress;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still no semi-colons. :)

@@ -1,16 +1,15 @@
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
* Renders the radio when opened
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing final dot.

*
* Example:
* [ARGUMENTS] call acre_sys_prc343_fnc_render;
* [DisplazID] call acre_sys_prc343_fnc_render
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Y instead of Z.

*
* Arguments:
* 0: ARGUMENT ONE <TYPE>
* 0: Zoom in(0) or out (1) <BOOL>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space after in.

@@ -1,19 +1,15 @@
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
* Returns the unique identity of the current channel since the PRC343 has multiple blocks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing final dot.

@TheMagnetar
Copy link
Member Author

I will test it later in the day since this PR also introduces params of the form: params ["_radioId", "", "", "", ""];

@TheMagnetar
Copy link
Member Author

I tested this and it should be ready to be merged.

@jonpas jonpas merged commit c427177 into IDI-Systems:master Mar 2, 2017
@TheMagnetar TheMagnetar deleted the functionHeaders_PRC343 branch March 2, 2017 18:08
@jonpas jonpas modified the milestones: 2.4.1, 2.5.0 Mar 17, 2017
jonpas pushed a commit that referenced this pull request Apr 1, 2017
* Use code block for mods list in issue template

* Hide radio self-interaction node if no radio in inventory

* Introduce Variable to deactivated distance-based muting (#228)

* Order radio ear left/right correctly

* Cleanup and macros (#230)

* Delete unused traces

* QEFUNC Macro

* Moved all opening braces on same line

* Removed spaced after classes

* Spaces and Indentation

* More spaces

* Fix direct speech page vehicle attenuation link

* Add Custom Signal Processing wiki page to sidebar, Cleanup sidebar config

* Use ACE3 notification if available instead of hint (#239)

* Add displayNotification function

* Fix log

* Pass functions 'by reference' to BI evenEHs

* acre_api_fnc_setCustomSignalFunc - reset fix (#227)

* fixes the possibility to reset the function to default behavior

* wrong term

* lowercase if

* Update documentation

* Use of ICON_RADIO_CALL in ace_interact

* Fix ctrSetEventHandler. Back to Quotes as in #241 (#243)

Fix ctrlSetEventHandler - back to quotes as in #241

* Fixes the antenna direction calculation (#233)

* Improve mod listing on issue template

* Update easylogging++ to v9.94.1 (#246)

* Update easylogging++ to v9.94.1, Bandaid prevent default log file from creation

* Include easylogging++.cc in CMake, Change max file size to 1 MB

* Hotfix muting variable (#248)

* Fix duplicate ID handling (#251)

* Fix acre failing initialise due to a race condition (#240)

* Documentation -- Function Headers -- sys_prc343 (#110)

* Changed function example calls

* Headers 1

* Completed headers. Missing arguments

* Improvements on Doc

* Review changes

* v2.4.0.943 - Build 37

* Use CBA Namespaces

* 4nec2 Antenna Calculation (#244)

- Switches Antenna Calculation from MMANA-GAL to 4NEC2 (Closes #201)
- Converts all existing antenna data files to 4NEC2 ones
- Adds additional antennas for e.g SEM52 (Closes #29) 
- Introduces a new script to convert 4NEC2 output files to ACRE's `*.aba` file

* SEM70 (#199)

Adds a new radio: SEM70, a manpack radio used by German Armed Forces.

It comes with an UI, rendered in 3D like all other ACRE2 radios. Model and textures created by Raspu (https://github.com/Raspu86).  
Additionally it is the first radio featuring an automatic channel selection. Details will follow in the documentation.

* Fixes

* Fix duplicate mounted radios in racks

* Infantry Phone (#224)

* External intercom

* Handle dead units using the intercom

* Some requested changes

* Lunch break fixes

* Changes all references of external Intercom to Infantry Phone

* DOC: Infantry telephone

* Macroize interactions, Fix missing string

* Add actions dynamically, Add support for custom position/selection

* Improve things

* Add vanilla Tanks and Tracker APCs custom positions, Disable debug

* Fix in vehicle checks

* Revert some changes from previous commit

* Moved to sys_intercom

* Call functionality implemented

* Fix the spalling of own name

* Fixes of example calls

* Fix headers, Use clientInit postInit

* Move intercom/infantry phone config to vehicle root class

* Changed true/false to 1/0 in configs

* Cleanup configs, Don't attach init EH if ACE3 disabled

* Add vehicle intercom and infantry phone documentation

* Use ACE3 notifications, Cleanup minor things

* Added ringing description

* Add additional line regarding ringing position in framework doc

* Use displayNotification

* Fix issue

* Fix stupidity...

* Fix displayNotification

* Add infantry phone connected message

* PhoneCall fixes

* Remove of duplicate private

* Prevent destroyed vehicle beeping and infantry phone interaction

* Stop infantry phone from beeping if no crew members are aboard

* Doc and lazy evaluation

* HCs are kind of important

* No need for code in code

* Redefined infantry phone position for compatibility with other mods

* Fix: sound in all clients

* Fixed intercom

* remoteExecCall to CBA_fnc_globalEvent

* Privatising

* inline functions though, yuck

* Updated documentation

* Fix SEM70 (#257)

- Frequency default (stupid)
- PBOPrefix was ooold
- Disable Debugging

* Use CBA Namespaces

* v2.4.0.944 - Build 38

* Update Documentation Theme (#253)

* Add url to branching image, Put --incremental guideline as optional

* Update Jekyll Documentation Theme to 06dc9e0e257e014d1ccf9de158e76a61d74f84e6

* Remove redundant tooltips files, Fix search

* Use url from file location by default for images

* Renamed settings variables (#259)

* Teamspeak channel switching functionality (#225)

* Initial commit for channel move functionality

* Changes as per previous review

* Request changes and improvements

* Fixed incorrect use of EGVAR

* Requested changes. Normalised name to TS3 and normalised formatting.

* Improved name search utilising Levenshtein distance

* Whitespace

* Requested changes

* Whitespaceroni

* Requested changes

* Removed comment from pipe timeout

* Use display XEH instead of PFH

* Add missing checks in display XEH

* Removes extra include causing make error (#261)

* Removes extra include causing make error

* There was another one as well...

* Use custom namespace for Fast Hashes (#267)

* Use custom location with invalid drawStyle for fast hashes to improve performance

* Fully move hashes to sys_core

* Move the rest of fast hashes to sys_core, Fix crash in PREP

* Prefix global fast hash variables

* Remove redundant code

* Fix missing renames

* Move all fast hash stuff to main

* Create menu hashes before using them

* Return Menu hashes to working location

* Cleanup 117f and 152 menus compilation (don't run in preStart)

* Use custom namespace for Fast Hashes (#267)

* Use custom location with invalid drawStyle for fast hashes to improve performance

* Fully move hashes to sys_core

* Move the rest of fast hashes to sys_core, Fix crash in PREP

* Prefix global fast hash variables

* Remove redundant code

* Fix missing renames

* Move all fast hash stuff to main

* Create menu hashes before using them

* Return Menu hashes to working location

* Cleanup 117f and 152 menus compilation (don't run in preStart)

* v2.4.0.945 - Build 39

* v2.4.0.946 - Build 6

* Actually increment patch version

* v2.4.1.947 - Build 7

* Polish translation. (#268)

Polish translation

* Box with radios (#265)

* Box with radios

* Requested changes

* Added forgotten displayName

* Added box to units[] in CfgPatches

* Rename tag, lower amount of radios, more small radios than big radios

* Clean-up and document to sys_io (#249)

* Some improvements to sys_io

* Improve mentions of the extension.

* Improve comments

* Added SEM70 to main readme (#270)

* External radios (#214)

* First implementation of external radios

* Fixes, vehicles added and tweaked availability of ace actions

* Fixes

* Fixes and remove debug

* Fixes and improvements

* Fixed vehicles

* Updated german translations

* Improved ace interaction actions

* Fixed Doc

* Prevent the use of an external radio if it is already in use

* PR  requested changes

* Additional fixes

* Moved ace_interaction related functions to sys_external

* Update notifications and use of icon macro

* Removed extra semicolons

* Hide entry if no radios are shared externally

* Allow players to give the radio headsets to other units

* Radio owner awareness

* Requested changes

* Requested changes and documentation

* Adding new page to sidebar

* Fix doc entry in side-bar

* Fixes

* Removed tabs at the end of line

* Set external radio as active and improve messages

* Fixed display messages

* Prevent action from showing if distance is too large

* Requested changes

* Tabs tabs tabs. those hateful tabs

* Forgetful magnetar

* Forgetful magnetar. Part 2.

* Further optimisations

* Intercom overhaul and passenger intercom (#255)

* External intercom

* Handle dead units using the intercom

* Some requested changes

* Lunch break fixes

* Changes all references of external Intercom to Infantry Phone

* DOC: Infantry telephone

* Macroize interactions, Fix missing string

* Add actions dynamically, Add support for custom position/selection

* Improve things

* Add vanilla Tanks and Tracker APCs custom positions, Disable debug

* Fix in vehicle checks

* Revert some changes from previous commit

* Moved to sys_intercom

* Call functionality implemented

* Fix the spalling of own name

* Fixes of example calls

* Fix headers, Use clientInit postInit

* Move intercom/infantry phone config to vehicle root class

* Changed true/false to 1/0 in configs

* Cleanup configs, Don't attach init EH if ACE3 disabled

* Add vehicle intercom and infantry phone documentation

* Use ACE3 notifications, Cleanup minor things

* Added ringing description

* Add additional line regarding ringing position in framework doc

* Use displayNotification

* Fix issue

* Fix stupidity...

* Fix displayNotification

* Add infantry phone connected message

* PhoneCall fixes

* Remove of duplicate private

* Prevent destroyed vehicle beeping and infantry phone interaction

* Stop infantry phone from beeping if no crew members are aboard

* Doc and lazy evaluation

* HCs are kind of important

* No need for code in code

* Redefined infantry phone position for compatibility with other mods

* First implementation

* Fix: sound in all clients

* Fixed intercom

* Fixes for passenger intercom

* cba_fnc_globalEvent instead of remoteExecCall

* Requested changes

* Requested changes II

* Intercom overhaul and passenger intercom

* CBA settings and network optimisations

* Fixed: prevent from connecting to passenger intercom when the phone is ringing

* Fixes and corner cases

* BLUFOR vehicles

* Fixed attenuation checks

* Helicopters, SDVs and VTOLS

* Added hook for custom actions on Inf. phone change status

* Documentation formatting issues

* Update Documentation

* Don't use negation

* Fixes + doc

* Remove debug comment

* Requested changes

* Removed fnc_intercomActions.sqf since it was no longer needed

* Optimisations and noApiFunctions for debugging purposes

* Improve config inheritance, Check event type

* Passenger to Pax, Add note

* Shorten Inf Phone strings

* Formatting of ace actions and removal of switch intercom message

* v2.4.1.948 - Build 40

* Fix Vehicle Intercom Framework documentation page

* Formatting

* TS3 channel switching documentation (#272)

* Added TS3 channel switching documentation

* Few grammar changes

* Changes

* Hash be gone

* Empty lines

* Russian translation (#278)

* no message

* PAX translations.

* Power fixes and request changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants