1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-28 18:06:37 +01:00

Integrate many changes from master

This commit is contained in:
2026-03-18 13:29:57 +01:00
parent b2e67880d3
commit caf833e6ac
107 changed files with 8565 additions and 2688 deletions

View File

@@ -25,7 +25,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "NMEA0183AISMsg.h"
#include <NMEA0183Msg.h>
#include <Arduino.h>
//#include <Arduino.h>
#include <math.h>
#include <stdint.h>
#include <stdlib.h>
@@ -43,52 +43,37 @@ tNMEA0183AISMsg::tNMEA0183AISMsg() {
//*****************************************************************************
void tNMEA0183AISMsg::ClearAIS() {
PayloadBin[0]=0;
Payload[0]=0;
PayloadBin.reset();
iAddPldBin=0;
iAddPld=0;
}
//*****************************************************************************
// Add 6bit with no data.
bool tNMEA0183AISMsg::AddEmptyFieldToPayloadBin(uint8_t iBits) {
if ( (iAddPldBin + iBits * 6) >= AIS_BIN_MAX_LEN ) return false; // Is there room for any data
for (uint8_t i=0;i<iBits;i++) {
strncpy(PayloadBin+iAddPldBin, EmptyAISField, 6);
iAddPldBin+=6;
}
return true;
}
//*****************************************************************************
bool tNMEA0183AISMsg::AddIntToPayloadBin(int32_t ival, uint16_t countBits) {
if ( (iAddPldBin + countBits ) >= AIS_BIN_MAX_LEN ) return false; // Is there room for any data
AISBitSet bset(ival);
bset = ival;
PayloadBin[iAddPldBin]=0;
uint16_t iAdd=iAddPldBin;
for(int i = countBits-1; i >= 0 ; i--) {
PayloadBin[iAdd] = bset[i]?'1':'0';
PayloadBin[iAdd]=bset [i];
iAdd++;
}
iAddPldBin += countBits;
PayloadBin[iAddPldBin]=0;
return true;
}
// ****************************************************************************
bool tNMEA0183AISMsg::AddBoolToPayloadBin(bool &bval, uint8_t size) {
int8_t iTemp;
(bval == true)? iTemp = 1 : iTemp = 0;
if ( ! AddIntToPayloadBin(iTemp, size) ) return false;
//****************************************************************************
bool tNMEA0183AISMsg::AddBoolToPayloadBin(bool &bval) {
if ( (iAddPldBin + 1 ) >= AIS_BIN_MAX_LEN ) return false;
PayloadBin[iAddPldBin]=bval;
iAddPldBin++;
return true;
}
@@ -99,13 +84,11 @@ bool tNMEA0183AISMsg::AddEncodedCharToPayloadBin(char *sval, size_t countBits) {
if ( (iAddPldBin + countBits ) >= AIS_BIN_MAX_LEN ) return false; // Is there room for any data
PayloadBin[iAddPldBin]=0;
std::bitset<6> bs;
char * ptr;
const char * ptr;
size_t len = strlen(sval); // e.g.: should be 7 for Callsign
if ( len * 6 > countBits ) len = countBits / 6;
for (int i = 0; i<len; i++) {
for (size_t i = 0; i<len; i++) {
ptr = strchr(AsciiChar, sval[i]);
if ( ptr ) {
@@ -117,37 +100,44 @@ bool tNMEA0183AISMsg::AddEncodedCharToPayloadBin(char *sval, size_t countBits) {
AddIntToPayloadBin(0, 6);
}
}
PayloadBin[iAddPldBin+1]=0;
// fill up with "@", also covers empty sval
if ( len * 6 < countBits ) {
for (int i=0;i<(countBits/6-len);i++) {
for (size_t i=0;i<(countBits/6-len);i++) {
AddIntToPayloadBin(0, 6);
}
}
PayloadBin[iAddPldBin]=0;
return true;
}
// *****************************************************************************
bool tNMEA0183AISMsg::ConvertBinaryAISPayloadBinToAscii(const char *payloadbin) {
uint16_t len;
len = strlen( payloadbin ) / 6; // 28
//*****************************************************************************
template <unsigned int S>
int tNMEA0183AISMsg::ConvertBinaryAISPayloadBinToAscii(std::bitset<S> &src,uint16_t maxSize,uint16_t bitSize,uint16_t stoffset) {
Payload[0]='\0';
uint16_t slen=maxSize;
if (stoffset >= slen) return 0;
slen-=stoffset;
uint16_t bitLen=bitSize > 0?bitSize:slen;
uint16_t len= bitLen / 6;
if ((len * 6) < bitLen) len+=1;
uint16_t padBits=0;
uint32_t offset;
char s[7];
std::bitset<6> s;
uint8_t dec;
int i;
for ( i=0; i<len; i++ ) {
offset = i * 6;
int k = 0;
for (int j=offset; j<offset+6; j++ ) {
s[k] = payloadbin[j];
k++;
int k = 5;
for (uint32_t j=offset; j<offset+6; j++ ) {
if (j < slen){
s[k] = src[stoffset+j];
}
else{
s[k] = 0;
padBits++;
}
k--;
}
s[k]=0;
dec = strtoull (s, NULL, 2); //binToDec
dec = s.to_ulong();
if (dec < 40 ) dec += 48;
else dec += 56;
@@ -156,142 +146,56 @@ bool tNMEA0183AISMsg::ConvertBinaryAISPayloadBinToAscii(const char *payloadbin)
}
Payload[i]=0;
return true;
return padBits;
}
void tNMEA0183AISMsg::SetChannelAndTalker(bool channelA,bool own){
channel[0]=channelA?'A':'B';
strcpy(talker,own?"VDO":"VDM");
}
//********************** BUILD 2-parted AIS Sentences ************************
const tNMEA0183AISMsg& tNMEA0183AISMsg::BuildMsg5Part1(tNMEA0183AISMsg &AISMsg) {
Init("VDM", "AI", '!');
AddStrField("2");
AddStrField("1");
AddStrField("5");
AddStrField("A");
AddStrField( GetPayloadType5_Part1() );
AddStrField("0");
return AISMsg;
bool tNMEA0183AISMsg::InitAis(int max,int number,int sequence){
if ( !Init(talker,"AI", '!') ) return false;
if ( !AddUInt32Field(max) ) return false;
if ( !AddUInt32Field(number) ) return false;
if (sequence >= 0){
if ( !AddUInt32Field(sequence) ) return false;
}
else{
if ( !AddEmptyField() ) return false;
}
if ( !AddStrField(channel) ) return false;
return true;
}
bool tNMEA0183AISMsg::BuildMsg5Part1() {
if ( iAddPldBin != 424 ) return false;
InitAis(2,1,5);
int padBits=0;
AddStrField( GetPayload(padBits,0,336));
AddUInt32Field(padBits);
return true;
}
const tNMEA0183AISMsg& tNMEA0183AISMsg::BuildMsg5Part2(tNMEA0183AISMsg &AISMsg) {
Init("VDM", "AI", '!');
AddStrField("2");
AddStrField("2");
AddStrField("5");
AddStrField("A");
AddStrField( GetPayloadType5_Part2() );
AddStrField("2"); // Message 5, Part 2 has always 2 Padding Zeros
return AISMsg;
bool tNMEA0183AISMsg::BuildMsg5Part2() {
if ( iAddPldBin != 424 ) return false;
InitAis(2,2,5);
int padBits=0;
AddStrField( GetPayload(padBits,336,88) );
AddUInt32Field(padBits);
return true;
}
const tNMEA0183AISMsg& tNMEA0183AISMsg::BuildMsg24PartA(tNMEA0183AISMsg &AISMsg) {
Init("VDM", "AI", '!');
AddStrField("1");
AddStrField("1");
AddEmptyField();
AddStrField("A");
AddStrField( GetPayloadType24_PartA() );
AddStrField("0");
return AISMsg;
}
const tNMEA0183AISMsg& tNMEA0183AISMsg::BuildMsg24PartB(tNMEA0183AISMsg &AISMsg) {
Init("VDM", "AI", '!');
AddStrField("1");
AddStrField("1");
AddEmptyField();
AddStrField("A");
AddStrField( GetPayloadType24_PartB() );
AddStrField("0"); // Message 24, both parts have always Zero Padding
return AISMsg;
}
//******************************* AIS PAYLOADS *********************************
//******************************************************************************
// get converted Payload for Message 1, 2, 3 & 18, always Length 168
const char *tNMEA0183AISMsg::GetPayload() {
uint16_t lenbin = strlen( PayloadBin);
if ( lenbin != 168 ) return nullptr;
if ( !ConvertBinaryAISPayloadBinToAscii( PayloadBin ) ) return nullptr;
const char *tNMEA0183AISMsg::GetPayloadFix(int &padBits,uint16_t fixLen){
uint16_t lenbin = iAddPldBin;
if ( lenbin != fixLen ) return nullptr;
return GetPayload(padBits,0,0);
}
const char *tNMEA0183AISMsg::GetPayload(int &padBits,uint16_t offset,uint16_t bitLen) {
padBits=ConvertBinaryAISPayloadBinToAscii<AIS_BIN_MAX_LEN>(PayloadBin,iAddPldBin, bitLen,offset );
return Payload;
}
//******************************************************************************
// get converted Part 1 of Payload for Message 5
const char *tNMEA0183AISMsg::GetPayloadType5_Part1() {
uint16_t lenbin = strlen( PayloadBin);
if ( lenbin != 424 ) return nullptr;
char to[337];
strncpy(to, PayloadBin, 336); // First Part is always 336 Length
to[336]=0;
if ( !ConvertBinaryAISPayloadBinToAscii( to ) ) return nullptr;
return Payload;
}
//******************************************************************************
// get converted Part 2 of Payload for Message 5
const char *tNMEA0183AISMsg::GetPayloadType5_Part2() {
uint16_t lenbin = strlen( PayloadBin);
if ( lenbin != 424 ) return nullptr;
lenbin = 88; // Second Part is always 424 - 336 + 2 padding Zeros in Length
char to[91];
strncpy(to, PayloadBin + 336, lenbin);
to[88]='0'; to[89]='0'; to[90]=0;
if ( !ConvertBinaryAISPayloadBinToAscii( to ) ) return nullptr;
return Payload;
}
//******************************************************************************
// get converted Part A of Payload for Message 24
// Bit 0.....167, len 168
// In PayloadBin is Part A and Part B chained together with Length 296
const char *tNMEA0183AISMsg::GetPayloadType24_PartA() {
uint16_t lenbin = strlen( PayloadBin);
if ( lenbin != 296 ) return nullptr; // too short for Part A
char to[169]; // Part A has Length 168
*to = '\0';
for (int i=0; i<168; i++){
to[i] = PayloadBin[i];
}
to[168]=0;
if ( !ConvertBinaryAISPayloadBinToAscii( to ) ) return nullptr;
return Payload;
}
//******************************************************************************
// get converted Part B of Payload for Message 24
// Bit 0.....38 + bit39='1' (part number) + bit 168........295 296='\0' of total PayloadBin
// binary part B: len 40 + 128 = len 168
const char *tNMEA0183AISMsg::GetPayloadType24_PartB() {
uint16_t lenbin = strlen( PayloadBin);
if ( lenbin != 296 ) return nullptr; // too short for Part B
char to[169]; // Part B has Length 168
*to = '\0';
for (int i=0; i<39; i++){
to[i] = PayloadBin[i];
}
to[39] = 49; // part number 1
for (int i=40; i<168; i++) {
to[i] = PayloadBin[i+128];
}
to[168]=0;
if ( !ConvertBinaryAISPayloadBinToAscii( to ) ) return nullptr;
return Payload;
}