mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-11-30 17:20:32 +01:00
2017-02-26 Fred Gleason <fredg@paravelsystems.com>
* Modified 'ripcd/livewire_mcastgpio.cpp' to double-signal GPIO events.
This commit is contained in:
@@ -15607,3 +15607,6 @@
|
|||||||
'web/rdxport/logs.cpp'.
|
'web/rdxport/logs.cpp'.
|
||||||
2017-02-24 Fred Gleason <fredg@paravelsystems.com>
|
2017-02-24 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Incremented the package version to 2.15.2int02.
|
* Incremented the package version to 2.15.2int02.
|
||||||
|
2017-02-26 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Modified 'ripcd/livewire_mcastgpio.cpp' to double-signal GPIO
|
||||||
|
events.
|
||||||
|
|||||||
@@ -279,7 +279,8 @@ void LiveWireMcastGpio::gpioActivatedData(int sock)
|
|||||||
(struct sockaddr *)(&sa),&sa_len))>0) {
|
(struct sockaddr *)(&sa),&sa_len))>0) {
|
||||||
serial=((0xFF&data[4])<<24)+((0xFF&data[5])<<16)+((0xFF&data[6])<<8)+
|
serial=((0xFF&data[4])<<24)+((0xFF&data[5])<<16)+((0xFF&data[6])<<8)+
|
||||||
(0xFF&data[7]);
|
(0xFF&data[7]);
|
||||||
if(livewire_gpio_recv_serials[sa.sin_addr.s_addr]!=(serial-1)) {
|
if((livewire_gpio_recv_serials[sa.sin_addr.s_addr]!=serial)&&
|
||||||
|
(livewire_gpio_recv_serials[sa.sin_addr.s_addr]!=(serial-1))) {
|
||||||
livewire_gpio_recv_serials[sa.sin_addr.s_addr]=serial;
|
livewire_gpio_recv_serials[sa.sin_addr.s_addr]=serial;
|
||||||
ProcessGpi(QHostAddress(ntohl(sa.sin_addr.s_addr)),
|
ProcessGpi(QHostAddress(ntohl(sa.sin_addr.s_addr)),
|
||||||
((0xFF&data[23])<<8)+(0xFF&data[24]),0x08-(0xff&data[25]),
|
((0xFF&data[23])<<8)+(0xFF&data[24]),0x08-(0xff&data[25]),
|
||||||
@@ -380,7 +381,7 @@ void LiveWireMcastGpio::ProcessGpoIn(int chan,unsigned line,bool state)
|
|||||||
data[7]=0xFF&livewire_gpio_send_serial;
|
data[7]=0xFF&livewire_gpio_send_serial;
|
||||||
sendto(livewire_gpio_write_socket,data,60,MSG_DONTWAIT,
|
sendto(livewire_gpio_write_socket,data,60,MSG_DONTWAIT,
|
||||||
(struct sockaddr *)(&sa),sizeof(sa));
|
(struct sockaddr *)(&sa),sizeof(sa));
|
||||||
livewire_gpio_send_serial++;
|
livewire_gpio_send_serial+=2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -434,7 +435,7 @@ void LiveWireMcastGpio::ProcessGpoOut(int chan,unsigned line,bool state)
|
|||||||
data[7]=0xFF&livewire_gpio_send_serial;
|
data[7]=0xFF&livewire_gpio_send_serial;
|
||||||
sendto(livewire_gpio_write_socket,data,28,MSG_DONTWAIT,
|
sendto(livewire_gpio_write_socket,data,28,MSG_DONTWAIT,
|
||||||
(struct sockaddr *)(&sa),sizeof(sa));
|
(struct sockaddr *)(&sa),sizeof(sa));
|
||||||
livewire_gpio_send_serial++;
|
livewire_gpio_send_serial+=2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user