Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2024-10-04 17:37:55 +01:00
11 changed files with 472 additions and 53 deletions

View File

@@ -20,12 +20,13 @@
#if !defined(P25Data_H)
#define P25Data_H
#include "RS634717.h"
#include "Trellis.h"
#include "Defines.h"
#if defined(USE_P25)
#include "RS634717.h"
#include "P25Trellis.h"
class CP25Data {
public:
CP25Data();
@@ -85,7 +86,7 @@ private:
unsigned int m_dstId;
unsigned char m_serviceType;
CRS634717 m_rs;
CTrellis m_trellis;
CP25Trellis m_trellis;
void decodeLDUHamming(const unsigned char* raw, unsigned char* data);
void encodeLDUHamming(unsigned char* data, const unsigned char* raw);