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

Leave on surround, don't force mutes #57

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a872003
Some Changes
djallred Dec 12, 2020
b983d30
Compiled after changes
djallred Dec 12, 2020
6c98067
TP updates
djallred Feb 24, 2021
be88b80
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Feb 24, 2021
72ab41f
Changes for input2
djallred Feb 24, 2021
3199d6f
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Feb 24, 2021
ed23875
gutting IPTV
djallred Feb 27, 2021
bef3221
Logic for local input2
djallred Mar 4, 2021
dc933d5
Added buttons for Local Input2
djallred Mar 4, 2021
73dd98a
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 4, 2021
22c0cb9
Delete TEC HD.sgd2
djallred Mar 4, 2021
90e3fc5
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 4, 2021
22b06b8
Bug fix TP2
djallred Mar 4, 2021
220fbe1
Delete TEC HD.sgd2
djallred Mar 4, 2021
b99ef00
TP bug
djallred Mar 4, 2021
19540d3
Revert "TP bug"
djallred Mar 5, 2021
71a79b4
Revert "Delete TEC HD.sgd2"
djallred Mar 5, 2021
d3adc35
Revert "Bug fix TP2"
djallred Mar 5, 2021
a4fd303
updated local2 mode join
djallred Mar 5, 2021
d1c2966
corrected some joins
djallred Mar 5, 2021
b59ccfd
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 5, 2021
baeec51
Fixed Mode feedback
djallred Mar 6, 2021
65856d4
Feedback joins
djallred Mar 6, 2021
3983884
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 6, 2021
6d93525
Fixed Typos and bugs
djallred Mar 8, 2021
54cb8d8
Fixed TP feedback on config
djallred Mar 8, 2021
f89e779
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 8, 2021
36de1ea
Adding changes for input2
djallred Mar 11, 2021
b75dd3d
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 11, 2021
252f4e6
Update Word Modes document
djallred Mar 11, 2021
5f433a7
Moved and assigned joins
djallred Mar 12, 2021
72c6eb3
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 12, 2021
bbf38bf
Adding Icons for modes 1-4
djallred Mar 20, 2021
59c9263
Adding to mode1 logic for input2
djallred Mar 20, 2021
33c4695
Merge branch 'Leave-on-Surround,-Don't-force-Mutes' of https://github…
djallred Mar 20, 2021
b0b5b3f
Added button modes to Local Input2
djallred Mar 22, 2021
b741829
added logic to customize In2 modes 1 & 2
djallred Mar 22, 2021
f816f1c
After test compile Back to Modes 1 and 2
djallred Mar 24, 2021
272ce3a
Finished updating the TP Modes.
djallred Mar 25, 2021
094a460
Fixed visibility for Local Input2
djallred Mar 26, 2021
ad4e1d4
Fix button labels
djallred Mar 26, 2021
33aec17
Fix TEC PC2 label bug
djallred Mar 26, 2021
fbcb9b9
Fix labels on Touchpanel Configuration
djallred Mar 26, 2021
ac7bc17
Fix Audio source Feedback
djallred Mar 26, 2021
2f26cf4
Fix typo on Local Input 2 page, Computer2 warning
djallred Mar 27, 2021
edf7e03
Create TEC HD DMPS and touch panel modesv2.docx
djallred Mar 29, 2021
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
86 changes: 86 additions & 0 deletions src/Input2 Name.ush
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
[BEGIN]
Version=1
[END]
[BEGIN]
ObjTp=FSgntr
Sgntr=UserSPlus
RelVrs=1
IntStrVrs=1
SPlusVrs=4.05.01
CrossCplrVrs=1.3
[END]
[BEGIN]
ObjTp=Hd
[END]
[BEGIN]
ObjTp=Symbol
Exclusions=1,19,20,21,88,89,167,168,179,213,214,215,216,217,225,226,248,249,266,267,310,718,756,854,1766,2567,2574,2590,2651,2655,2817,2886,2938,2947,3181,3197,3233,3680,3682,3706,3710,3735,3736,3816,3888,4176,4193,4308,4476,4591,4769,5360,5388,5420,5455,5497,5699,5813,5919,6150,6161,
Exclusions_CDS=6
Inclusions_CDS=5,7
Name=Input2 Name
SmplCName=Input2 Name.usp
Code=1
SysRev5=3.083
SMWRev=2.02.05
InputCue1=TEC_PC_2
InputSigType1=Digital
InputCue2=Department_Device
InputSigType2=Digital
InputCue3=Apple_TV
InputSigType3=Digital
InputCue4=Desk_Doc_Cam
InputSigType4=Digital
InputCue5=Custom_Input2
InputSigType5=Digital
InputList2Cue1=[~UNUSED~]
InputList2SigType1=Serial
InputList2Cue2=Custom_Name2$
InputList2SigType2=Serial
OutputList2Cue1=[~UNUSED~]
OutputList2SigType1=Serial
OutputList2Cue2=Input2_Name$
OutputList2SigType2=Serial
ParamCue1=[Reference Name]
MinVariableInputs=5
MaxVariableInputs=5
MinVariableInputsList2=2
MaxVariableInputsList2=2
MinVariableOutputs=0
MaxVariableOutputs=0
MinVariableOutputsList2=2
MaxVariableOutputsList2=2
MinVariableParams=0
MaxVariableParams=0
Expand=expand_separately
Expand2=expand_separately
ProgramTree=Logic
SymbolTree=46
UserSymTreeName=<unnamed>
Hint=
PdfHelp=
HelpID=
Render=4
Smpl-C=16
CompilerCode=-48
CompilerParamCode=27
CompilerParamCode5=14
NumFixedParams=1
Pp1=1
MPp=1
NVStorage=10
ParamSigType1=String
SmplCInputCue1=o#
SmplCOutputCue1=i#
SmplCInputList2Cue1=an#
SmplCOutputList2Cue1=ai#
SPlus2CompiledName=S2_Input2_Name
SymJam=NonExclusive
FileName=Input2 Name.ush
SIMPLPlusModuleEncoding=0
[END]
[BEGIN]
ObjTp=Dp
H=1
Tp=1
NoS=False
[END]
261 changes: 261 additions & 0 deletions src/Input2 Name.usp
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
/*******************************************************************************************
SIMPL+ Module Information
(Fill in comments below)
*******************************************************************************************/
/*
Dealer Name: Brigham Young University
System Name:
System Number:
Programmer: Bradley T Streeter / David Allred
Comments:
*/

/*******************************************************************************************
Compiler Directives
(Uncomment and declare compiler directives as needed)
*******************************************************************************************/
// #ENABLE_DYNAMIC
#SYMBOL_NAME "Input2 Name"
// #HINT ""
// #DEFINE_CONSTANT
#CATEGORY "46"
// #PRINT_TO_TRACE
// #DIGITAL_EXPAND
// #ANALOG_SERIAL_EXPAND
// #OUTPUT_SHIFT
// #HELP_PDF_FILE ""
#DEFAULT_VOLATILE
#ENABLE_STACK_CHECKING
#ENABLE_TRACE
// #ENCODING_ASCII
// #ENCODING_UTF16
// #ENCODING_INHERIT_FROM_PARENT
// #ENCODING_INHERIT_FROM_PROGRAM
/*
#HELP_BEGIN
(add additional lines of help lines)
#HELP_END
*/

/*******************************************************************************************
Include Libraries
(Uncomment and include additional libraries as needed)
*******************************************************************************************/
// #CRESTRON_LIBRARY ""
// #USER_LIBRARY ""

/*******************************************************************************************
DIGITAL, ANALOG and SERIAL INPUTS and OUTPUTS
(Uncomment and declare inputs and outputs as needed)
*******************************************************************************************/
DIGITAL_INPUT TEC_PC_2,Department_Device,Apple_TV,Desk_Doc_Cam,Custom_Input2;
// ANALOG_INPUT
STRING_INPUT _skip_,Custom_Name2$[25];
// BUFFER_INPUT

// DIGITAL_OUTPUT
// ANALOG_OUTPUT
STRING_OUTPUT _Skip_,Input2_Name$;

/*******************************************************************************************
SOCKETS
(Uncomment and define socket definitions as needed)
*******************************************************************************************/
// TCP_CLIENT
// TCP_SERVER
// UDP_SOCKET

/*******************************************************************************************
Parameters
(Uncomment and declare parameters as needed)
*******************************************************************************************/
// INTEGER_PARAMETER
// SIGNED_INTEGER_PARAMETER
// LONG_INTEGER_PARAMETER
// SIGNED_LONG_INTEGER_PARAMETER
// STRING_PARAMETER

/*******************************************************************************************
Parameter Properties
(Uncomment and declare parameter properties as needed)
*******************************************************************************************/
/*
#BEGIN_PARAMETER_PROPERTIES parameter_variable, parameter_variable, ...
// propValidUnits = // unitString or unitDecimal|unitHex|unitPercent|unitCharacter|unitTime|unitTicks;
// propDefaultUnit = // unitString, unitDecimal, unitHex, unitPercent, unitCharacter, unitTime or unitTicks;
// propBounds = lower_bound , upper_bound;
// propDefaultValue = ; // or, propDefaultValue = "";
// propList = // { "value" , "label" } , { "value" , "label" } , ... ;
// propShortDescription = "status_bar_hint_text";
// #BEGIN_PROP_FULL_DESCRIPTION line_1... line_2... line_n #END_PROP_FULL_DESCRIPTION
// #BEGIN_PROP_NOTES line_1... line_2... line_n #END_PROP_NOTES
#END_PARAMETER_PROPERTIES
*/

/*******************************************************************************************
Structure Definitions
(Uncomment and define structure definitions as needed)
Note: Be sure to initialize all declared STRING variables as needed
For example, in Function Main: struct.myString = "";
*******************************************************************************************/
/*
STRUCTURE MyStruct1
{
};

MyStruct1 struct;
*/

/*******************************************************************************************
Global Variables
(Uncomment and declare global variables as needed)
Note: Be sure to initialize all declared STRING variables as needed
For example, in Function Main: myString = "";
*******************************************************************************************/
// INTEGER
// LONG_INTEGER
// SIGNED_INTEGER
// SIGNED_LONG_INTEGER
// STRING

/*******************************************************************************************
Functions
(Add any additional functions here)
Note: Functions must be physically placed before the location in
the code that calls them.
*******************************************************************************************/
/*
Function MyFunction1()
{
// TODO: Add local variable declarations here

// TODO: Add code here
}
*/

/*
Integer_Function MyIntFunction1()
{
// TODO: Add local variable declarations here

// TODO: Add code here

Return (0);
}
*/

/*
String_Function MyStrFunction1()
{
// TODO: Add local variable declarations here

// TODO: Add code here

Return ("");
}
*/

/*******************************************************************************************
Event Handlers
(Uncomment and declare additional event handlers as needed)
*******************************************************************************************/

PUSH TEC_PC_2

{
Input2_Name$ = "TEC PC 2";
}

PUSH Department_Device

{
Input2_Name$ = "Dept Device";
}

PUSH Apple_TV

{
Input2_Name$ = "Apple TV";
}

PUSH Desk_Doc_Cam

{
Input2_Name$ = "Desk Doc Cam";
}

PUSH Custom_Input2

{
Input2_Name$ = Custom_Name2$;
}

/*
RELEASE input
{
// TODO: Add code here
}
*/

CHANGE Custom_Name2$

{
Input2_Name$ = Custom_Name2$;
}


/*
EVENT
{
// TODO: Add code here
}
*/

/*
SOCKETCONNECT
{
// TODO: Add code here
}
*/

/*
SOCKETDISCONNECT
{
// TODO: Add code here
}
*/

/*
SOCKETRECEIVE
{
// TODO: Add code here
}
*/

/*
SOCKETSTATUS
{
// TODO: Add code here
}
*/

/*******************************************************************************************
Main()
Uncomment and place one-time startup code here
(This code will get called when the system starts up)
*******************************************************************************************/
/*
Function Main()
{
// TODO: Add code here
// Initialize declared global and local variables/arrays as needed.

// WaitForInitializationComplete();
// If you are reading any Input or Output variables, uncomment
// the WaitForInitializationComplete statement above and read
// them afterwards. Input/Output variables will not have
// their correct values set until after the logic processor
// runs and propagates the values to them.
}
*/

Binary file added src/TEC HD DMPS and touch panel modes.docx
Binary file not shown.
Binary file added src/TEC HD DMPS and touch panel modesv2.docx
Binary file not shown.
2 changes: 1 addition & 1 deletion src/TEC HD.VTZ.hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2020-08-06T17:12:10
2021-03-27T19:16:13
2 changes: 1 addition & 1 deletion src/TEC HD.sgd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ObjTp=FSgntr
Sgntr=SGD
RelVrs=3
VTProeVer=6.2.00
VTProeVer=6.2.02
Schema=1
CRCGUID=37F1EFB0-9087-4A30-AE55-47E9852599CB
]
Expand Down
Binary file modified src/TEC HD.sig
Binary file not shown.
Loading