diff -Nru irclient-6.01.01/client.c irclient-6.01.05/client.c --- irclient-6.01.01/client.c 2009-04-28 22:30:17.000000000 +0000 +++ irclient-6.01.05/client.c 2010-11-01 20:52:13.000000000 +0000 @@ -78,6 +78,7 @@ int LoadIRDB (int bus,char filename[]); int ListRemotes (void); int ListCommands (char rem[]); +int ConvertBinary (char hexdata[]); #define TIMEOUT 30000 @@ -86,7 +87,7 @@ char send_remote[100]; char learn_remote[100]; -#define VERSION "6.01.01" +#define VERSION "6.01.05" main (int argc,char *argv[]) @@ -273,10 +274,10 @@ int SendUDP (char ip[],char cmdstr[]) { char stat[50]; - int res,rcv; - int irtlan_outbound,irtlan_in; + int res,len; + struct hostent *he; + int irtlan_outbound; struct sockaddr_in iadr; - struct sockaddr_in serv_addr; #ifdef WIN32 int err; @@ -290,45 +291,86 @@ irtlan_outbound = socket (PF_INET,SOCK_DGRAM,0); if (irtlan_outbound < 0) return (ERR_OPENSOCKET); - irtlan_in = socket (PF_INET,SOCK_DGRAM,0); - memset (&serv_addr,0,sizeof (serv_addr)); - serv_addr.sin_family = AF_INET; +// irtlan_in = socket (PF_INET,SOCK_DGRAM,0); +// memset (&serv_addr,0,sizeof (serv_addr)); +// serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = htonl (INADDR_ANY); - serv_addr.sin_port = htons (IRTRANS_PORT); +// serv_addr.sin_addr.s_addr = htonl (INADDR_ANY); +// serv_addr.sin_port = htons (IRTRANS_PORT); // serv_addr.sin_port = htons (50000); - rcv = bind (irtlan_in,(struct sockaddr *)&serv_addr,sizeof (serv_addr)); +// rcv = bind (irtlan_in,(struct sockaddr *)&serv_addr,sizeof (serv_addr)); memset (&iadr,0,sizeof (struct sockaddr)); iadr.sin_family = AF_INET; + + iadr.sin_addr.s_addr = inet_addr(ip); + if (iadr.sin_addr.s_addr == INADDR_NONE) { + he = (struct hostent *)gethostbyname (ip); + if (he == NULL) return (ERR_BINDSOCKET); + + memcpy(&iadr.sin_addr.s_addr, he->h_addr_list[0], 4); + } + iadr.sin_port = htons ((word)IRTRANS_PORT); -// iadr.sin_port = htons ((word)8010); if (connect (irtlan_outbound,(struct sockaddr *)&iadr,sizeof (struct sockaddr_in)) < 0) { printf ("Error Connect\n"); return (ERR_BINDSOCKET); } - res = send (irtlan_outbound,cmdstr,strlen (cmdstr),0); - if (res != (int)strlen (cmdstr)) { + if (!memcmp (cmdstr,"bsndccf",7)) { + + len = ConvertBinary (cmdstr + 8) + 7; + res = send (irtlan_outbound,cmdstr + 1,len,0); + } + + else { + len = strlen (cmdstr); + res = send (irtlan_outbound,cmdstr,strlen (cmdstr),0); + } + + if (res != len) { printf ("Error Sending\n"); return (ERR_BINDSOCKET); } - if (rcv < 0) printf ("ACK Rcv Socket busy (same machine ?)\n"); - else { - memset (stat,0,50); - recv (irtlan_in,stat,50,0); - printf ("RCV STAT: %s\n",stat); - } + memset (stat,0,50); + recv (irtlan_outbound,stat,50,0); + printf ("RCV STAT: %s\n",stat); return (0); } +int ConvertBinary (char hexdata[]) +{ + int val; + int rpos,wpos; + + rpos = wpos = 0; + + while (hexdata[rpos]) { + if (hexdata[rpos] >= 'a') val = (hexdata[rpos] + 10 - 'a') * 16; + else if (hexdata[rpos] >= 'A') val = (hexdata[rpos] + 10 - 'A') * 16; + else val = (hexdata[rpos] - '0') * 16; + rpos++; + if (hexdata[rpos] >= 'a') val += (hexdata[rpos] + 10 - 'a'); + else if (hexdata[rpos] >= 'A') val += (hexdata[rpos] + 10 - 'A'); + else val += (hexdata[rpos] - '0'); + rpos++; + hexdata[wpos++] = val; + + + while (hexdata[rpos] == ' ') rpos++; + } + + return (wpos); + +} + int SendSerial (char data[]) { NETWORKSTATUS stat; @@ -448,8 +490,9 @@ else if (!strcmp (led,"ext") || !strcmp (led,"Ext") || !strcmp (led,"EXT") || !strcmp (led,"E") || !strcmp (led,"e")) adr |= 2 << 17; else if (!strcmp (led,"all") || !strcmp (led,"All") || !strcmp (led,"ALL") || !strcmp (led,"A") || !strcmp (led,"a")) adr |= 3 << 17; else if (led[0] == 'l' || led[0] == 'L') { - iled = (led[1] - '0'); + iled = atoi (led + 1) - 1; adr |= (unsigned int)((iled & 7) << 27) | 0x80000000; + adr |= (unsigned int)((iled / 8) & 3) << 17; } } } @@ -1978,7 +2021,7 @@ struct sockaddr_in serv_addr; unsigned long adr; struct hostent *he; - struct in_addr addr; +// struct in_addr addr; #ifdef WIN32 @@ -1995,8 +2038,7 @@ if (adr == INADDR_NONE) { he = (struct hostent *)gethostbyname (host); if (he == NULL) return (ERR_FINDHOST); - memcpy(&addr, he->h_addr_list[0], sizeof(struct in_addr)); - adr = addr.s_addr; + memcpy(&adr, he->h_addr_list[0],4); } diff -Nru irclient-6.01.01/debian/changelog irclient-6.01.05/debian/changelog --- irclient-6.01.01/debian/changelog 2011-02-24 14:12:24.000000000 +0000 +++ irclient-6.01.05/debian/changelog 2011-02-24 14:12:24.000000000 +0000 @@ -1,3 +1,9 @@ +irclient (6.01.05-1yavdr1) lucid; urgency=low + + * new upstream version + + -- Gerald Dachs Thu, 24 Feb 2011 15:05:27 +0100 + irclient (6.01.01-1yvt1) karmic; urgency=low * initital release diff -Nru irclient-6.01.01/errcode.h irclient-6.01.05/errcode.h --- irclient-6.01.01/errcode.h 2008-11-11 00:21:57.000000000 +0000 +++ irclient-6.01.05/errcode.h 2010-11-01 20:52:16.000000000 +0000 @@ -32,6 +32,8 @@ #define ERR_VERSION 3 #define ERR_TIMEOUT 4 #define ERR_READVERSION 5 +#define ERR_USBCOM 6 +#define ERR_NETIO 7 #define ERR_DBOPENINPUT 11 #define ERR_REMOTENOTFOUND 12 @@ -67,6 +69,23 @@ #define ERR_SENDOK 42 #define ERR_CCFLEN 43 #define ERR_ACTIONSEND 44 +#define ERR_CCFSYNTAX 45 +#define ERR_SSID_WLAN 46 +#define ERR_SEND_DISABLED 47 +#define ERR_SEND_LED 48 +#define ERR_IRDB_EMPTY 49 +#define ERR_OUTPUT_BUSY 50 +#define ERR_MACRO_LENGTH 51 +#define ERR_MACRO_COUNT 52 +#define ERR_NO_MACRO 53 +#define ERR_ANALOG 54 + + +#define ERR_LEARN_LENGTH 95 +#define ERR_LEARN_RAWLEN 96 +#define ERR_LEARN_TIMECNT 97 +#define ERR_LEARN_TC_LEN 98 + #define ERR_OPENSOCKET 100 #define ERR_BINDSOCKET 101 diff -Nru irclient-6.01.01/flash.h irclient-6.01.05/flash.h --- irclient-6.01.01/flash.h 2009-02-14 20:51:02.000000000 +0000 +++ irclient-6.01.05/flash.h 2010-11-01 20:52:17.000000000 +0000 @@ -62,6 +62,9 @@ #define PC_TRANS 2 #define PC_OFF 3 +#define TRANSLATE_LAN_INPUT 16 +#define TRANSLATE_SBUS_INPUT 32 + #define TRANSM_MASK 240 #define TRANSM_INTERN 1 @@ -127,7 +130,7 @@ #define FLASH_MODE_LAN_DB 8 #define FLASH_MODE_LANRELAIS 16 #define FLASH_MODE_IRDB_SENDONLY 32 -//#define FLASH_MODE_IRDB_PASSTHROUGH Flag 64 noch frei +#define FLASH_MODE_SEND_LINE 64 #define FLASH_MODE_SEND_BINARY 128 @@ -183,10 +186,13 @@ byte high_commands[50]; } ADC_ENTRY; + typedef struct { word remote_cnt; word remote_adr; word remote_hash_adr; + +#ifndef NO_RECEIVE word command_cnt; word ircommand_adr; word ircommand_hash_adr; @@ -198,8 +204,11 @@ byte rs232_config[4]; word action_cnt; word action_adr; +#endif + } IRDB_TABLE_SHORT; + typedef struct { word remote_cnt; word remote_adr; @@ -285,8 +294,16 @@ } IRDB_HEADER_ONLY; typedef union { +#ifdef FLASHROM_TRANSLATOR FLASH_CONTENT_MEMORY translation_mem; +#else + byte dummy1; +#endif +#if defined (FLASHROM_IRDB) IRDB_TABLE_SHORT irdb_mem; +#else + byte dummy2; +#endif } FLASH_COMMON_HEADER_SHORT; //typedef union { @@ -544,12 +561,12 @@ void set_flashadr (word adr); void read_nextflashdata (byte *pnt,word cnt); void signal_error (void); -void set_commanddata (int pos,IRDATA *irpnt,int bus); +void set_commanddata (int pos,IRDATA *irpnt,int bus,int tra); void switch_relay (byte val); byte irdb_findircommand (byte ircommand[],byte irlen,byte adr,byte *data); byte irdb_send_string (byte *str,byte len); byte IRDBSendBinary (byte *str,byte len); -byte irdb_send (byte remote[],byte command[],byte led,word mask,byte stat); +byte irdb_send (byte remote[],byte command[],byte led,word mask,byte stat,byte pause); void ADCReceive (IRDB_REMOTE_EX *rem,IRDB_COMMAND_COMPACT *com,IRRECEIVE *ir); byte irdb_receive (void); byte irdb_format_receive (byte ircommand[],byte len,byte start,byte cmp_len,word adr); diff -Nru irclient-6.01.01/functioncodes.h irclient-6.01.05/functioncodes.h --- irclient-6.01.01/functioncodes.h 2009-02-14 20:51:02.000000000 +0000 +++ irclient-6.01.05/functioncodes.h 2010-11-01 20:52:18.000000000 +0000 @@ -43,6 +43,29 @@ #define FN2_MULTIRELAY2 512 #define FN2_DUTYCYCLE 1024 #define FN2_SBUS_SEND 2048 +#define FN2_SEND_ACK 4096 +#define FN2_USB_WAKEUP 8192 +#define FN2_STATEIO_SBUS 16384 +//#define FN2_STATEIO_2_ANALOG 32768 Frei +//#define FN2_STATEIO_4_ANALOG 65536 DOPPELT !!! +#define FN2_RS232_IO_SBUS 0x10000 +#define FN2_RS232_OUT_IR 0x20000 +#define FN2_AUX_RS232 0x40000 +#define FN2_RS232_PARAMETER 0x80000 +#define FN2_AUXRS232_PARAMETER 0x100000 +#define FN2_MULTISEND16 0x200000 +#define FN2_STATEIO_IRIN 0x400000 +#define FN2_SW_SEL_EXT_LOW 0x800000 +#define FN2_IRIN_EXTRA_LINE 0x1000000 +#define FN2_RELAY_SBUS 0x2000000 +#define FN2_EXT_HI_LO_SINGLE 0x4000000 // Single External RCV Connector for HI&LOW RCV +#define FN2_RC5_FREE_TIMING 0x8000000 +#define FN2_INTERNAL_PLASMA 0x10000000 +#define FN2_HF_BLASTER 0x20000000 +#define FN2_RS232_IN_IR 0x40000000 +#define FN2_RS232_UDP_RELAY 0x80000000 + + #define FN3_RCV_LOW_56 1 #define FN3_RCV_LOW_38 2 @@ -60,6 +83,19 @@ #define FN3_RCV_HI_CODELEARN 96 #define FN3_RCV_HI_ACTIVE 128 +#define FN3_DUAL_RCV_EXTERNAL 256 +#define FN3_WLAN 512 +#define FN3_MULTISTREAM 1024 +#define FN3_VAR_SEND_POWER 2048 +#define FN3_NO_RECEIVE 4096 +#define FN3_SEND_MACRO 8192 +#define FN3_ONE_WIRE_IR1 16384 +#define FN3_ONE_WIRE_IR2 32768 +#define FN3_ONE_WIRE_ANALOG1 0x10000 +#define FN3_ONE_WIRE_ANALOG2 0x20000 +#define FN3_IRIN_ANALOG 0x40000 + #define FN_DISPMASK 0x38000 -#define FUNCTION_FLASH_MASK ~(FN_SBUS_UART | FN_CLOCK | FN_DEBOUNCE | FN_DUALPOWERON | FN_USBWAKEUP | FN_NOSCROLL | FN_TRANSL | FN_CALIBRATE | FN_POWERON) +#define FUNCTION_FLASH_MASK ~(FN_SBUS_UART | FN_CLOCK | FN_DEBOUNCE | FN_DUALPOWERON | FN_USBWAKEUP | FN_NOSCROLL | FN_TRANSL | FN_CALIBRATE | FN_POWERON) +#define FUNCTION_FLASH_MASK_2 (FN2_AUX_RS232 | FN2_MULTISEND16) Binary files /tmp/OOVLy8xBqU/irclient-6.01.01/irclient and /tmp/WvZScS_nF_/irclient-6.01.05/irclient differ Binary files /tmp/OOVLy8xBqU/irclient-6.01.01/irclient64 and /tmp/WvZScS_nF_/irclient-6.01.05/irclient64 differ diff -Nru irclient-6.01.01/network.h irclient-6.01.05/network.h --- irclient-6.01.01/network.h 2009-02-14 20:51:02.000000000 +0000 +++ irclient-6.01.05/network.h 2010-11-01 20:52:20.000000000 +0000 @@ -106,6 +106,23 @@ #define COMMAND_LEARNCCF 68 #define COMMAND_STATUSEX2 69 #define COMMAND_SETSTATEX2 70 +#define COMMAND_LEARNRS232 71 +#define COMMAND_SENDMASK 72 +#define COMMAND_RESENDMASK 73 +#define COMMAND_SSIDLIST 74 +#define COMMAND_WLANPARAM 75 +#define COMMAND_STOREWLAN 76 +#define COMMAND_READ_SYSPARAM 77 +#define COMMAND_WRITE_SYSPARAM 78 +#define COMMAND_LANPARAM 79 +#define COMMAND_LOGLEVEL 80 +#define COMMAND_LEARNLINK 81 +#define COMMAND_SENDMACRO 82 +#define COMMAND_READ_ANALOG_EX 83 +#define COMMAND_NORECEIVE 84 + +#define COMMAND_LAN_ANALOG 'a' // 97 +#define COMMAND_LAN_PING 'p' // 112 #define COMMAND_SENDSTRING 's' // 115 @@ -135,6 +152,11 @@ #define STATUS_RECEIVE_ASCII 22 #define STATUS_LOG 23 #define STATUS_DEVICEMODEEX2 24 +#define STATUS_SSIDLIST 25 +#define STATUS_WLANPARAMETER 26 +#define STATUS_SYSPARAMETER 27 +#define STATUS_LANPARAMETER 28 +#define STATUS_ANALOGINPUT_EX 29 #define STATUS_ASCII 65 @@ -186,6 +208,15 @@ int8_t framebuffer[200]; } OLD_LCDCOMMAND; +typedef struct { + uint8_t netcommand; // 0 + uint8_t mode; // 1 + uint16_t pause; // 2 + int32_t adress; // 4 + int32_t protocol_version; // 8 + int8_t remote[80]; // 12 + int8_t command[416]; // 92 +} MACRO_NETCOMMAND; // 508 typedef struct { uint8_t netcommand; @@ -279,7 +310,7 @@ // xxxxxxxx xxxxxxx1 xxxxxxxx xxxxxxxx Netmask aktiv (wie bisher genutzt) // xxxxxxxx xxxxx11x xxxxxxxx xxxxxxxx LED Auswahl (intern / extern) // xxxxx111 11111xxx xxxxxxxx xxxxxxxx Bus Auswahl (mehrere USB / LAN Module; max: 0-255 = 256 Stück) -// 1x111xxx xxxxxxxx xxxxxxxx xxxxxxxx Auswahl mehrer externer LEDs - bis zu 8 +// 1x111xxx xxxxxxxx xxxxxxxx xxxxxxxx Auswahl mehrer externer LEDs - bis zu 8/32 // x1xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Broadcast über alle USB / LAN Module @@ -303,7 +334,8 @@ int32_t protocol_version; uint8_t len; uint8_t align; - uint16_t align2; + uint8_t adr; + uint8_t parameter; uint8_t data[256]; } SERCOMMAND; @@ -381,7 +413,8 @@ int32_t target_mask; uint8_t multi_num; uint8_t include_names; - uint8_t dummy[2]; + uint8_t io_input; + uint8_t io_value; } TRANSLATECOMMAND; @@ -470,13 +503,19 @@ int16_t statuslen; int16_t statustype; ANALOG_INPUTS inputs; -// ANALOG_DATA inputs; } ANALOGBUFFER; typedef struct { uint32_t clientid; int16_t statuslen; int16_t statustype; + ANALOG_INPUTS_EX inputs; +} ANALOGBUFFER_EX; + +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; int32_t serno; int32_t functions; int8_t version[8]; @@ -509,6 +548,77 @@ int16_t count_buffer; int16_t count_total; int16_t count_remaining; + char WLAN_SSID[32][32]; + byte WLAN_type[32]; + byte WLAN_rssi[32]; +} WLANBUFFER; + +typedef struct { + uint8_t netcommand; // 0 + uint8_t mode; // 1 + uint16_t timeout; // 2 + int32_t adress; // 4 + int32_t protocol_version; // 8 + WIFI_MODE wlan; // 12 +} WLANCONFIGCOMMAND; + + +typedef struct { + uint32_t clientid; // 12 + int16_t statuslen; // 16 + int16_t statustype; // 18 + byte ip_adr[4]; // 20 + byte ip_netmask[4]; // 24 + byte ip_gateway[4]; // 28 + byte ntp_server[4]; // 32 + byte dhcp_flag; // 33 + byte wpa_key[64]; // 34 + byte wlan_ssid[32]; // 98 + byte wlan_channel; //130 + byte wlan_speed; //131 + byte wlan_power; // Sending Power 132 + byte wlan_mode; //(AD-Hoc / AP) 133 + byte wlan_security; // 134 + byte connected_mode; // 135 + byte connected_rssi; // 136 + byte timezone; // 137 + byte mac_addr[6]; // 138 + byte connected_if; // 144 +} WLANSTATUSBUFFER; + + +typedef struct { + uint8_t netcommand; // 0 + uint8_t mode; // 1 + uint16_t timeout; // 2 + int32_t adress; // 4 + int32_t protocol_version; // 8 + SYS_PARAMETER sysparm; // 12 +} SYSPARAMCOMMAND; + +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; + LAN_PARAMETER lanparm; +} LANSTATUSBUFFER; + +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; + SYS_PARAMETER sysparm; +} SYSPARAMBUFFER; + + +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; + int16_t offset; + int16_t count_buffer; + int16_t count_total; + int16_t count_remaining; BUSLINE bus[40]; } BUSBUFFER; @@ -743,6 +853,8 @@ #define MODE_ASCII 1 +#define MODE_ASCII_TIME 5 +#define MODE_NO_RECEIVE 10 #define TCP_PORT 21000 diff -Nru irclient-6.01.01/remote.h irclient-6.01.05/remote.h --- irclient-6.01.01/remote.h 2009-02-14 20:51:02.000000000 +0000 +++ irclient-6.01.05/remote.h 2010-11-01 20:52:22.000000000 +0000 @@ -69,6 +69,7 @@ #endif #endif +#define MAX_1WIRE_ID 16 #ifdef AMEX #define VCC_THRESHOLD 180 @@ -167,12 +168,96 @@ byte data[CODE_LENRAW]; // 9 } IRRAW; +typedef struct { + byte len; // 0 + byte checksumme; // 1 + byte command; // 2 + byte address; // 3 + word target_mask; // 4 + + word total_len; // 6 + byte ir_command_cnt; // 8 + byte macro_pause[16]; // 9 +} IRDATA_MACRO; // 25 + + +typedef struct { + byte len; // 0 + byte checksumme; // 1 + byte command; // 2 + + byte address; // 3 + word mask; // 4 + + byte mode; // 6 + byte id[8][8]; // 7 +} ANALOG_REQUEST; // 73 + +typedef struct { + byte len; // 0 + byte checksumme; // 1 + byte command; // 2 + + byte address; // 3 + word mask; // 4 + + byte mode; // 6 + byte id[8][8]; // 7 + byte idlist[MAX_1WIRE_ID][8]; // 73 +} ANALOG_BUFFER; //201 + + + typedef union { - IRDATA irdata; - IRRAW irraw; - IRDATA_18 irdata18; + IRDATA irdata; + IRRAW irraw; + IRDATA_18 irdata18; + IRDATA_MACRO irmacro; + ANALOG_REQUEST analog; + ANALOG_BUFFER abuffer; } IRDATA_ALL; +typedef struct { + byte len; // 0 + byte checksumme; // 1 + byte command; // 2 + + byte address; // 3 + word target_mask; // 4 + + byte ir_length; // 6 + byte transmit_freq; // 7 + byte mode; // 8 + + int16_t pause_len[TIME_LEN]; // 9 + int16_t pulse_len[TIME_LEN]; // 25 + byte time_cnt; // 41 + byte ir_repeat; // 42 + byte repeat_pause; // 43 + + byte data[1024]; // 44 +} IRDATA_LARGE; + +typedef struct { + byte len; // 0 + byte checksumme; // 1 + byte command; // 2 + byte address; // 3 + byte parameter; // 4 + + byte data[250]; // 5 +} RS232_DATA; + +typedef struct { + byte len; // 0 + byte checksumme; // 1 + byte seq_number; // 2 + byte error_code; // 3 + byte data_len; // 4 + + byte data[250]; // 5 +} RS232_RECEIVE; + #ifndef AVR @@ -197,6 +282,7 @@ #define VERSION_MAGIC_2 0x640b #define VERSION_MAGIC_3 0xb3 #define VERSION_MAGIC_4 0x8b +#define VERSION_MAGIC_5 0x27 #define VERSION_MAGIC_CHECK 0xaa #define VERSION_MAGIC_CHECKR 0x68 @@ -204,6 +290,7 @@ #define FLASH_TYPE_LAN 0xff01 #define FLASH_TYPE_IRDB 0xff02 #define FLASH_TYPE_IRDBAUX 0xff03 +#define FLASH_TYPE_WLAN 0xff04 #define SENDMASK_LEN 16 @@ -219,11 +306,17 @@ #define COMMAND_FLASH_ACK_2 209 #define COMMAND_FLASH_CRC 210 #define COMMAND_FLASH_IR 211 +#define COMMAND_SEND_ACK 212 +#define COMMAND_SEND_ACK_WAIT 213 +#define COMMAND_SEND_ACK2 214 +#define COMMAND_SEND_ACK_BUSY 215 + +#define COMMAND_LAN_ANALOG 'a' #define COMMAND_LAN_SENDSTRING 's' #define COMMAND_LAN_PING 'p' #define COMMAND_LAN_SENDCCF 'c' - +#define COMMAND_LAN_GETINFO 'g' @@ -247,17 +340,48 @@ #define RESULT_IR_BROADCAST_LED 247 #define RESULT_AUX_FORMAT 248 #define RESULT_ANALOG_INPUT 249 +#define RESULT_SEND_DONE 250 +#define RESULT_SEND_RS232 251 +#define RESULT_RCV_RS232 252 +#define RESULT_WLAN_STATUS 253 +#define ADR_POWERON_1 60 +#define ADR_POWERON_2 250 +#define ADR_STATUSINFO 30 +#define ADR_RS232DATA 44 + +#define LEN_SYSPARM (sizeof (SYS_PARAMETER)-4) // LEN = 191 -> capabilities not stored in EEPROM + +#if defined LAN + #define ADR_LANPARM 256 -#define LEN_LANPARM (sizeof (LAN_PARAMETER)-3) // LEN = 21 +#define LEN_LANPARM (sizeof (LAN_PARAMETER) - 11) // LEN = 21 -> Nur LAN Parameter speichern - keine Modes #define ADR_SYSPARM (ADR_LANPARM+LEN_LANPARM) -#define LEN_SYSPARM (sizeof (SYS_PARAMETER)-4) // LEN = 191 -> capabilities not stored in EEPROM #define ADR_WAKEMAC (ADR_LANPARM+LEN_LANPARM+164) + +#elif defined WIFI + +#define ADR_WIFIMODE 256 +#define LEN_WIFIMODE (sizeof (WIFI_MODE) - 13) +#define ADR_SYSPARM (ADR_WIFIMODE+LEN_WIFIMODE) +#define ADR_WAKEMAC (ADR_WIFIMODE+LEN_WIFIMODE+164) + +#endif + #define ADR_TIMER (ADR_SYSPARM+LEN_SYSPARM) #define LEN_TIMER sizeof (TIMER_ENTRY_GET) // LEN = 117 -#define MAX_1WIRE_ID 16 + +#define WIFI_UPDATE_INTERFACE 255 +#define WIFI_UPDATE_CRC 254 +#define WIFI_UPDATE_KERMIT 253 +#define WIFI_UPDATE_START 252 +#define WIFI_UPDATE_NEXT 251 + +#define WIFI_UPLOAD_DONE 1 +#define WIFI_FLASH_DONE 2 +#define WIFI_FLASH_WRITE_OK 3 typedef struct { uint8_t mode; @@ -310,9 +434,24 @@ uint8_t ircommand[121]; uint16_t mask; uint8_t ledselect; + uint8_t ledmaskflag; } IRCOMMAND_BUF; typedef struct { + uint8_t len; // 0 + uint8_t checksumme; // 1 + uint8_t command; // 2 + uint8_t ledselect; // 3 + uint16_t mask; // 4 + uint8_t ledmaskflag; // 6 + uint8_t remote_len; // 7 + uint8_t pause_len; // 8 + + uint8_t rem_cmd[208]; // 9 +} IRCOMMAND_BUF_COMPACT; + + +typedef struct { uint8_t len; uint8_t checksumme; uint8_t command; @@ -340,6 +479,15 @@ #define FLASH_TABLE_LEN ((sizeof (FLASH_TABLE) + 1) / 2) typedef struct { + word crc; + word type; + uint32_t len; + char name[16]; + byte data[2]; +} WIFI_FLASH_TABLE; + + +typedef struct { uint8_t netcommand; word adr; word len; @@ -359,8 +507,16 @@ uint8_t mode; uint16_t timeout; uint32_t sendmask[SENDMASK_LEN]; + IRDATA ir_data_mem; +} IRDATA_LANBUF; + +typedef struct { + uint8_t netcommand; + uint8_t mode; + uint16_t timeout; + uint32_t sendmask[SENDMASK_LEN]; IRDATA ir_data; - byte buffer[256]; + byte buffer[1024]; } IRDATA_LAN_LARGE; typedef struct { @@ -400,14 +556,14 @@ } GETVERSION_LAN_EX; typedef struct { - uint8_t netcommand; - uint8_t len; - uint8_t ir_version[8]; - uint32_t ir_capabilities; - uint32_t ir_serno; - uint8_t lan_version[8]; - uint8_t mac_adr[6]; - uint32_t ir_capabilities2; + uint8_t netcommand; // 0 + uint8_t len; // 1 + uint8_t ir_version[8]; // 2 + uint32_t ir_capabilities; // 10 + uint32_t ir_serno; // 14 + uint8_t lan_version[8]; // 18 + uint8_t mac_adr[6]; // 26 + uint32_t ir_capabilities2; // 32 uint32_t ir_capabilities3; uint32_t ir_capabilities4; uint8_t extended_mode; @@ -416,6 +572,25 @@ } GETVERSION_LAN_EX2; typedef struct { + uint8_t netcommand; // 0 + uint8_t len; // 1 + uint8_t ir_version[8]; // 2 + uint32_t ir_capabilities; // 10 + uint32_t ir_serno; // 14 + uint8_t lan_version[8]; // 18 + uint8_t mac_adr[6]; // 26 + uint32_t ir_capabilities2; // 32 + uint32_t ir_capabilities3; + uint32_t ir_capabilities4; + uint8_t extended_mode; + uint8_t extended_mode2; + uint8_t extended_mode_ex[8]; + uint8_t extended_mode_ex2[8]; + uint8_t ext_rs232_setting[8]; + uint8_t reserverd[8]; +} GETVERSION_LAN_EX3; + +typedef struct { uint32_t access_ip[8]; // 0 // Erlaubte Input IPs uint32_t access_mask[8]; // 32 // Netmask dazu uint32_t ir_relay_from[16]; // 64 // IR Relay von diesen Adressen erlaubt @@ -424,7 +599,7 @@ uint8_t wakeonlan_mac[6]; // 164 // Zielhost für WakeOnLAN Pakete (PowerOn) int8_t password[12]; // 170 uint8_t broadcast_relay; // 182 - uint8_t udp_format_len; // 183 + uint8_t ir_relay_led_h; // 183 uint16_t udp_port; // 184 uint8_t tz; // 186 uint32_t ntp_ip; // 187 @@ -454,17 +629,18 @@ } UDP_FORMAT_STORE; typedef struct { - uint8_t len; - uint8_t dhcp_flag; - uint8_t fallback_flag; - uint8_t mac_adr[6]; - uint32_t ip_adr; - uint32_t ip_netmask; - uint32_t ip_gateway; - uint8_t eeprom_device_mode; - uint8_t eeprom_extended_mode; - uint8_t eeprom_extended_mode2; -} LAN_PARAMETER; + uint8_t len; // 0 + uint8_t dhcp_flag; // 1 + uint8_t fallback_flag; // 2 + uint8_t mac_adr[6]; // 3 + uint32_t ip_adr; // 9 + uint32_t ip_netmask; // 13 + uint32_t ip_gateway; // 17 + uint8_t eeprom_device_mode; // 21 + uint8_t eeprom_extended_mode; // 22 + uint8_t eeprom_extended_mode2; // 23 + uint8_t eeprom_extended_mode_ex[8]; // 24 +} LAN_PARAMETER; // 32 typedef struct { uint8_t len; @@ -568,6 +744,27 @@ REMOTELINE remotes[3]; } REMOTEBUFFER_SHORT; +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; + int16_t offset; + int16_t count_buffer; + int16_t count_total; + int16_t count_remaining; + REMOTELINE remotes[10]; +} REMOTEBUFFER_WIFI; + +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; + int16_t offset; + int16_t count_buffer; + int16_t count_total; + int16_t count_remaining; + int8_t commands[40][20]; +} COMMANDBUFFER_WIFI; typedef struct { int16_t statuslen; @@ -626,37 +823,40 @@ uint8_t value[8]; } ANALOG_INPUTS; -typedef struct { - uint8_t len; - uint8_t mode[MAX_1WIRE_ID]; - uint8_t id[MAX_1WIRE_ID][8]; -} ANALOG_INFO; - -typedef struct { - uint8_t len; - uint8_t mode[8]; - uint8_t dummy; - int16_t value[8]; -} ANALOG_HIRES_INPUTS; - - typedef union { - ANALOG_INPUTS a_input; - ANALOG_HIRES_INPUTS a_hires; - ANALOG_INFO a_info; + int16_t signed_val; + uint16_t unsigned_val; + uint8_t id[8]; } ANALOG_DATA; typedef struct { uint8_t netcommand; - ANALOG_DATA ad; -} GET_ANALOG_DATA; + ANALOG_INPUTS ai; +} GET_ANALOG_INPUTS; +typedef struct { + uint8_t len; + uint8_t mode[MAX_1WIRE_ID]; + ANALOG_DATA data[MAX_1WIRE_ID]; +} ANALOG_INPUTS_EX; typedef struct { uint8_t netcommand; - ANALOG_INPUTS ai; -} GET_ANALOG_INPUTS; + ANALOG_INPUTS_EX ai; +} GET_ANALOG_INPUTS_EX; +typedef struct { + uint32_t clientid; + int16_t statuslen; + int16_t statustype; + ANALOG_INPUTS_EX inputs; +} ANALOGBUFFER_WIFI; + + + +#define DEVMODE_WIFI 5 +#define DEVMODE_TIMEOUT 6 +#define DEVMODE_RS232 8 // Mode Flags #define DEVMODE_PC 0 @@ -721,6 +921,8 @@ #define SBUS_BAUD_9600 8 #define SBUS_BAUD_19200 16 #define SBUS_BAUD_38400 24 +#define SBUS_BAUD_57600 0 +#define SBUS_BAUD_115200 8 #define IR_FILTER_MASK 224 // Bit 5-7 #define IR_FILTER_64 0 @@ -747,7 +949,86 @@ #define TOGGLE_MAP_LEN 128 // EX[5] -#define SBUS_SEND_MODE 1 +#define SBUS_SEND_MODE 1 +#define USB_WAKEUP 2 +#define LONG_DEBOUNCE 4 // Frei !!! +#define STATE_INPUT_IRIN_MASK 56 +#define STATE_INPUT_IRIN 8 +#define STATE_IRIN_PULLUP 16 +#define STATE_IRIN_INVERT 24 +#define STATE_IRIN_ANALOG 32 +#define INTERNAL_LED_STATE 64 +#define EXTERNAL_LED_STATE 128 + +// EX[6] +#define SBUS_RS232_SEND 1 +#define SBUS_RELAY 1 +#define IR_IN_RS232_SEND 1 +#define AUX_DATA_BITS_7 2 +#define AUX_DATA_BITS_8 0 +#define AUX_STOPBIT_1 0 +#define AUX_STOPBIT_2 4 +#define AUX_PARITY_MASK 24 +#define AUX_PARITY_NONE 0 +#define AUX_PARITY_EVEN 8 +#define AUX_PARITY_ODD 16 +#define SBUS_RS232_RCV 32 +#define IR_IN_RS232_RCV 32 +#define IR_OUT_RS232_SEND 64 +#define AUX_RS232_EXTBAUDRATE 128 + +// EX[7] +#define RC5_FREE_TIMING 1 +#define BROADCAST_RS232_RCV 2 +#define STATE_SBUS_INVERT 4 +#define EMULATE_ALL_EXTERNAL 8 +#define RS232_EXTBAUDRATE 16 +#define LEARN_LONG_IRCODE 32 +#define ONE_WIRE_MASK 192 + +#define AUX_PARAMETER_SET 1 +#define AUX_BAUDRATE_MASK 24 +#define AUX_BAUDRATE_4800 0 +#define AUX_BAUDRATE_9600 8 +#define AUX_BAUDRATE_19200 16 +#define AUX_BAUDRATE_38400 24 + + +/* + +Ex Bereich erweitern (12 oder 16 Bytes) + +Alle IRTrans Geräte: +- 2 RS232 +- 1 Status Input + +64K/4K RAM Geräte: +- 8 RS232 +- 4 Status Inputs mit Lower/Upper + +RS232: +Je RS232 Port 1 Byte + + +Baudrate + Enable 7 +Stopbits 8 +Parity 48 +Databits 64 +Frei **** 128 + +Status Input: +Je Status 1 Byte + 2 Byte bei Analog I/O + +Output Number/Enable 31 (0 = Off,1 Internal,2 External,3 All,4 Out 1 ... +Pullup 32 +Pulldown 64 +Invert 128 + +Lower Margin Byte +Upper Margin Byte + +Alle Parameter nur im EEPROM halten +*/ #define LRN_TIMEOUT_MASK 7 // Maske beim Lernen #define LRN_TIMEOUT_SELECT 8 @@ -769,6 +1050,7 @@ #define LRN_BO_MODE_SELECT 4 #define LRN_BO_MODE 8 #define LRN_TOGGLE_MAP 16 +#define LRN_LONG_CODE 32 #define LOCAL_MODE 16 #define RECEIVE_ALL 17 @@ -780,6 +1062,7 @@ #define INSTANT_MODE 1024 #define IDLE_WAIT 2048 #define TOGGLE_MAP 4096 +#define WIFI_INPUT_MODE 8192 #define SPECIAL_RCV_MODE 31 @@ -796,6 +1079,19 @@ #define SBUS_UART 128 // Set: SBUS läuft über UART #define DEVMODE_RAWFAST 64 +#define RCV_56 1 +#define RCV_38 2 +#define RCV_455 4 +#define RCV_455_PLASMA 5 +#define RCV_CARRIER 6 +#define RCV_EXTERNAL 8 + +#define RCV_MODE_56 0 +#define RCV_MODE_38 1 +#define RCV_MODE_455 2 +#define RCV_MODE_CARRIER 3 +#define RCV_MODE_EXTERNAL 4 + #define LONG_CODE_FLAG 128 @@ -817,6 +1113,7 @@ #define RCV_STATUS_ACTIVE 4 #define RCV_STATUS_IRTIMEOUT 0 #define RCV_STATUS_READY 6 +#define RCV_STATUS_RS232 8 #define RCV_STATUS_REPEATCNT 16 #define RCV_STATUS_LENGTH 32 @@ -826,6 +1123,17 @@ #define RCV_STATUS_ERROR 255 +// State I/O Konstanten +#define STATE_IO_INPUT_MASK 240 +#define STATE_IO_INPUT_SBUS 16 +#define STATE_IO_INPUT_IRIN 32 + +#define STATE_IO_INPUT_SBUS_VAL 1 +#define STATE_IO_INPUT_IRIN_VAL 1 + +#define SBUS_MODE_STATE_IO 8 +#define SBUS_MODE_STATE_IO_PU 16 +#define SBUS_MODE_STATE_IO_PD 24 // Hier LEARN Command Codes #define SBUS_LEARN 16 @@ -848,6 +1156,9 @@ #define SBUS_RESEND 5 #define HOST_SEND 6 #define HOST_RESEND 7 +#define HOST_SEND_LEDMASK 8 +#define HOST_RESEND_LEDMASK 9 +#define HOST_SEND_MACRO 10 #define LAN_REPEAT 32 #define PUT_SERIAL_DATA 33 @@ -878,7 +1189,7 @@ #define RESEND_IRDB_BLOCK 230 #define IRDB_REMLIST 231 #define IRDB_COMLIST 232 -//#define HOST_STORE_UDPSTR 233 +#define HOST_SEND_RS232 233 #define PING_IR_CONTROLLER 234 #define SET_POWER_LED 235 #define TEST_IRDB_BLOCK 236 @@ -917,12 +1228,20 @@ #define RECS80 132 #define RECS80_NO_TOGGLE 133 #define RECS80_NO_TOGGLE_H 134 +// !!! Modes & 8 (RC6_DATA) in Send HW Carrier #define TC_ACTIVE 32 #define TC_DUTY_CYCLE_2 1 #define TC_DUTY_CYCLE_4 2 +#define TC_DUTY_CYCLE_6 3 +#define TC_SEND_POWER_LOW 4 +#define TC_SEND_POWER_MED 8 +#define TC_SEND_POWER_HI 12 +#define TC_SEND_POWER_MASK 12 #define OFFSET_TYP_TOGGLE 1 +#define OFFSET_TYP_STATE_0 2 +#define OFFSET_TYP_STATE_1 3 #define LCD_BACKLIGHT 1 #define LCD_TEXT 2 @@ -971,14 +1290,23 @@ #define EXT_LED_SELECT_6 24 #define EXT_LED_SELECT_7 28 #define EXT_LED_SELECT_8 32 +#define EXT_LED_SELECT_9 36 +#define EXT_LED_SELECT_10 40 +#define EXT_LED_SELECT_11 44 +#define EXT_LED_SELECT_12 48 +#define EXT_LED_SELECT_13 52 +#define EXT_LED_SELECT_14 56 +#define EXT_LED_SELECT_15 60 +#define EXT_LED_SELECT_16 64 -#define EXT_LED_SELECT_MASK 60 +#define EXT_LED_SELECT_MASK 124 +#define EXT_LED_SELECT_HI EXT_LED_SELECT_9 +#define START 1 +#define REPEAT 2 -#define START 1 -#define REPEAT 2 typedef struct { @@ -988,9 +1316,30 @@ byte sbus_address; byte mode; word target_mask; - byte hotcode_len; - byte hotcode[CODE_LENRAW]; -} MODE_BUFFER; + byte ip_adr[4]; + byte ip_netmask[4]; + byte ip_gateway[4]; + byte ntp_server[4]; + byte dhcp_flag; + byte wpa_key[64]; + byte wlan_ssid[32]; + byte wlan_channel; + byte wlan_speed; + byte wlan_power; // Sending Power + byte wlan_mode; //(AD-Hoc / AP) + byte wlan_security; + byte connected_mode; + byte connected_rssi; + byte timezone; + byte mac_addr[6]; +} WIFI_MODE; + +typedef struct { + byte ip_address[4]; + byte ip_netmask[4]; + byte ip_gateway[4]; +} IP_PARAM; + typedef struct { byte sbus_len; @@ -1000,13 +1349,27 @@ byte mode; word target_mask; byte hotcode_len; - byte extmode1; - byte extmode2; - byte extmode_ex0; - byte extmode_ex1; - char remote[81]; - char command[21]; -} MODE_BUFFER_LAN; + byte hotcode[CODE_LENRAW]; +} MODE_BUFFER; + +typedef struct { + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word target_mask; // 5 + byte hotcode_len; // 7 + byte extended_mode; // 8 + byte extended_mode2; // 9 + byte extended_mode_ex[8]; // 10 + byte device_mask; // 18 + byte extended_mask; // 19 + byte extended_mask2; // 20 + byte extended_mask_ex[8]; // 21 + char remote[81]; // 29 + char command[21]; //110 +} MODE_BUFFER_LAN; //131 typedef struct { byte device_mode; // 0 @@ -1015,10 +1378,63 @@ byte extended_mode2; // 4 byte extended_mode_ex[8]; // 5 byte hotcode_len; // 13 -} EEPROM_MEMORY; // 14 +} EEPROM_MEMORY_OLD; // 14 typedef struct { - byte sbus_len; + byte device_mode; // 0 + word send_mask; // 1 + byte extended_mode; // 3 + byte extended_mode2; // 4 + byte extended_mode_ex[8]; // 5 + byte extended_mode_ex2[8]; // 13 + byte hotcode_len; // 21 +} EEPROM_MEMORY; // 22 + +typedef struct { + byte status_mode[6]; // 0: IR Input 1: SBUS 2-5: Analog In + byte status_low[4]; + byte status_high[4]; +} STATUS_MEMORY; + +typedef struct { + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte extended_mode; // 7 + byte extended_mode2; // 8 + byte extended_mode_ex[8]; // 9 + byte version[10]; // 17 + uint32_t capabilities; // 27 + uint32_t capabilities2; // 31 + uint32_t capabilities3; // 35 + uint32_t capabilities4; // 39 + byte wake_mac[6]; // 43 + char remote[81]; // 49 + char command[21]; // 130 +} STATUS_LINE_EX; // 151 + +typedef struct { + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte version[10]; // 7 + byte extended_mode; // 17 + uint32_t capabilities; // 21 + byte extended_mode2; // 25 + byte extended_mode_ex[2]; // 26 + byte wake_mac[6]; // 28 + char remote[81]; // 34 + char command[21]; //115 +} STATUS_LINE_EX_1; //136 + +typedef struct { + byte sbus_len; byte sbus_checksumme; byte sbus_command; byte sbus_address; @@ -1033,26 +1449,35 @@ uint32_t capabilities3; uint32_t capabilities4; byte wake_mac[6]; + byte extended_mode_ex2[8]; + STATUS_MEMORY status_input; + byte rs232_mode[16]; char remote[81]; char command[21]; -} STATUS_LINE_EX; +} STATUS_LINE_EX_N; + typedef struct { - byte sbus_len; - byte sbus_checksumme; - byte sbus_command; - byte sbus_address; - byte device_mode; - word send_mask; - byte version[10]; - byte extended_mode; - uint32_t capabilities; - byte extended_mode2; - byte extended_mode_ex[2]; - byte wake_mac[6]; - char remote[81]; - char command[21]; -} STATUS_LINE_EX_1; + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte extended_mode; // 7 + byte extended_mode2; // 8 + byte extended_mode_ex[8]; // 9 + byte version[10]; // 17 + uint32_t capabilities; // 27 + uint32_t capabilities2; // 31 + uint32_t capabilities3; // 35 + uint32_t capabilities4; // 39 + byte wake_mac[6]; // 43 + byte extended_mode_ex2[8]; // 49 + STATUS_MEMORY status_input; // 57 + byte rs232_mode[16]; // 71 +} STATUS_LINE_N; // 87 + typedef struct { byte sbus_len; // 0 @@ -1073,65 +1498,65 @@ } STATUS_LINE; // 49 typedef struct { - byte sbus_len; - byte sbus_checksumme; - byte sbus_command; - byte sbus_address; - byte device_mode; - word send_mask; - byte version[10]; - byte extended_mode; - uint32_t capabilities; - byte extended_mode2; - byte extended_mode_ex[2]; - byte wake_mac[6]; -} STATUS_LINE_5; + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte version[10]; // 7 + byte extended_mode; // 17 + uint32_t capabilities; // 18 + byte extended_mode2; // 22 + byte extended_mode_ex[2]; // 23 + byte wake_mac[6]; // 25 +} STATUS_LINE_5; // 31 typedef struct { - byte sbus_len; - byte sbus_checksumme; - byte sbus_command; - byte sbus_address; - byte device_mode; - word send_mask; - byte version[10]; - byte extended_mode; - uint32_t capabilities; - byte extended_mode2; -} STATUS_LINE_4; + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte version[10]; // 7 + byte extended_mode; // 17 + uint32_t capabilities; // 18 + byte extended_mode2; // 22 +} STATUS_LINE_4; // 23 typedef struct { - byte sbus_len; - byte sbus_checksumme; - byte sbus_command; - byte sbus_address; - byte device_mode; - word send_mask; - byte version[10]; - byte extended_mode; - word capabilities; -} STATUS_LINE_3; + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte version[10]; // 7 + byte extended_mode; // 17 + word capabilities; // 18 +} STATUS_LINE_3; // 20 typedef struct { - byte sbus_len; - byte sbus_checksumme; - byte sbus_command; - byte sbus_address; - byte device_mode; - word send_mask; - byte version[10]; - byte extended_mode; -} STATUS_LINE_2; + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte version[10]; // 7 + byte extended_mode; // 17 +} STATUS_LINE_2; // 18 typedef struct { - byte sbus_len; - byte sbus_checksumme; - byte sbus_command; - byte sbus_address; - byte device_mode; - word send_mask; - byte version[10]; -} STATUS_LINE_1; + byte sbus_len; // 0 + byte sbus_checksumme; // 1 + byte sbus_command; // 2 + byte sbus_address; // 3 + byte device_mode; // 4 + word send_mask; // 5 + byte version[10]; // 7 +} STATUS_LINE_1; // 17 typedef struct { byte my_adress; diff -Nru irclient-6.01.01/snd irclient-6.01.05/snd --- irclient-6.01.01/snd 1970-01-01 00:00:00.000000000 +0000 +++ irclient-6.01.05/snd 2009-06-14 20:55:33.000000000 +0000 @@ -0,0 +1,41 @@ + +while [ true ] +do +./irclient 194.139.118.90 sony ser6 +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +ls -l /etc +done diff -Nru irclient-6.01.01/version.rc irclient-6.01.05/version.rc --- irclient-6.01.01/version.rc 2009-04-28 22:30:17.000000000 +0000 +++ irclient-6.01.05/version.rc 2010-11-01 20:52:14.000000000 +0000 @@ -54,8 +54,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,1,0,0 - PRODUCTVERSION 6,1,1,0 + FILEVERSION 6,1,5,0 + PRODUCTVERSION 6,1,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,14 +73,14 @@ VALUE "Comments", "IRTrans ASCII / Batch client programm\0" VALUE "CompanyName", "IRTrans GmbH\0" VALUE "FileDescription", "IRClient\0" - VALUE "FileVersion", "6, 1, 0, 0\0" + VALUE "FileVersion", "6, 1, 5, 0\0" VALUE "InternalName", "IRClient\0" - VALUE "LegalCopyright", "Copyright © 2008-2009\0" + VALUE "LegalCopyright", "Copyright © 2008-2010\0" VALUE "LegalTrademarks", "IRTrans\0" VALUE "OriginalFilename", "IRClient.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "IRTrans GmbH IRClient\0" - VALUE "ProductVersion", "6, 1, 1, 0\0" + VALUE "ProductVersion", "6, 1, 5, 0\0" VALUE "SpecialBuild", "\0" END END