Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[460] tools/russconnectd
|
From: <ma...@us...> - 2011-10-20 23:41:56
|
Revision: 460
http://openautomation.svn.sourceforge.net/openautomation/?rev=460&view=rev
Author: makki1
Date: 2011-10-20 23:41:50 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
prepared autoconf-option without-eib; added keypad-id for C5; fixed sendOnStartUp; withdraw .tar.gz - this will go under sf/oa../files; Note: OpenWRT-Makefile will also be withdrawn here once settled&committed to upstream
Modified Paths:
--------------
tools/russconnectd/trunk/README
tools/russconnectd/trunk/configure.ac
tools/russconnectd/trunk/debian/changelog
tools/russconnectd/trunk/debian/files
tools/russconnectd/trunk/src/main.c
Removed Paths:
-------------
tools/russconnectd/release/
Modified: tools/russconnectd/trunk/README
===================================================================
--- tools/russconnectd/trunk/README 2011-10-20 23:12:13 UTC (rev 459)
+++ tools/russconnectd/trunk/README 2011-10-20 23:41:50 UTC (rev 460)
@@ -1,14 +1,16 @@
*** Russound RNET(R) to EIB/KNX bridge
- eibd is needed for KNX communication, either locally or remote
+(subject to get optional when TCP-Server/lirc-interface is implemented)
- uses mainly native Russound-Values
-TODO: document various values for Volume, bass,.. better
- controllers and zone-numbers are zero based!
- use socat or Moxa to get serial-data from/to UDP:
19200 8N1, No flowctrl, no special stop chars needed
*** INSTALL
-- needs pthread and libeibclient from bcusdk/eibd
+- needs pthread and libeibclient from bcusdk/eibd, but autotools etc. should
+work for release.tar.gz with
+./configure; make; make install
*** Group address structure:
- given a start-address the next 256 GA are used per 6 Zones, currently pretty hardcoded
@@ -19,23 +21,20 @@
10/1/2 WO Actuator powering the controllers (not yet)
10/1/10 W Zone 1 Power on/off 0/1
-... see .ods
+... -> see ga_list.ods for an example
-W = GA writeable
-RS = GA readable/sends status updates on change
-
*** TODO:
- see various TODO/FIXME in source
- reconnection/error-handling if network-problems occur (mainly eibd?)
-- prettify code / split main.c
-- fix dependency on uclibc++ (?) in OpenWRT Makefile
-- change russ UDP-socket to be shared for send/receive with listening (-l) sourceport for outgoing
- (makes usage with socat udp-recvfrom easier)
+- prettify code / split up main.c
+- fix dependency on uclibcxx (!?) in OpenWRT Makefile
- supply examples for socat
- directly connect serialport
*** Outlook
- *maybe* make much more modular and other interfaces (simple UDP/TCP server like C0 Z1 VolUp?)
-> implement RIO protocal partially
+-> connect to lirc directly?
- don't depend on libeibclient then
- *maybe* add outgoing interfaces for KNX-> mpd,vdr,.. to stick multiroom togehter
+- add at least a KNX-address to switch on/off to avoid ext. logic here
Modified: tools/russconnectd/trunk/configure.ac
===================================================================
--- tools/russconnectd/trunk/configure.ac 2011-10-20 23:12:13 UTC (rev 459)
+++ tools/russconnectd/trunk/configure.ac 2011-10-20 23:41:50 UTC (rev 460)
@@ -27,10 +27,13 @@
AM_PROG_LIBTOOL
+dnl **********
+dnl with ....
+dnl ''''''''''
+AC_ARG_WITH(eib, [ --without-eib build without EIB/KNX support])
+dnl not yet..
-
-
AC_OUTPUT([
Makefile
src/Makefile
Modified: tools/russconnectd/trunk/debian/changelog
===================================================================
--- tools/russconnectd/trunk/debian/changelog 2011-10-20 23:12:13 UTC (rev 459)
+++ tools/russconnectd/trunk/debian/changelog 2011-10-20 23:41:50 UTC (rev 460)
@@ -1,3 +1,9 @@
+russconnectd (0.2-ubuntu1) oneiric; urgency=low
+
+ * new upstream
+
+ -- Michael Markstaller <de...@wi...> Wed, 19 Oct 2011 20:36:42 +0200
+
russconnectd (0.1) unstable; urgency=low
* Initial Release.
Modified: tools/russconnectd/trunk/debian/files
===================================================================
--- tools/russconnectd/trunk/debian/files 2011-10-20 23:12:13 UTC (rev 459)
+++ tools/russconnectd/trunk/debian/files 2011-10-20 23:41:50 UTC (rev 460)
@@ -1 +1 @@
-russconnectd_0.1_i386.deb unknown extra
+russconnectd_0.2-ubuntu1_i386.deb unknown extra
Modified: tools/russconnectd/trunk/src/main.c
===================================================================
--- tools/russconnectd/trunk/src/main.c 2011-10-20 23:12:13 UTC (rev 459)
+++ tools/russconnectd/trunk/src/main.c 2011-10-20 23:41:50 UTC (rev 460)
@@ -26,7 +26,7 @@
#include <syslog.h>
#include <string.h>
#include <signal.h>
-#include <assert.h>
+//#include <assert.h>
#include <arpa/inet.h>
#include <netinet/in.h>
@@ -38,14 +38,13 @@
#define DEBUG 1
#define DAEMON_NAME "russconnectd"
-#define USAGESTRING "\n\t-d\tRun as daemon/No debug output\n\t-p <pidfile>\tPID-filename\n\t-i <ip:port>\tIP-Address:Port to send UDP-packets to russound\n\t-l <UDP-port>\tUDP port to listen on\n\t-a <KNX address>\tKNX start-address (see README)\n\t-z <number>\tNumber of Zones to support\n\t-u <eib url>\tURL to conatct eibd like localo:/tmp/eib or ip:192.168.0.101\n\t-s\t(Optional) send all values to KNX on startup of daemon\n"
-#define NUM_THREADS 2
+#define USAGESTRING "\n\t-d\tRun as daemon/No debug output\n\t-p <pidfile>\tPID-filename\n\t-i <ip:port>\tIP-Address:Port to send UDP-packets to russound\n\t-l <UDP-port>\tUDP port to listen on\n\t-a <KNX address>\tKNX start-address (see README)\n\t-z <number>\tNumber of Zones to support\n\t-u <eib url>\tURL to conatct eibd like localo:/tmp/eib or ip:192.168.0.101\n\t-s\t(Optional) send all values to KNX on startup of daemon\n\t-k 0x71\t(Optional) Keypad ID - defaults to 0x70 for CAx - use 0x71 for C5"
+#define NUM_THREADS 3
#define MAX_ZONES 31
#define RETRY_TIME 5
#define BUFLEN 1024
#define POLLING_INTERVAL 10
#define ZONES_PER_CONTROLLER 6
-#define RUSS_KEYPAD_ID 0x70
pthread_mutex_t zonelock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t initlock = PTHREAD_MUTEX_INITIALIZER;
@@ -81,6 +80,7 @@
int pidFilehandle;
char *pidfilename = "/var/run/russconnectd.pid";
int sendOnStart = 0;
+long int keypadid = 0x70;
//FIXME: also handle serial-port directly?
struct sockaddr_in si_me, si_other;
@@ -140,7 +140,7 @@
void *sendrussPolling(unsigned char zone) {
syslog(LOG_DEBUG, "polling zone %d",zone);
pthread_mutex_trylock(&standbylock);
- char buf_onvol[25] = { 0xF0, 0, 0, 0x7F, 0, 0, RUSS_KEYPAD_ID, 0x01, 0x05, 0x02, 0, 0, 0, 0x04, 0, 0, 0, 0xF7 };
+ 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[11] = zone%ZONES_PER_CONTROLLER;
buf_onvol[16] = (int) russChecksum (buf_onvol,18-2);
@@ -148,7 +148,7 @@
syslog(LOG_WARNING,"sendto failed!");
usleep(20*1000); //FIXME: throttle a little (20ms)
- char buf_getzone[25] = { 0xF0, 0, 0, 0x7F, 0, 0, RUSS_KEYPAD_ID, 0x01, 0x04, 0x02, 0, 0, 0x07, 0, 0, 0, 0xF7 };
+ char buf_getzone[25] = { 0xF0, 0, 0, 0x7F, 0, 0, keypadid, 0x01, 0x04, 0x02, 0, 0, 0x07, 0, 0, 0, 0xF7 };
buf_getzone[1] = zone/ZONES_PER_CONTROLLER;
buf_getzone[11] = zone%ZONES_PER_CONTROLLER;
buf_getzone[15] = (int) russChecksum (buf_getzone,17-2);
@@ -167,10 +167,10 @@
//block here until something is received from russound (it's turned off)
pthread_mutex_lock(&standbylock);
pthread_mutex_unlock(&standbylock);
- char buf_msg1[25] = { 0, 0, 0, 0x7F, 0, 0, RUSS_KEYPAD_ID, 0x05, 0x02, 0x02, 0, 0, 0xF1, 0x23, 0, 0, 0, 0, 0, 0x01, 0, 0xF7 };
+ 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[17] = zone;
- char buf_msg2[25] = { 0, 0, 0, 0x7F, 0, 0, RUSS_KEYPAD_ID, 0, 0x05, 0x02, 0, 0, 0, 0, 0, 0, 0, 0x01, 0, 0x01, 0, 0, 0, 0xF7 };
+ 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[11] = zone;
@@ -497,22 +497,22 @@
switch (func) {
case 1:
zones[num].zonepower =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,1,(knxstartaddress+30)+(zone*40)+(controller*256),val);
break;
case 2:
zones[num].srcid =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,51,(knxstartaddress+31)+(zone*40)+(controller*256),val);
break;
case 3:
zones[num].volume =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,5,(knxstartaddress+32)+(zone*40)+(controller*256),val*2);
break;
case 4:
zones[num].bass =val;
- if (zones[num].inited) {
+ if (zones[num].inited || sendOnStart) {
if (val<10)
sendKNXdgram (0x80,51,(knxstartaddress+33)+(zone*40)+(controller*256),val-10+256);
else
@@ -521,7 +521,7 @@
break;
case 5:
zones[num].treble =val;
- if (zones[num].inited) {
+ if (zones[num].inited || sendOnStart) {
if (val<10)
sendKNXdgram (0x80,51,(knxstartaddress+34)+(zone*40)+(controller*256),val-10+256);
else
@@ -530,12 +530,12 @@
break;
case 6:
zones[num].loudness =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,1,(knxstartaddress+35)+(zone*40)+(controller*256),val);
break;
case 7:
zones[num].balance =val;
- if (zones[num].inited) {
+ if (zones[num].inited || sendOnStart) {
if (val<10)
sendKNXdgram (0x80,51,(knxstartaddress+36)+(zone*40)+(controller*256),val-10+256);
else
@@ -544,17 +544,17 @@
break;
case 8:
zones[num].partymode =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,1,(knxstartaddress+37)+(zone*40)+(controller*256),val);
break;
case 9:
zones[num].dnd =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,1,(knxstartaddress+38)+(zone*40)+(controller*256),val);
break;
case 10:
zones[num].onvolume =val;
- if (zones[num].inited)
+ if (zones[num].inited || sendOnStart)
sendKNXdgram (0x80,5,(knxstartaddress+39)+(zone*40)+(controller*256),val*2);
break;
default:
@@ -570,26 +570,24 @@
syslog(LOG_DEBUG,"russ Controller:%d Zone:%d Status:%d src:%d vol:%d bass:%d treb:%d loud:%d bal:%d sys:%d shrsrc:%d party:%d,DnD:%d\n",
buf[4],buf[12],buf[20],buf[21],buf[22],buf[23],buf[24],buf[25],buf[26],buf[27],buf[28],buf[29],buf[30]);
buf[12] = (buf[4]*ZONES_PER_CONTROLLER)+buf[12]; //controller + zonenumber
- if (sendOnStart)
- zones[buf[12]].inited = 1;
- if (buf[20] != zones[buf[12]].zonepower)
+ if (buf[20] != zones[buf[12]].zonepower || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[20],1);
- if (buf[21] != zones[buf[12]].srcid)
+ if (buf[21] != zones[buf[12]].srcid || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[21],2);
- if (buf[22] != zones[buf[12]].volume)
+ if (buf[22] != zones[buf[12]].volume || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[22],3);
- if (buf[23] != zones[buf[12]].bass)
+ if (buf[23] != zones[buf[12]].bass || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[23],4);
- if (buf[24] != zones[buf[12]].treble)
+ if (buf[24] != zones[buf[12]].treble || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[24],5);
- if (buf[25] != zones[buf[12]].loudness)
+ if (buf[25] != zones[buf[12]].loudness || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[25],6);
- if (buf[26] != zones[buf[12]].balance)
+ if (buf[26] != zones[buf[12]].balance || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[26],7);
- if (buf[29] != zones[buf[12]].partymode)
+ if (buf[29] != zones[buf[12]].partymode || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[29],8);
- if (buf[30] != zones[buf[12]].dnd)
+ if (buf[30] != zones[buf[12]].dnd || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[30],9);
zones[buf[12]].inited = 1;
} else if ((len==24) && (buf[0]==0xF0) && (buf[9]==0x05) && (buf[13]==0x00)) { //zone turn-on volume
@@ -597,7 +595,7 @@
syslog(LOG_DEBUG,"russ Controller:%d Zone:%d TurnOnVolume:%d",
buf[4],buf[12],buf[21]);
buf[12] = (buf[4]*ZONES_PER_CONTROLLER)+buf[12]; //controller + zonenumber
- if (buf[21] != zones[buf[12]].onvolume)
+ if (buf[21] != zones[buf[12]].onvolume || (sendOnStart && !zones[buf[12]].inited))
updateZone(buf[12],buf[21],10);
} else {
//FIXME: just for debugging
@@ -740,7 +738,7 @@
char *p;
char pidstr[255];
- while ((c = getopt (argc, argv, "dp:i:l:a:z:u:s")) != -1)
+ while ((c = getopt (argc, argv, "dp:i:l:a:z:u:sk:")) != -1)
switch (c) {
case 'd':
daemonize = 1;
@@ -754,8 +752,8 @@
case 'i':
p = strtok(optarg,":");
russipaddr = p;
- p = strtok (NULL, ":");
- russport = atoi(p);
+ if ((p = strtok (NULL, ":")))
+ russport = atoi(p);
break;
case 'l':
listenport = atoi(optarg);
@@ -769,6 +767,9 @@
case 'u':
eibd_url = optarg;
break;
+ case 'k':
+ keypadid = strtol(optarg,NULL,16);
+ break;
case '?':
//FIXME: check arguments better, print_usage
fprintf (stderr, "Unknown option `-%c'.\nUsage: %s %s", optopt, argv[0], USAGESTRING);
@@ -786,8 +787,8 @@
if (!daemonize) {
setlogmask(LOG_UPTO(LOG_DEBUG));
openlog(DAEMON_NAME, LOG_CONS | LOG_NDELAY | LOG_PERROR | LOG_PID, LOG_USER);
- syslog(LOG_DEBUG, "startup with debug; Russ-IP: %s:%d, listenport %d, pidfile: %s, start address: %d, number of zones: %d, eibd: %s",
- russipaddr, russport, listenport, pidfilename, knxstartaddress, numzones, eibd_url);
+ syslog(LOG_DEBUG, "startup with debug; Russ-IP: %s:%d, listenport %d, pidfile: %s, start address: %d, number of zones: %d, eibd: %s SendonStartup: %d KeypadID: %d",
+ russipaddr, russport, listenport, pidfilename, knxstartaddress, numzones, eibd_url, sendOnStart, keypadid);
} else {
setlogmask(LOG_UPTO(LOG_INFO));
openlog(DAEMON_NAME, LOG_CONS, LOG_USER);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
