Encoder work in progress

- Preamble symbols
- Chip value generation for header (coding, whitening, interleaving finished)
encoder
Pieter Robyns 2018-05-15 18:06:22 +02:00
rodzic 91fb5e4930
commit 5d9267febc
10 zmienionych plików z 436 dodań i 2 usunięć

Wyświetl plik

@ -22,7 +22,8 @@ install(FILES
lora_receiver.block.yml
lora_message_file_sink.block.yml
lora_message_socket_sink.block.yml
lora_message_socket_source.block.yml DESTINATION share/gnuradio/grc/blocks
lora_message_socket_source.block.yml
lora_encoder.block.yml DESTINATION share/gnuradio/grc/blocks
)
if(HAS_MONGODB)

Wyświetl plik

@ -0,0 +1,17 @@
id: lora_encoder
label: LoRa Transmitter
category: '[LoRa]'
inputs:
- domain: message
id: in
outputs:
- domain: stream
dtype: complex
templates:
imports: import lora
make: lora.encoder()
file_format: 1

Wyświetl plik

@ -31,5 +31,6 @@ install(FILES
loraphy.h
utilities.h
controller.h
message_socket_source.h DESTINATION include/lora
message_socket_source.h
encoder.h DESTINATION include/lora
)

Wyświetl plik

@ -0,0 +1,53 @@
/* -*- c++ -*- */
/*
* Copyright 2018 Pieter Robyns.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_LORA_ENCODER_H
#define INCLUDED_LORA_ENCODER_H
#include <lora/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
namespace lora {
/*!
* \brief <+description of block+>
* \ingroup lora
*
*/
class LORA_API encoder : virtual public gr::sync_block {
public:
typedef boost::shared_ptr<encoder> sptr;
/*!
* \brief Return a shared_ptr to a new instance of lora::encoder.
*
* To avoid accidental use of raw pointers, lora::encoder's
* constructor is in a private implementation
* class. lora::encoder::make is the public interface for
* creating new instances.
*/
static sptr make();
};
} // namespace lora
} // namespace gr
#endif /* INCLUDED_LORA_ENCODER_H */

Wyświetl plik

@ -0,0 +1,58 @@
/* -*- c++ -*- */
/*
* Copyright 2018 Pieter Robyns.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef LORACONF_H
#define LORACONF_H
#include <lora/loratap.h>
#include <lora/loraphy.h>
typedef struct __attribute__((__packed__)) loraconf {
loratap_header_t tap;
loraphy_header_t phy;
} loraconf_t;
void print_loraconf(loraconf_t& conf) {
std::cout << "*** TAP" << std::endl;
std::cout << "\tVersion: " << conf.tap.lt_version << std::endl;
std::cout << "\tPadding: " << conf.tap.lt_padding << std::endl;
std::cout << "\tLength: " << conf.tap.lt_length << std::endl;
std::cout << "\tFrequency: " << conf.tap.channel.frequency << std::endl;
std::cout << "\tBandwidth: " << conf.tap.channel.bandwidth << std::endl;
std::cout << "\tSF: " << conf.tap.channel.sf << std::endl;
std::cout << "\tPacket RSSI: " << conf.tap.rssi.packet_rssi << std::endl;
std::cout << "\tMax RSSI: " << conf.tap.rssi.max_rssi << std::endl;
std::cout << "\tCurrent RSSI: " << conf.tap.rssi.current_rssi << std::endl;
std::cout << "\tSNR: " << conf.tap.rssi.snr << std::endl;
std::cout << "\tSync: " << conf.tap.sync_word << std::endl;
std::cout << "*** PHY" << std::endl;
std::cout << "\tLength: " << conf.phy.length << std::endl;
std::cout << "\tCR: " << conf.phy.cr << std::endl;
std::cout << "\tHas CRC: " << (bool)conf.phy.has_mac_crc << std::endl;
uint8_t crc = (conf.phy.crc_msn << 4) | conf.phy.crc_lsn;
std::cout << "\tCRC: " << crc << std::endl;
std::cout << "\tReserved: " << conf.phy.reserved << std::endl;
}
#endif

Wyświetl plik

@ -415,6 +415,12 @@ namespace gr {
return offset;
}
inline void whiten(uint8_t* input, const uint8_t* sequence, uint32_t length) {
for(uint32_t i = 0; i < length; i++) {
input[i] = input[i] ^ sequence[i];
}
}
}
}

Wyświetl plik

@ -30,6 +30,7 @@ list(APPEND lora_sources
controller_impl.cc
debugger.cc
message_socket_source_impl.cc
encoder_impl.cc
)
set(lora_sources "${lora_sources}" PARENT_SCOPE)

235
lib/encoder_impl.cc 100644
Wyświetl plik

@ -0,0 +1,235 @@
/* -*- c++ -*- */
/*
* Copyright 2018 Pieter Robyns.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include <gnuradio/expj.h>
#include <lora/utilities.h>
#include "encoder_impl.h"
#include "tables.h"
namespace gr {
namespace lora {
encoder::sptr
encoder::make() {
return gnuradio::get_initial_sptr
(new encoder_impl());
}
/*
* The private constructor
*/
encoder_impl::encoder_impl() : gr::sync_block("encoder",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(1, 1, sizeof(gr_complex))) {
// Bind ports
message_port_register_in(pmt::mp("in"));
set_msg_handler(pmt::mp("in"), boost::bind(&encoder_impl::handle_loratap, this, _1));
set_output_multiple(4096);
// Initialize variables
d_samples_per_second = 125000;
d_num_preamble_symbols = 8;
d_bw = 125000;
d_dt = 1.0f / d_samples_per_second;
d_sample_buffer.reserve(d_samples_per_second); // Allocate for one second of samples
// Setup hamming coding schemes
fec_scheme fs = LIQUID_FEC_HAMMING84;
d_h48_fec = fec_create(fs, NULL);
// Setup chirp lookup tables
for(uint8_t sf = 6; sf <= 12; sf++) {
const uint32_t chips_per_symbol = pow(2, sf);
const double symbols_per_second = (double)d_bw / chips_per_symbol;
const double samples_per_symbol = d_samples_per_second / symbols_per_second;
const double T = -0.5 * d_bw * symbols_per_second;
const double f0 = (d_bw / 2.0);
const double pre_dir = 2.0 * M_PI;
double t;
gr_complex cmx = gr_complex(1.0f, 1.0f);
std::vector<gr_complex> chirp(samples_per_symbol*2);
for (uint32_t i = 0u; i < samples_per_symbol; i++) {
t = d_dt * i;
gr_complex sample = cmx * gr_expj(pre_dir * t * (f0 + T * t) * -1.0f);
chirp[i] = sample;
chirp[i+samples_per_symbol] = sample;
}
std::cout << "SF " << (int)sf << " has " << samples_per_symbol << " samples" << std::endl;
d_chirps[sf] = chirp; // Copy vector metadata to chirps hashmap. Note that vector internally allocates on heap.
}
}
/*
* Our virtual destructor.
*/
encoder_impl::~encoder_impl() {
fec_destroy(d_h48_fec);
}
void encoder_impl::handle_loratap(pmt::pmt_t msg) {
gr::thread::scoped_lock guard(d_mutex); // Auto lock & unlock (RAII)
d_packets.push_back(msg);
}
bool encoder_impl::parse_packet_conf(loraconf_t& conf, uint8_t* packet, uint32_t packet_len) {
uint32_t offset = 0;
if(packet_len <= sizeof(loraconf_t)) {
return false;
}
memcpy(&conf.tap, packet, sizeof(loratap_header_t));
memcpy(&conf.phy, packet + sizeof(loratap_header_t), sizeof(loraphy_header_t));
return true;
}
/**
* Get packets from queue and initialize transmission.
*/
int encoder_impl::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) {
gr_complex* out = (gr_complex*)output_items[0];
std::cout << "We can transmit " << noutput_items << " samples" << std::endl;
// Temporary ve pa le fq bw sf pr mr cr sn sy H1 H1 H1
char test_pkt[] = "\x00\x00\x12\x00\x00\xa1\xbc\x33\x01\x07\x00\x00\x00\x00\x12\x17\x91\xa0\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x20\x21\x22\xb8\x73";
loraconf_t conf;
memset(&conf, 0, sizeof(loraconf_t));
if(!parse_packet_conf(conf, (uint8_t*)test_pkt, sizeof(test_pkt))) {
std::cerr << "Malformed LoRa packet received" << std::endl;
exit(1);
}
print_loraconf(conf);
transmit_packet(conf, (uint8_t*)(test_pkt + sizeof(loratap_header_t)));
if(d_sample_buffer.size() >= noutput_items) {
// Get noutput_items from buffer
memcpy(out, &d_sample_buffer[0], noutput_items * sizeof(gr_complex));
d_sample_buffer.erase(d_sample_buffer.begin(), d_sample_buffer.begin() + noutput_items);
return noutput_items;
} else {
return 0; // Wait for more symbols
}
// -------------------------------------------------------------------------------------
// Get packet from queue
gr::thread::scoped_lock guard(d_mutex);
if(d_packets.size() > 0) {
pmt::pmt_t packet = d_packets.front();
// Process
std::cout << "Processing packet" << std::endl;
//uint8_t* packet = (uint8_t*)pmt::blob_data(msg);
//size_t packet_length = pmt::blob_length(msg);
// Delete from queue
d_packets.erase(d_packets.begin());
}
// Tell runtime system how many output items we produced.
return 0;
}
void encoder_impl::shuffle(uint8_t *data, uint32_t data_len, const uint8_t *shuffle_pattern) {
for (uint32_t i = 0u; i < data_len; i++) {
uint8_t result = 0u;
for (uint32_t j = 0u; j < 8; j++) {
result |= !!(data[i] & (1u << shuffle_pattern[j])) << j;
}
data[i] = result;
}
}
void encoder_impl::interleave(uint16_t *symbols, uint8_t* data, uint32_t data_len, uint8_t sf, uint8_t cr) {
// Determine symbols for this block
for(uint8_t symbol = 0; symbol < 4+cr; symbol++) {
for(int8_t bit = sf-1; bit >= 0; bit--) {
symbols[symbol] |= ((data[bit] >> symbol) & 0x01) << bit;
}
int32_t to_rotate = sf-symbol;
if(to_rotate < 0)
to_rotate += sf;
symbols[symbol] = gr::lora::rotl(symbols[symbol], to_rotate, sf);
}
// Rotate to interleave
std::vector<uint16_t> symbols_v(symbols, symbols + (4+cr));
print_interleave_matrix(std::cout, symbols_v, sf);
}
void encoder_impl::transmit_packet(loraconf_t& conf, uint8_t* packet) {
uint32_t packet_length = conf.phy.length + sizeof(loraphy_header_t); //
uint32_t num_bytes = packet_length*2;
uint8_t encoded[num_bytes];
uint32_t num_symbols = packet_length*2;
// Add preamble symbols to queue
for(uint32_t i = 0; i < d_num_preamble_symbols; i++) {
std::vector<gr_complex>& reference = d_chirps[conf.tap.channel.sf];
d_sample_buffer.insert(d_sample_buffer.end(), reference.begin(), reference.begin() + (reference.size() / 2));
}
// Add sync words to queue
// Add SFD to queue
// If explicit header, add one block (= SF codewords) to queue in reduced rate mode (and always 4/8)
// Add remaining blocks to queue
print_vector(std::cout, packet, "Encoded", packet_length, 8);
fec_encode(d_h48_fec, packet_length, packet, encoded);
print_vector(std::cout, encoded, "Whitened", num_bytes, 8);
//whiten(encoded, gr::lora::prng_payload, num_bytes);
print_vector(std::cout, encoded, "Shuffled", num_bytes, 8);
const uint8_t shuffle_pattern[] = {1, 2, 3, 5, 4, 0, 6, 7};
shuffle(encoded, num_bytes, shuffle_pattern);
print_vector(std::cout, encoded, "Interleaved", conf.tap.channel.sf, 8);
uint16_t symbols[num_symbols];
memset(symbols, 0x00, num_symbols * sizeof(uint16_t));
interleave(symbols, encoded, num_bytes, conf.tap.channel.sf-2, conf.phy.cr);
print_vector(std::cout, symbols, "Chips", 4+conf.phy.cr, conf.tap.channel.sf-2);
}
} /* namespace lora */
} /* namespace gr */

59
lib/encoder_impl.h 100644
Wyświetl plik

@ -0,0 +1,59 @@
/* -*- c++ -*- */
/*
* Copyright 2018 Pieter Robyns.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_LORA_ENCODER_IMPL_H
#define INCLUDED_LORA_ENCODER_IMPL_H
#include <liquid/liquid.h>
#include <lora/encoder.h>
#include <lora/loraconf.h>
#include <unordered_map>
namespace gr {
namespace lora {
class encoder_impl : public encoder {
private:
gr::thread::mutex d_mutex;
std::vector<pmt::pmt_t> d_packets;
std::unordered_map<uint8_t, std::vector<gr_complex> > d_chirps;
fec d_h48_fec;
uint32_t d_samples_per_second;
uint32_t d_bw;
double d_dt;
uint16_t d_num_preamble_symbols;
std::vector<gr_complex> d_sample_buffer;
public:
encoder_impl();
~encoder_impl();
int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
void handle_loratap(pmt::pmt_t msg);
bool parse_packet_conf(loraconf_t& conf, uint8_t* packet, uint32_t packet_len);
void transmit_packet(loraconf_t& conf, uint8_t* packet);
void shuffle(uint8_t *data, uint32_t data_len, const uint8_t *shuffle_pattern);
void interleave(uint16_t *symbols, uint8_t* data, uint32_t data_len, uint8_t sf, uint8_t cr);
};
} // namespace lora
} // namespace gr
#endif /* INCLUDED_LORA_ENCODER_IMPL_H */

Wyświetl plik

@ -14,6 +14,7 @@
#include "lora/channelizer.h"
#include "lora/controller.h"
#include "lora/message_socket_source.h"
#include "lora/encoder.h"
%}
@ -29,3 +30,5 @@ GR_SWIG_BLOCK_MAGIC2(lora, channelizer);
GR_SWIG_BLOCK_MAGIC2(lora, controller);
%include "lora/message_socket_source.h"
GR_SWIG_BLOCK_MAGIC2(lora, message_socket_source);
%include "lora/encoder.h"
GR_SWIG_BLOCK_MAGIC2(lora, encoder);