nils/simplesync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Nils Schulte 2024-01-14 20:02:01 +01:00
parent 39922749ec
commit 20f30d7c02
1 changed files with 103 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
include/simplesync.hpp
View File

@ -1,23 +1,28 @@
#ifndef SIMPLESYNC_HPP #ifndef SIMPLESYNC_HPP
#define SIMPLESYNC_HPP #define SIMPLESYNC_HPP
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <functional>
#include <iostream>
#include <vector>
#ifdef ARDUINO #ifdef ARDUINO
#include <Arduino.h> #include <Arduino.h>
#ifdef __AVR__ #ifdef __AVR__
#include "include/nonstd_functional.hpp" #include "include/nonstd_functional.hpp"
using nonstd::function; using nonstd::function;
#else /* ndef __AVR__ */ #else /* ndef __AVR__ */
using std::function; #define STDCLIB
#endif #endif
#else /* ndef ARDUINO */ #else /* ndef ARDUINO */
#define STDCLIB
#endif
#ifdef STDCLIB
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <functional>
#include <iostream>
#include <memory>
#include <string>
#include <vector>
using std::function; using std::function;
using std::string;
#endif #endif
namespace simplesync { namespace simplesync {
@ -127,97 +132,109 @@ inline uint16_t calc_fletcher_checksum(uint8_t *buf, unsigned int buf_size) {
return (c1 << 8 | c0); return (c1 << 8 | c0);
} }
template <typename time_t, typename timedelta_t, unsigned int BUF_SIZE = 256, template <typename time_t, typename timedelta_t, unsigned int BUF_SIZE = 256> class SimpleSync {
unsigned int str_len_max = 32>
class SimpleSync {
public: public:
static constexpr unsigned int STR_LEN_MAX = str_len_max; class Interface {
class NumberInterface {
public: public:
time_t last_send; uint8_t type;
char *key; string key;
timedelta_t update_interval;
std::function<int(uint8_t *buf, unsigned int buf_size)> pack;
std::function<int(uint8_t *buf, unsigned int buf_size)> unpack;
bool send_requested = true; bool send_requested = true;
int value; time_t last_send;
NumberInterface(SimpleSync &s, char *key, timedelta_t update_interval)
: key(key), update_interval(update_interval) { timedelta_t update_interval;
s.number_interfaces.push_back(this); bool update_periodically;
}
Interface(uint8_t type, string key,
std::function<int(uint8_t *buf, unsigned int buf_size)> pack,
std::function<int(uint8_t *buf, unsigned int buf_size)> unpack)
: type(type), key(key), pack(pack), unpack(unpack), update_periodically(false) {}
Interface(uint8_t type, string key,
std::function<int(uint8_t *buf, unsigned int buf_size)> pack,
std::function<int(uint8_t *buf, unsigned int buf_size)> unpack,
timedelta_t update_interval)
: Interface(type, key, pack, unpack), update_interval(update_interval),
update_periodically(true) {}
}; };
class StringInterface { template <typename int_t> static void Number(SimpleSync &sync, string key, int_t *value_ptr) {
public: sync.interfaces.push_back(std::make_unique<Interface>(
time_t last_send; 0x01, key,
char *key; [=](uint8_t *buf, unsigned int buf_size) -> int { /* pack */
timedelta_t update_interval; if (buf_size < sizeof(int) * 8 / 7)
bool send_requested = true; return BUFFER_OVERFLOW;
char value[str_len_max + 1]; return encode_varint(*value_ptr, buf);
StringInterface(SimpleSync &s, char *key, timedelta_t update_interval) },
: key(key), update_interval(update_interval) { [=](uint8_t *buf, unsigned int buf_size) -> int { /* unpack */
value[str_len_max] = 0x00; buf_size = 1 * buf_size;
s.string_interfaces.push_back(this); return decode_varint(buf, *value_ptr);
} }));
}; }
std::vector<NumberInterface *> number_interfaces; static void String(SimpleSync &sync, string key, string *value_ptr) {
std::vector<StringInterface *> string_interfaces; sync.interfaces.push_back(std::make_unique<Interface>(
0x02, key,
[=](uint8_t *buf, unsigned int buf_size) -> int { /* pack */
auto value_len =
1 + strlen(value_ptr->c_str());
if (buf_size < value_len)
return BUFFER_OVERFLOW;
memcpy(buf, value_ptr->c_str(),
value_len);
return value_len;
},
[=](uint8_t *buf, unsigned int buf_size) -> int { /* unpack */
auto strl = strlen((char *)buf) + 1;
if (strl <= buf_size)
return BUFFER_OVERFLOW;
value_ptr->assign((char *)buf);
return strl;
}));
}
// int parse_number(uint8_t *buf, unsigned int buf_size, int* value){
// return decode_varint(&buf[parsed], *value);
// }
std::vector<std::unique_ptr<Interface>> interfaces;
function<int(uint8_t *, unsigned int)> write_pkg; function<int(uint8_t *, unsigned int)> write_pkg;
function<void(NumberInterface *&, char *, int)> number_update; function<void(const std::unique_ptr<Interface> &, char *, int)> interface_update;
function<void(StringInterface *&, char *, char *)> string_update;
SimpleSync(function<int(uint8_t *, unsigned int)> write_pkg, SimpleSync(function<int(uint8_t *, unsigned int)> write_pkg,
function<void(NumberInterface *&, char *, int)> number_update, function<void(const std::unique_ptr<Interface> &, char *, int)> interface_update)
function<void(StringInterface *&, char *, char *)> string_update) : write_pkg(write_pkg), interface_update(interface_update) {}
: write_pkg(write_pkg), number_update(number_update), string_update(string_update) {}
Interface &get_or_create_interface(uint8_t type, char *key) {
for (auto &i : interfaces) {
if (i->type == type && strcmp(i->key.c_str(), key) == 0) {
return *i;
}
}
}
int parse_pkg(uint8_t *buf, unsigned int buf_size) { int parse_pkg(uint8_t *buf, unsigned int buf_size) {
if (buf_size < 4) return CRC_MISSMATCH; if (buf_size < 4) return CRC_MISSMATCH;
uint16_t crc = calc_fletcher_checksum(buf, buf_size - 2); uint16_t crc = calc_fletcher_checksum(buf, buf_size - 2);
if (buf[--buf_size] != (crc & 0xFF) || (buf[--buf_size] != (crc >> 8))) if (buf[--buf_size] != (crc & 0xFF) || (buf[--buf_size] != (crc >> 8)))
return CRC_MISSMATCH; return CRC_MISSMATCH;
for (unsigned int parsed = 0; parsed < buf_size;) { for (unsigned int parsed = 0; parsed < buf_size;) {
switch (buf[parsed]) { uint8_t type = buf[parsed];
switch (type) {
case 0x00: { case 0x00: {
for (auto ni : number_interfaces) ni->send_requested = true; for (auto ni : interfaces) ni->send_requested = true;
for (auto ni : string_interfaces) ni->send_requested = true;
} break;
case 0x01: {
char *key = (char *)&buf[parsed + 1];
parsed += 1 + strlen(key) + 1;
int value;
parsed += decode_varint(&buf[parsed], value);
NumberInterface *ni_ptr = nullptr;
for (auto ni : number_interfaces) {
if (strcmp(ni->key, key) == 0) {
ni_ptr = ni;
break;
}
}
if (number_update) {
number_update(ni_ptr, key, value);
}
if (ni_ptr) {
ni_ptr->value = value;
}
} break; } break;
case 0x01:
case 0x02: { case 0x02: {
char *key = (char *)&buf[parsed + 1]; char *key = (char *)&buf[parsed + 1];
parsed += 1 + strlen(key) + 1; parsed += 1 + strlen(key) + 1;
char *value = (char *)&buf[parsed]; Interface &ni = get_or_create_interface(type, key);
unsigned int strl = strlen(value) + 1; unsigned int unpacked_bytes = ni.unpack(buf + parsed, buf_size - parsed);
parsed += strl; if (unpacked_bytes >= 0) {
StringInterface *stri_ptr = nullptr; parsed += unpacked_bytes;
for (StringInterface *si : string_interfaces) { } else { // ERROR -> return
if (strcmp(si->key, key) == 0) { return unpacked_bytes;
stri_ptr = si;
break;
}
}
if (string_update) {
string_update(stri_ptr, key, value);
}
if (stri_ptr) {
memcpy(stri_ptr->value, value, str_len_max > strl ? strl : str_len_max);
} }
} break; } break;
default: default:
@ -239,11 +256,11 @@ class SimpleSync {
void update(time_t time) { void update(time_t time) {
uint8_t buf[BUF_SIZE]; uint8_t buf[BUF_SIZE];
unsigned int buf_len_used = 0; unsigned int buf_len_used = 0;
for (auto ni : number_interfaces) { for (auto& ni : interfaces) {
if (ni->send_requested || if (ni->send_requested ||
(ni->last_send > time || ni->last_send <= time - ni->update_interval)) { (ni->update_periodically && (ni->last_send > time || ni->last_send <= time - ni->update_interval))) {
unsigned int strl = strlen(ni->key) + 1; unsigned int strl = strlen(ni->key.c_str()) + 1;
unsigned int buf_len_needed = 1 + strl + 8 * sizeof(int) / 7; unsigned int buf_len_needed = 1 + strl + 32; // TODO get real pack size (not always 32)
buf_len_needed += buf_len_needed / 0xFF + 3 + 2; // COBS overhead buf_len_needed += buf_len_needed / 0xFF + 3 + 2; // COBS overhead
if (BUF_SIZE < buf_len_needed) continue; // Error: update to large, skip interface if (BUF_SIZE < buf_len_needed) continue; // Error: update to large, skip interface
if (BUF_SIZE < buf_len_used + buf_len_needed) { if (BUF_SIZE < buf_len_used + buf_len_needed) {
@ -256,39 +273,12 @@ class SimpleSync {
write_pkg(cobs_buf, cobs_buf_needed); write_pkg(cobs_buf, cobs_buf_needed);
buf_len_used = 0; buf_len_used = 0;
} }
buf[buf_len_used++] = 0x01; buf[buf_len_used++] = ni->type;
memcpy((char *)&buf[buf_len_used], ni->key, strl); memcpy((char *)&buf[buf_len_used], ni->key.c_str(), strl);
buf_len_used += strl; ni->pack(&buf[buf_len_used], BUF_SIZE - buf_len_used);
buf_len_used += encode_varint(ni->value, &buf[buf_len_used]);
ni->last_send = time;
ni->send_requested = false;
}
}
for (auto ni : string_interfaces) {
if (ni->send_requested ||
(ni->last_send > time || ni->last_send <= time - ni->update_interval)) {
unsigned int strl = strlen(ni->key) + 1;
unsigned int strl_value = strlen(ni->value) + 1;
unsigned int buf_len_needed = 1 + strl + strl_value;
buf_len_needed += buf_len_needed / 0xFF + 3 + 2; // COBS overhead
if (BUF_SIZE < buf_len_needed) continue; // Error: update to large, skip interface
if (BUF_SIZE < buf_len_used + buf_len_needed + 2) {
uint8_t cobs_buf[BUF_SIZE];
uint16_t crc = calc_fletcher_checksum(buf, buf_len_used);
buf[buf_len_used++] = crc >> 8;
buf[buf_len_used++] = crc & 0xFF;
unsigned int cobs_buf_needed =
cobs_encode(buf, buf_len_used, cobs_buf, BUF_SIZE);
write_pkg(cobs_buf, cobs_buf_needed);
buf_len_used = 0;
}
buf[buf_len_used++] = 0x02;
memcpy((char *)&buf[buf_len_used], ni->key, strl);
buf_len_used += strl;
memcpy((char *)&buf[buf_len_used], ni->value, strl_value);
buf_len_used += strl_value;
ni->last_send = time; ni->last_send = time;
ni->send_requested = false; ni->send_requested = false;
} }
} }
if (buf_len_used == 0) return; if (buf_len_used == 0) return;
@ -350,20 +340,6 @@ class SimpleSync {
return 0; return 0;
} }
NumberInterface *get_number_if(const char *const key) const {
for (const auto ni : number_interfaces) {
if (strcmp(ni->key, key) == 0) return ni;
}
return nullptr;
}
StringInterface *get_string_if(const char *const key) const {
for (const auto ni : string_interfaces) {
if (strcmp(ni->key, key) == 0) return ni;
}
return nullptr;
}
#ifdef ARDUINO #ifdef ARDUINO
SimpleSync(Print *ostream, function<void(NumberInterface *&, char *, int)> number_update, SimpleSync(Print *ostream, function<void(NumberInterface *&, char *, int)> number_update,
function<void(StringInterface *&, char *, char *)> string_update) function<void(StringInterface *&, char *, char *)> string_update)