kopia lustrzana https://github.com/rpp0/gr-lora
Merge branch 'Inokinoki-fix-boost-bind-deprecated-global-placeholder'
commit
5086efb5aa
|
@ -28,7 +28,7 @@ class lora_receive_file_nogui(gr.top_block):
|
||||||
# Blocks
|
# Blocks
|
||||||
##################################################
|
##################################################
|
||||||
self.message_socket_sink = lora.message_socket_sink('127.0.0.1', 40868, 1)
|
self.message_socket_sink = lora.message_socket_sink('127.0.0.1', 40868, 1)
|
||||||
self.lora_receiver = lora.lora_receiver(sample_rate, capture_freq, ([lc.freq]), 125000, lc.sf, lc.implicit, lc.cr_num, lc.crc, reduced_rate=False, decimation=self.decimation)
|
self.lora_receiver = lora.lora_receiver(sample_rate, capture_freq, ([lc.freq]), lc.bw, lc.sf, lc.implicit, lc.cr_num, lc.crc, reduced_rate=False, decimation=self.decimation)
|
||||||
self.blocks_throttle = blocks.throttle(gr.sizeof_gr_complex, sample_rate, True)
|
self.blocks_throttle = blocks.throttle(gr.sizeof_gr_complex, sample_rate, True)
|
||||||
self.blocks_file_source = blocks.file_source(gr.sizeof_gr_complex, sample_file, False)
|
self.blocks_file_source = blocks.file_source(gr.sizeof_gr_complex, sample_file, False)
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace gr {
|
||||||
d_parent = parent;
|
d_parent = parent;
|
||||||
d_port = pmt::intern("control");
|
d_port = pmt::intern("control");
|
||||||
message_port_register_in(d_port);
|
message_port_register_in(d_port);
|
||||||
set_msg_handler(d_port, boost::bind(&controller_impl::handle_control, this, _1));
|
set_msg_handler(d_port, boost::bind(&controller_impl::handle_control, this, boost::placeholders::_1));
|
||||||
}
|
}
|
||||||
|
|
||||||
void controller_impl::handle_control(pmt::pmt_t msg){
|
void controller_impl::handle_control(pmt::pmt_t msg){
|
||||||
|
|
|
@ -699,7 +699,7 @@ namespace gr {
|
||||||
gr::io_signature::make(0, 0, 0)) {
|
gr::io_signature::make(0, 0, 0)) {
|
||||||
|
|
||||||
message_port_register_in(pmt::mp("in"));
|
message_port_register_in(pmt::mp("in"));
|
||||||
set_msg_handler(pmt::mp("in"), boost::bind(&message_file_sink_impl::msg_handler, this, _1));
|
set_msg_handler(pmt::mp("in"), boost::bind(&message_file_sink_impl::msg_handler, this, boost::placeholders::_1));
|
||||||
|
|
||||||
d_file.open(path.c_str(), std::ios::out | std::ios::binary);
|
d_file.open(path.c_str(), std::ios::out | std::ios::binary);
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ namespace gr {
|
||||||
d_layer(layer) {
|
d_layer(layer) {
|
||||||
|
|
||||||
message_port_register_in(pmt::mp("in"));
|
message_port_register_in(pmt::mp("in"));
|
||||||
set_msg_handler(pmt::mp("in"), boost::bind(&message_socket_sink_impl::handle, this, _1));
|
set_msg_handler(pmt::mp("in"), boost::bind(&message_socket_sink_impl::handle, this, boost::placeholders::_1));
|
||||||
|
|
||||||
d_socket = socket(AF_INET, SOCK_DGRAM, 0);
|
d_socket = socket(AF_INET, SOCK_DGRAM, 0);
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue