jochen
/
avr-hbw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: jochen:b5b9383d4e4e8c49d5163cbdf92bf6998f45fb61
Branches Tags
jochen:master
...
compare: jochen:522dc8312787e7820d0bd7a97ec3468787796aa6
Branches Tags
jochen:master

No commits in common. 'b5b9383d4e4e8c49d5163cbdf92bf6998f45fb61' and '522dc8312787e7820d0bd7a97ec3468787796aa6' have entirely different histories.
b5b9383d4e ... 522dc83127

8 changed files with 18 additions and 250 deletions
Show Stats

8
hbw.c
Unescape Escape View File

@ -212,7 +212,7 @@ static uint8_t senddsc(void)
static uint8_t is_bus_free(void) static uint8_t is_bus_free(void)
{ {
if(sdelay || slocked || sind) if(sdelay || slocked)
return 0; return 0;
return 1; return 1;
} }
@ -299,7 +299,6 @@ void hbw_init(void)
void snext(void) void snext(void)
{ {
#ifdef HBW_MAXLINKS
uint8_t linkchannel; uint8_t linkchannel;
if (amessage[0] != 'K') { if (amessage[0] != 'K') {
@ -316,7 +315,7 @@ void snext(void)
((uint8_t*)&aaddress)[3]=eeprom_read_byte((const uint8_t *)(alink*6)+HBW_LINKOFFS+4); ((uint8_t*)&aaddress)[3]=eeprom_read_byte((const uint8_t *)(alink*6)+HBW_LINKOFFS+4);
linkchannel=eeprom_read_byte((const uint8_t *)(alink*6)+HBW_LINKOFFS+5); linkchannel=eeprom_read_byte((const uint8_t *)(alink*6)+HBW_LINKOFFS+5);
if(aaddress == my_address) { if(aaddress == my_address) {
hbw_receive_key(aaddress, amessage[1], linkchannel, amessage[3]); hbw_receive_key(linkchannel, amessage[3] >> 2, amessage[3] & 0x3);
} else { } else {
amessage[2] = linkchannel; amessage[2] = linkchannel;
sbusy = 1; sbusy = 1;
@ -326,7 +325,6 @@ void snext(void)
} }
alink++; alink++;
} }
#endif
alink = 0; alink = 0;
} }
@ -510,7 +508,7 @@ static void rprocess(void)
case 0xCB: case 0xCB:
if (rlen != 4) if (rlen != 4)
return; return;
hbw_receive_key(raddress, rmessage[1], rmessage[2], rmessage[3]); hbw_receive_key(rmessage[2], rmessage[3] >> 2, rmessage[3] & 0x3);
slen = 0; slen = 0;
sctl = 0x19 | (seq << 5); sctl = 0x19 | (seq << 5);
sendmsg(); sendmsg();

2
hbw.h
Unescape Escape View File

@ -15,7 +15,7 @@ void hbw_init(void);
void hbw_loop(void); void hbw_loop(void);
uint8_t hbw_send_channel(uint8_t channel, uint8_t length, uint8_t const * const data); uint8_t hbw_send_channel(uint8_t channel, uint8_t length, uint8_t const * const data);
uint8_t hbw_send_key(uint8_t channel, uint8_t count, uint8_t flag); uint8_t hbw_send_key(uint8_t channel, uint8_t count, uint8_t flag);
void hbw_receive_key(uint32_t saddress, uint8_t schannel, uint8_t channel, uint8_t countflag); void hbw_receive_key(uint8_t channel, uint8_t count, uint8_t flag);
uint8_t hbw_get_channel(uint8_t channel, uint8_t data[]); uint8_t hbw_get_channel(uint8_t channel, uint8_t data[]);
void hbw_set_channel(uint8_t channel, uint8_t len, uint8_t data[]); void hbw_set_channel(uint8_t channel, uint8_t len, uint8_t data[]);
void hbw_read_config(void); void hbw_read_config(void);

63
hbw_el_relais.xml
Unescape Escape View File

@ -50,69 +50,6 @@
</physical> </physical>
</parameter> </parameter>
</paramset> </paramset>
<paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x10" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
<parameter id="SENSOR" hidden="true" operations="none">
<logical type="address"/>
<physical type="array">
<physical size="4.0" type="integer" interface="eeprom">
<address index="+0"/>
</physical>
<physical size="1.0" type="integer" interface="eeprom">
<address index="+4"/>
</physical>
</physical>
</parameter>
<parameter id="CHANNEL" hidden="true" operations="none">
<logical type="integer" min="0" max="255" default="255"/>
<physical size="1.0" type="integer" interface="eeprom">
<address index="+5"/>
</physical>
</parameter>
<parameter id="SHORT_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE"/>
<option id="TOGGLE" default="true"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6"/>
</physical>
</parameter>
<parameter id="LONG_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE"/>
<option id="TOGGLE" default="true"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6.2"/>
</physical>
</parameter>
<parameter id="LONGRELEASE_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE" default="true"/>
<option id="TOGGLE"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6.4"/>
</physical>
</parameter>
<parameter id="DOUBLE_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE" default="true"/>
<option id="TOGGLE"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6.6"/>
</physical>
</parameter>
</paramset>
<paramset id="hmw_switch_ch_values" type="VALUES"> <paramset id="hmw_switch_ch_values" type="VALUES">
<parameter id="STATE" operations="read,write,event" control="SWITCH.STATE"> <parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
<logical type="boolean" default="false"/> <logical type="boolean" default="false"/>

83
hbw_el_test.xml
Unescape Escape View File

@ -44,10 +44,6 @@
<parameter const_value="0" size="0.2" index="12.0" type="integer"/> <parameter const_value="0" size="0.2" index="12.0" type="integer"/>
<parameter size="0.6" index="12.2" type="integer" param="COUNTER"/> <parameter size="0.6" index="12.2" type="integer" param="COUNTER"/>
</frame> </frame>
<frame id="KEY_EVENT_DOUBLE" type="#K" channel_field="10" direction="from_device" event="true">
<parameter const_value="1" size="0.2" index="12.0" type="integer"/>
<parameter size="0.6" index="12.2" type="integer" param="COUNTER"/>
</frame>
</frames> </frames>
<channels> <channels>
@ -65,69 +61,6 @@
</physical> </physical>
</parameter> </parameter>
</paramset> </paramset>
<paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x10" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
<parameter id="SENSOR" hidden="true" operations="none">
<logical type="address"/>
<physical type="array">
<physical size="4.0" type="integer" interface="eeprom">
<address index="+0"/>
</physical>
<physical size="1.0" type="integer" interface="eeprom">
<address index="+4"/>
</physical>
</physical>
</parameter>
<parameter id="CHANNEL" hidden="true" operations="none">
<logical type="integer" min="0" max="255" default="255"/>
<physical size="1.0" type="integer" interface="eeprom">
<address index="+5"/>
</physical>
</parameter>
<parameter id="SHORT_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE"/>
<option id="TOGGLE" default="true"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6"/>
</physical>
</parameter>
<parameter id="LONG_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE"/>
<option id="TOGGLE" default="true"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6.2"/>
</physical>
</parameter>
<parameter id="LONGRELEASE_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE" default="true"/>
<option id="TOGGLE"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6.4"/>
</physical>
</parameter>
<parameter id="DOUBLE_ACTION_TYPE">
<logical type="option">
<option id="ON"/>
<option id="OFF"/>
<option id="INACTIVE" default="true"/>
<option id="TOGGLE"/>
</logical>
<physical size="0.2" type="integer" interface="eeprom">
<address index="+6.6"/>
</physical>
</parameter>
</paramset>
<paramset id="hmw_switch_ch_values" type="VALUES"> <paramset id="hmw_switch_ch_values" type="VALUES">
<parameter id="STATE" operations="read,write,event" control="SWITCH.STATE"> <parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
<logical type="boolean" default="false"/> <logical type="boolean" default="false"/>
@ -156,7 +89,7 @@
</conversion> </conversion>
</parameter> </parameter>
</paramset> </paramset>
<paramset id="hmw_input_ch_link" type="LINK" count="16" address_step="6" address_start="0x80" channel_param="CHANNEL" peer_param="ACTUATOR"> <paramset id="hmw_input_ch_link" type="LINK" count="6" address_step="6" address_start="0x10" channel_param="CHANNEL" peer_param="ACTUATOR">
<parameter hidden="true" id="CHANNEL" operations="none"> <parameter hidden="true" id="CHANNEL" operations="none">
<logical type="integer" default="255" max="255" min="0"/> <logical type="integer" default="255" max="255" min="0"/>
<physical size="1.0" type="integer" interface="eeprom"> <physical size="1.0" type="integer" interface="eeprom">
@ -190,20 +123,6 @@
</physical> </physical>
<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/> <conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
</parameter> </parameter>
<parameter id="RELEASE_LONG" operations="event" loopback="true" control="BUTTON.RELEASE">
<logical type="action"/>
<physical type="integer" interface="command" value_id="COUNTER">
<event frame="KEY_EVENT_LONGRELEASE"/>
</physical>
<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
</parameter>
<parameter id="DOUBLECLICK" operations="event" loopback="true" control="BUTTON.DOUBLE">
<logical type="action"/>
<physical type="integer" interface="command" value_id="COUNTER">
<event frame="KEY_EVENT_DOUBLE"/>
</physical>
<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
</parameter>
</paramset> </paramset>
</channel> </channel>
</channels> </channels>

3
relaishw.h
Unescape Escape View File

@ -20,4 +20,7 @@
#define HBWSERIAL8 '0' #define HBWSERIAL8 '0'
#define HBWSERIAL9 '1' #define HBWSERIAL9 '1'
#define HBW_MAXLINKS 16
#define HBW_LINKOFFS 0x10
#endif #endif

52
relaisnode.c
Unescape Escape View File

@ -8,7 +8,6 @@ uint8_t relais1state;
uint8_t relais2state; uint8_t relais2state;
uint8_t pc0state; uint8_t pc0state;
uint8_t pc1state; uint8_t pc1state;
uint8_t scount;
void hbw_read_config(void) void hbw_read_config(void)
{ {
@ -63,60 +62,13 @@ void hbw_set_channel(uint8_t channel, uint8_t len, uint8_t data[])
} }
} }
void hbw_receive_key(uint32_t saddress, uint8_t schannel, uint8_t channel, uint8_t countflag) void hbw_receive_key(uint8_t channel, uint8_t count, uint8_t flag)
{ {
uint8_t i, type;
if (channel > 1)
return;
if (scount == countflag)
return;
for (i=0; i < 16; i++) {
if ((eeprom_read_byte((const uint8_t *)(i*7)+0x10) == ((uint8_t*)&saddress)[0]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x11) == ((uint8_t*)&saddress)[1]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x12) == ((uint8_t*)&saddress)[2]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x13) == ((uint8_t*)&saddress)[3]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x14) == schannel) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x15) == channel)) {
type = eeprom_read_byte((const uint8_t *)(i*7)+0x16);
switch (countflag & 3) {
case 1:
type = (type >> 6) & 0x3;
break;
case 0:
type = (type >> 4) & 0x3;
break;
case 3:
type = (type >> 2) & 0x3;
break;
case 2:
type = type & 0x3;
}
switch (type) {
case 0:
if(channel == 0)
PORTB |= (1<<Relais1);
else
PORTB |= (1<<Relais2);
break;
case 1:
if(channel == 0)
PORTB &= ~(1<<Relais1);
else
PORTB &= ~(1<<Relais2);
break;
case 3:
if(channel == 0) if(channel == 0)
PORTB ^= (1<<Relais1); PORTB ^= (1<<Relais1);
else if(channel == 1)
PORTB ^= (1<<Relais2); PORTB ^= (1<<Relais2);
} }
return;
}
}
}
int main(void) int main(void)
{ {

2
testhw.h
Unescape Escape View File

@ -21,5 +21,5 @@
#define HBWSERIAL9 '1' #define HBWSERIAL9 '1'
#define HBW_MAXLINKS 16 #define HBW_MAXLINKS 16
#define HBW_LINKOFFS 0x80 #define HBW_LINKOFFS 0x10
#endif #endif

45
testnode.c
Unescape Escape View File

@ -11,7 +11,6 @@ uint16_t explong;
uint16_t longtime; uint16_t longtime;
uint16_t logtime; uint16_t logtime;
uint8_t logging; uint8_t logging;
uint8_t scount;
void hbw_read_config(void) void hbw_read_config(void)
{ {
@ -60,51 +59,11 @@ void hbw_set_channel(uint8_t channel, uint8_t len, uint8_t data[])
} }
} }
void hbw_receive_key(uint32_t saddress, uint8_t schannel, uint8_t channel, uint8_t countflag) void hbw_receive_key(uint8_t channel, uint8_t count, uint8_t flag)
{ {
uint8_t i, type; if(channel == 0)
if (channel != 0)
return;
if (scount == countflag)
return;
for (i=0; i < 16; i++) {
if ((eeprom_read_byte((const uint8_t *)(i*7)+0x10) == ((uint8_t*)&saddress)[0]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x11) == ((uint8_t*)&saddress)[1]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x12) == ((uint8_t*)&saddress)[2]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x13) == ((uint8_t*)&saddress)[3]) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x14) == schannel) &&
(eeprom_read_byte((const uint8_t *)(i*7)+0x15) == channel)) {
type = eeprom_read_byte((const uint8_t *)(i*7)+0x16);
switch (countflag & 3) {
case 1:
type = (type >> 6) & 0x3;
break;
case 0:
type = (type >> 4) & 0x3;
break;
case 3:
type = (type >> 2) & 0x3;
break;
case 2:
type = type & 0x3;
}
switch (type) {
case 0:
PORTD |= (1<<ExpLED);
break;
case 1:
PORTD &= ~(1<<ExpLED);
break;
case 3:
PORTD ^= (1<<ExpLED); PORTD ^= (1<<ExpLED);
} }
return;
}
}
}
int main(void) int main(void)
{ {

Write Preview
Loading…
Cancel
Save