[Openautomation-svn] SF.net SVN: openautomation:[1449] tools/russconnectd/trunk

[<ma...@us...>]

Revision: 1449
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1449&view=rev
Author:   makki1
Date:     2013-02-09 18:00:33 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Make it work with C5, not fully tested on older CA*

Modified Paths:
--------------
    tools/russconnectd/trunk/configure.ac
    tools/russconnectd/trunk/debian/changelog
    tools/russconnectd/trunk/debian/files
    tools/russconnectd/trunk/src/main.c

Modified: tools/russconnectd/trunk/configure.ac
===================================================================
--- tools/russconnectd/trunk/configure.ac	2013-02-09 16:26:33 UTC (rev 1448)
+++ tools/russconnectd/trunk/configure.ac	2013-02-09 18:00:33 UTC (rev 1449)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
-AC_INIT(russconnectd, 0.22, de...@wi..., , http://openautomation.sourceforge.net)
+AC_INIT(russconnectd, 0.30, de...@wi..., , http://openautomation.sourceforge.net)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: tools/russconnectd/trunk/debian/changelog
===================================================================
--- tools/russconnectd/trunk/debian/changelog	2013-02-09 16:26:33 UTC (rev 1448)
+++ tools/russconnectd/trunk/debian/changelog	2013-02-09 18:00:33 UTC (rev 1449)
@@ -1,3 +1,9 @@
+russconnectd (0.30-1) lenny; urgency=low
+
+  * adjust RNet for C5 - older models are untestet!
+
+ -- Michael Markstaller <de...@wi...>  Sat, 09 Feb 2013 17:28:57 +0100
+
 russconnectd (0.21-1) lenny; urgency=low
 
   * fixes/new upstream

Modified: tools/russconnectd/trunk/debian/files
===================================================================
--- tools/russconnectd/trunk/debian/files	2013-02-09 16:26:33 UTC (rev 1448)
+++ tools/russconnectd/trunk/debian/files	2013-02-09 18:00:33 UTC (rev 1449)
@@ -1 +1 @@
-russconnectd_0.21-1_i386.deb unknown extra
+russconnectd_0.30-1_i386.deb unknown extra

Modified: tools/russconnectd/trunk/src/main.c
===================================================================
--- tools/russconnectd/trunk/src/main.c	2013-02-09 16:26:33 UTC (rev 1448)
+++ tools/russconnectd/trunk/src/main.c	2013-02-09 18:00:33 UTC (rev 1449)
@@ -161,8 +161,19 @@
     }
 
     //Get Poweron-Volume
+    /* same stuff, cc zz twice
+    8.8.3 Get Turn On Volume
+    The current Turn On Volume for a particular zone can be obtained using the following message.
+    Byte # 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
+    Value F0 cc 00 7F cc zz kk 01 05 02 00 zz 00 04 00 00 xx F7
+    cc = controller number -1
+    zz = zone number -1
+    kk = keypad id = 0x70 (0x71 when connected to an ACA-E5).
+    xx = checksum */ 
     char buf_onvol[25] = { 0xF0, 0, 0, 0x7F, 0, 0, keypadid, 0x01, 0x05, 0x02, 0, 0, 0, 0x04, 0, 0, 0, 0xF7 };
     buf_onvol[1] = zone/ZONES_PER_CONTROLLER;
+    buf_onvol[4] = zone/ZONES_PER_CONTROLLER;
+    buf_onvol[5] = zone%ZONES_PER_CONTROLLER;
     buf_onvol[11] = zone%ZONES_PER_CONTROLLER;
     buf_onvol[16] = (int) russChecksum (buf_onvol,18-2);
     if (sendto(udpSocket, buf_onvol, 18, 0, (struct sockaddr *) &si_other, slen)==-1)
@@ -181,6 +192,8 @@
     xx = checksum
     */
     buf_getzone[1] = zone/ZONES_PER_CONTROLLER;
+    buf_getzone[4] = zone/ZONES_PER_CONTROLLER;
+    buf_getzone[5] = zone%ZONES_PER_CONTROLLER;
     buf_getzone[11] = zone%ZONES_PER_CONTROLLER;
     buf_getzone[15] = (int) russChecksum (buf_getzone,17-2);
     if (sendto(udpSocket, buf_getzone, 17, 0, (struct sockaddr *) &si_other, slen)==-1)
@@ -212,9 +225,23 @@
     */
     char buf_msg1[25] = { 0, 0, 0, 0x7F, 0, 0, keypadid, 0x05, 0x02, 0x02, 0, 0, 0xF1, 0x23, 0, 0, 0, 0, 0, 0x01, 0, 0xF7 };
     buf_msg1[1] = controller;
+    buf_msg1[4] = controller;
+    buf_msg1[5] = zone;
     buf_msg1[17] = zone;
+    /* Same stuff here: 8.4.2 Set Bass
+    Select the Bass level for a particular zone using a discrete message.
+    Byte # 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+    Value F0 cc 00 7F cc zz kk 00 05 02 00 zz 00 00 00 00 00 01 00 01 00 ## xx F7
+    cc = controller number -1
+    zz = zone number -1
+    kk = keypad id = 0x70 (0x71 when connected to an ACA-E5).
+    xx = checksum
+    Byte #22 = Bass level (0x00 = -10 ... 0x0A = Flat ... 0x14 = +10)
+    */
     char buf_msg2[25] = { 0, 0, 0, 0x7F, 0, 0, keypadid, 0, 0x05, 0x02, 0, 0, 0, 0, 0, 0, 0, 0x01, 0, 0x01, 0, 0, 0, 0xF7 };
     buf_msg2[1] = controller;
+    buf_msg2[4] = controller;
+    buf_msg2[5] = zone;
     buf_msg2[11] = zone;
 
     switch (func) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.