[Netlinx-modules-commit] NetLinx-Modules/Audiotron AT-Sample.apw,NONE,1.1 README.txt,NONE,1.1 AT-Sam
Brought to you by:
coffler
|
From: Jeff C. <co...@us...> - 2005-04-14 00:19:42
|
Update of /cvsroot/netlinx-modules/NetLinx-Modules/Audiotron In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132 Modified Files: AT-Sample.axs AT-Sample.tpd Added Files: AT-Sample.apw README.txt Log Message: Update for final Audiotron V1.0 release Index: AT-Sample.tpd =================================================================== RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/Audiotron/AT-Sample.tpd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs3betBt and /tmp/cvsm8CHDm differ Index: AT-Sample.axs =================================================================== RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/Audiotron/AT-Sample.axs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AT-Sample.axs 23 Oct 2002 22:32:24 -0000 1.1 --- AT-Sample.axs 14 Apr 2005 00:19:31 -0000 1.2 *************** *** 5,9 **** (* FILE CREATED ON: 08/19/2000 AT: 12:35:12 *) (***********************************************************) ! (* FILE_LAST_MODIFIED_ON: 10/23/2002 AT: 15:21:09 *) (***********************************************************) (* ORPHAN_FILE_PLATFORM: 1 *) --- 5,9 ---- (* FILE CREATED ON: 08/19/2000 AT: 12:35:12 *) (***********************************************************) ! (* FILE_LAST_MODIFIED_ON: 04/13/2005 AT: 16:47:48 *) (***********************************************************) (* ORPHAN_FILE_PLATFORM: 1 *) *************** *** 23,46 **** (***********************************************************) (*}}PS_SOURCE_INFO *) ! (* *) ! (* copyright : (C) 2002 by Jeff Coffler *) ! (* email : net...@ta... *) ! (* *) ! (* This library is free software; you can redistribute it *) ! (* and/or modify it under the terms of the GNU Lesser *) ! (* General Public License as published by the Free *) ! (* Software Foundation; either version 2.1 of the License, *) ! (* or (at your option) any later version. *) ! (* *) ! (* This library is distributed in the hope that it will be *) ! (* useful, but WITHOUT ANY WARRANTY; without even the *) ! (* implied warranty of MERCHANTABILITY or FITNESS FOR A *) ! (* PARTICULAR PURPOSE. See the GNU Lesser General Public *) ! (* License for more details. *) ! (* *) ! (* You should have received a copy of the GNU Lesser *) ! (* General Public License along with this library; if not, *) ! (* write to the Free Software Foundation, Inc., 59 Temple *) ! (* Place, Suite 330, Boston, MA 02111-1307 USA *) (***********************************************************) --- 23,32 ---- (***********************************************************) (*}}PS_SOURCE_INFO *) ! (***********************************************************) ! ! (***********************************************************) ! (* System Type : Netlinx *) ! (***********************************************************) ! (* REV HISTORY: *) (***********************************************************) *************** *** 52,56 **** // AXR-NWS: Netwave Servers - connected via AXLINK ! TP1 = 194:1:1; // Other virtual devices --- 38,42 ---- // AXR-NWS: Netwave Servers - connected via AXLINK ! TP1 = 198:1:1; // Other virtual devices *************** *** 72,81 **** // Port number (must be unique) for syslog service ! DEV SyslogSocket = 0:10:0; // Port number (must be unique) for Audiotron ! DEV ATron_Family = 0:13:0; ! char AudiotronSelectLen = 7; // Number of items on select page --- 58,71 ---- // Port number (must be unique) for syslog service ! // (Not used since vdSyslog==0:0:0 and no DEFINE_MODULE for syslog) ! DEV SyslogSocket = 0:0:0; // Port number (must be unique) for Audiotron ! DEV ATron_Family = 0:4:0; ! char AudiotronSelectLen = 8; // Number of items on select page ! ! devchan vdATron_lvlBack = {vdATron_Family,1}; ! devchan vdATron_addOkay = {vdATron_Family,2}; *************** *** 104,108 **** // Support for Audiotron module ! volatile char sAT_Family_Addr[] = 'audiotron-family.taltos.com'; volatile char sAT_Family_UserPwd[] = 'admin:admin'; --- 94,98 ---- // Support for Audiotron module ! volatile char sAT_Family_Addr[] = '192.168.1.40'; volatile char sAT_Family_UserPwd[] = 'admin:admin'; *************** *** 169,173 **** // Figure out of we should say "Add" or "<Blank>", and update if needed ! if (Length_Array(LocalItems[loop]) <> 0 && displayLvl <> 1) curAddState = 'Add'; else --- 159,163 ---- // Figure out of we should say "Add" or "<Blank>", and update if needed ! if (Length_Array(LocalItems[loop]) <> 0 && [vdATron_addOkay]) curAddState = 'Add'; else *************** *** 262,267 **** } ! [TP1,58] = (AudiotronRandom); ! [TP1,59] = (AudiotronRepeat); } --- 252,258 ---- } ! [TP1,40] = [vdATron_lvlBack]; ! [TP1,123] = (AudiotronRandom); ! [TP1,124] = (AudiotronRepeat); } *************** *** 463,467 **** Button_Event [TP1,40] // Back up one level { ! Push: AT_UI_Backup(vdATron_Family); } --- 454,461 ---- Button_Event [TP1,40] // Back up one level { ! Push: { ! if (AudiotronDisplayLvl > 1) // Don't send command we know will fail ! AT_UI_Backup(vdATron_Family); ! } } *************** *** 504,531 **** } - Button_Event [TP1,58] // Random - { - Push: { - AudiotronRandom = !AudiotronRandom; - - if (AudiotronRandom) - AT_DoCommand(vdATron_Family, AT_cmdRandom, AT_cmdOn); - else - AT_DoCommand(vdATron_Family, AT_cmdRandom, AT_cmdOff); - } - } - - Button_Event [TP1,59] // Repeat - { - Push: { - AudiotronRepeat = !AudiotronRepeat; - - if (AudiotronRepeat) - AT_DoCommand(vdATron_Family, AT_cmdRepeat, AT_cmdOn); - else - AT_DoCommand(vdATron_Family, AT_cmdRepeat, AT_cmdOff); - } - } - Button_Event [TP1,120] // Select songs { --- 498,501 ---- *************** *** 545,549 **** AT_DoCommand(vdATron_Family, AT_cmdClear, AT_cmdOn); AT_DoCommand(vdATron_Family, AT_cmdStop, AT_cmdOn); ! // BUGBUG: Can't discretely turn off Random/Repeat due to Audiotron firmware bug! // AT_DoCommand(vdATron_Family, AT_cmdRandom, AT_cmdOff); // AT_DoCommand(vdATron_Family, AT_cmdRepeat, AT_cmdOff); --- 515,519 ---- AT_DoCommand(vdATron_Family, AT_cmdClear, AT_cmdOn); AT_DoCommand(vdATron_Family, AT_cmdStop, AT_cmdOn); ! // Discretely turn off Random/Repeat if desired ... // AT_DoCommand(vdATron_Family, AT_cmdRandom, AT_cmdOff); // AT_DoCommand(vdATron_Family, AT_cmdRepeat, AT_cmdOff); *************** *** 559,562 **** --- 529,556 ---- } + Button_Event [TP1,123] // Random + { + Push: { + AudiotronRandom = !AudiotronRandom; + + if (AudiotronRandom) + AT_DoCommand(vdATron_Family, AT_cmdRandom, AT_cmdOn); + else + AT_DoCommand(vdATron_Family, AT_cmdRandom, AT_cmdOff); + } + } + + Button_Event [TP1,124] // Repeat + { + Push: { + AudiotronRepeat = !AudiotronRepeat; + + if (AudiotronRepeat) + AT_DoCommand(vdATron_Family, AT_cmdRepeat, AT_cmdOn); + else + AT_DoCommand(vdATron_Family, AT_cmdRepeat, AT_cmdOff); + } + } + Button_Event [TP1,126] // Update status of Audiotron { --- NEW FILE: README.txt --- This file is intended to be viewed with "Notepad" in word-wrap mode (see "Format" menu). Released Version: V1.0 Release Date: Saturday, 02-Apr-2005 Setup information and notes for the Audiotron Module: This Audiotron project integrates an AMX NetLinx control system and a wireless, wired or webpanel 2-way touchpanel with an Audiotron from Turtle Beach (http://www.turtlebeach.com/site/products/audiotron/producthome.asp). As of the time of this release, the Audiotron module is compatible with Audiotron firmware v3.2.25 The following files are provided: LICENSE.txt: Open source license; you are obligated to abide by this or not use the software AT-Sample.apw: NetLinx Studio (v2.x) workspace file AT-Sample.axs: Sample (mainline) Driver Program AT-Sample.tpd: Sample VPT-CP (TPDesign3) File AudiotronMod.axi: Audiotron Include file and API definition file AudiotronMod.tko: Audiotron Module (compiled) README.txt: This file SyslogMod.axi: Syslog Include file Rough instructions: 1. Place all of the listed files in the same directory. 2. Open 'Audiotron.apw' in Studio2. 3. Open 'AT-Sample' from the Source folder of the workspace. 4. Change the device id for TP1 (Line 54) to match your panel or web panel. 5. Change the variable 'sAT_Family_Addr' (Line 106) to match the IP address or DNS name of your Audiotron. 6. Change the variable 'sAT_Family_UserPwd' (Line 107) to match the Username & Password used on the Web Server Settings page of your Audiotron. The default is 'admin:admin' (NOTE: The username will always be 'admin'. Be sure the username & password are separated only by a colon.) 7. Compile 'AT-Sample' & send it to the master. 8. Load the TP. Notes on Syslog: All files under SourceForge project NetLinx-Modules are "syslog friendly". This means that you may choose to use syslog, or you may choose to not use syslog. By default, syslog is disabled (and only controls logging levels to the NetLinx console via 'SEND_STRING 0' commands). If you use the syslog, be sure to change the 'SyslogHost' variable (Line 103 of AT-Sample.axs) to the IP address or DNS name of your syslog host. For SlimServerMod, SlimServerMod.axi defines variable 'llSlimServer', and controls logging levels for the module. AudiotronMod represents an open-source project. If you want source files, they are available via CVS from the SourceForge project 'NetLinx-Modules'. You are free to download the source code if you wish. If you make improvements to the code that you believe is generally useful, please submit your changes to netlinx-modules(at)taltos.com. That way, everyone can benefit from your changes. Thanks! ----- Be aware that the author of AudiotronMod no longer uses the Audiotron. However, it is used by several other sites, and it has been tested with the last released version of the Audiotron firmware (the Audiotron has been cancelled by Turtle Beach). The author will strive to answer questions (address E-Mail to netlinx-modules(at)taltos.com), but that's pretty much it. --- NEW FILE: AT-Sample.apw --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Workspace [ <!-- Common Elements --> <!ELEMENT Identifier (#PCDATA)> <!ELEMENT Comments (#PCDATA)> <!ELEMENT CreationDate (#PCDATA)> <!-- Workspace Elements--> <!ELEMENT Workspace ( Identifier, CreateVersion, PJS_File?, PJS_ConvertDate?, PJS_CreateDate?, Comments?, Project*)> <!ATTLIST Workspace CurrentVersion CDATA #REQUIRED> <!ELEMENT CreateVersion (#PCDATA)> <!-- Conversion data only: only included for files converted from the old .pjs database --> <!ELEMENT PJS_File (#PCDATA)> <!ELEMENT PJS_ConvertDate (#PCDATA)> <!ELEMENT PJS_CreateDate (#PCDATA)> <!ELEMENT Project ( Identifier, Designer?, DealerID?, SalesOrder?, PurchaseOrder?, Comments?, System*)> <!ELEMENT Designer (#PCDATA)> <!ELEMENT DealerID (#PCDATA)> <!ELEMENT SalesOrder (#PCDATA)> <!ELEMENT PurchaseOrder (#PCDATA)> <!ELEMENT System ( Identifier, SysID, TransSerial?, TransModem?, TransTCPIP?, VirtualNetLinxMasterFlag?, VNMRestoreIPSettings?, VNMSystemID?, IsAuthenticationEnabled?, UserName?, Password?, Comments?, File*)> <!ATTLIST System IsActive (true | false) "false" Platform (Axcess | Netlinx) "Axcess" Transport (Serial | Modem | TCPIP) "Serial"> <!ELEMENT SysID (#PCDATA)> <!ELEMENT TransSerial (#PCDATA)> <!ELEMENT TransModem (#PCDATA)> <!ELEMENT TransTCPIP (#PCDATA)> <!ELEMENT VirtualNetLinxMasterFlag (#PCDATA)> <!ELEMENT VNMRestoreIPSettings (#PCDATA)> <!ELEMENT VNMSystemID (#PCDATA)> <!ELEMENT IsAuthenticationEnabled (#PCDATA)> <!ELEMENT UserName (#PCDATA)> <!ELEMENT Password (#PCDATA)> <!ELEMENT File ( Identifier, FilePathName, Comments?, DeviceMap*, IRDB*)> <!ATTLIST File Type (Source | MasterSrc | Include | Module | AXB | IR | TPD | TP4 | KPD | TKO | AMX_IR_DB | IRN_DB | Other | DUET) "Other" CompileType (Axcess | Netlinx | None) "None"> <!ELEMENT FilePathName (#PCDATA)> <!ELEMENT DeviceMap (DevName)> <!ATTLIST DeviceMap DevAddr CDATA #REQUIRED> <!ELEMENT DevName (#PCDATA)> <!ELEMENT IRDB (Property, DOSName, UserDBPathName, Notes)> <!ATTLIST IRDB DBKey CDATA #REQUIRED> <!ELEMENT Property (#PCDATA)> <!ELEMENT DOSName (#PCDATA)> <!ELEMENT UserDBPathName (#PCDATA)> <!ELEMENT Notes (#PCDATA)> ]> <Workspace CurrentVersion="3.0"><Identifier>AT-Sample</Identifier> <CreateVersion>3.0</CreateVersion> <PJS_File></PJS_File> <PJS_ConvertDate>04/13/2005 16:46:30</PJS_ConvertDate> <PJS_CreateDate>2002-09-13 13:52:02</PJS_CreateDate> <Comments> </Comments> <Project><Identifier>AT-Sample (Rev 0)</Identifier> <Designer>Jeff Coffler</Designer> <DealerID></DealerID> <SalesOrder></SalesOrder> <PurchaseOrder></PurchaseOrder> <Comments></Comments> <System IsActive="true" Platform="Netlinx" Transport="TCPIP"><Identifier>Main Controller</Identifier> <SysID>1</SysID> <TransSerial>COM1,38400,8,None,1,None</TransSerial> <TransModem>COM2,57600,8,None,1,None</TransModem> <TransTCPIP>netlinx.taltos.com:1319:1</TransTCPIP> <VirtualNetLinxMasterFlag>0</VirtualNetLinxMasterFlag> <VNMRestoreIPSettings>0.0.0.0:1319:1</VNMRestoreIPSettings> <VNMSystemID>1</VNMSystemID> <IsAuthenticationEnabled>0</IsAuthenticationEnabled> <UserName></UserName> <Password></Password> <Comments></Comments> <File CompileType="Netlinx" Type="MasterSrc"><Identifier>AT-Sample</Identifier> <FilePathName>AT-Sample.axs</FilePathName> <Comments></Comments> </File> <File CompileType="Axcess" Type="TPD"><Identifier>AT-TPD</Identifier> <FilePathName>AT-Sample.tpd</FilePathName> <Comments></Comments> </File> <File CompileType="None" Type="Include"><Identifier>AudiotronMod</Identifier> <FilePathName>AudiotronMod.axi</FilePathName> <Comments></Comments> </File> <File CompileType="None" Type="Include"><Identifier>SyslogMod</Identifier> <FilePathName>SyslogMod.axi</FilePathName> <Comments></Comments> </File> </System> </Project> </Workspace> |