Skip to content

Commit 45136a9

Browse files
wb2oszwb2osz
committed
AIS Reception enhancements.
1 parent 0edb44e commit 45136a9

8 files changed

+407
-79
lines changed

‎src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ list(APPEND direwolf_SOURCES
4141
dtime_now.c
4242
dtmf.c
4343
dwgps.c
44+
dwsock.c
4445
encode_aprs.c
4546
encode_aprs.c
4647
fcs_calc.c

‎src/ais.c

+161-29
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ static const struct {
8787
{ 96, 168 } // 27 96 or 168, not range
8888
};
8989

90+
static void save_ship_data(char *mssi, char *shipname, char *callsign, char *destination);
91+
static void get_ship_data(char *mssi, char *comment, int comment_size);
92+
93+
9094
/*-------------------------------------------------------------------
9195
*
9296
* Functions to get and set element of a bit vector.
@@ -144,29 +148,68 @@ static int get_field_signed (unsigned char *base, unsigned int start, unsigned i
144148
return (result);
145149
}
146150

147-
static double get_field_latlon (unsigned char *base, unsigned int start, unsigned int len)
151+
static double get_field_lat (unsigned char *base, unsigned int start, unsigned int len)
148152
{
149153
// Latitude of 0x3412140 (91 deg) means not available.
150-
// Longitude of 0x6791AC0 (181 deg) means not available.
151-
return ((double)get_field_signed(base, start, len) / 600000.0);
154+
// Message type 27 uses lower resolution, 17 bits rather than 27.
155+
// It encodes minutes/10 rather than normal minutes/10000.
156+
157+
int n = get_field_signed(base, start, len);
158+
if (len == 17) {
159+
return ((n == 91*600) ? G_UNKNOWN : (double)n / 600.0);
160+
}
161+
else {
162+
return ((n == 91*600000) ? G_UNKNOWN : (double)n / 600000.0);
163+
}
164+
}
152165

153-
// Message type 27 uses lower resolution, 17 & 18 bits rather than 27 & 28.
166+
static double get_field_lon (unsigned char *base, unsigned int start, unsigned int len)
167+
{
168+
// Longitude of 0x6791AC0 (181 deg) means not available.
169+
// Message type 27 uses lower resolution, 18 bits rather than 28.
154170
// It encodes minutes/10 rather than normal minutes/10000.
171+
172+
int n = get_field_signed(base, start, len);
173+
if (len == 18) {
174+
return ((n == 181*600) ? G_UNKNOWN : (double)n / 600.0);
175+
}
176+
else {
177+
return ((n == 181*600000) ? G_UNKNOWN : (double)n / 600000.0);
178+
}
155179
}
156180

157181
static float get_field_speed (unsigned char *base, unsigned int start, unsigned int len)
158182
{
159183
// Raw 1023 means not available.
160184
// Multiply by 0.1 to get knots.
161185
// For aircraft it is knots, not deciknots.
162-
return ((float)get_field(base, start, len) * 0.1);
186+
187+
// Message type 27 uses lower resolution, 6 bits rather than 10.
188+
// It encodes minutes/10 rather than normal minutes/10000.
189+
190+
int n = get_field(base, start, len);
191+
if (len == 6) {
192+
return ((n == 63) ? G_UNKNOWN : (float)n);
193+
}
194+
else {
195+
return ((n == 1023) ? G_UNKNOWN : (float)n * 0.1);
196+
}
163197
}
164198

165199
static float get_field_course (unsigned char *base, unsigned int start, unsigned int len)
166200
{
167201
// Raw 3600 means not available.
168202
// Multiply by 0.1 to get degrees
169-
return ((float)get_field(base, start, len) * 0.1);
203+
// Message type 27 uses lower resolution, 9 bits rather than 12.
204+
// It encodes degrees rather than normal degrees/10.
205+
206+
int n = get_field(base, start, len);
207+
if (len == 9) {
208+
return ((n == 360) ? G_UNKNOWN : (float)n);
209+
}
210+
else {
211+
return ((n == 3600) ? G_UNKNOWN : (float)n * 0.1);
212+
}
170213
}
171214

172215
static int get_field_ascii (unsigned char *base, unsigned int start, unsigned int len)
@@ -428,7 +471,7 @@ int ais_parse (char *sentence, int quiet, char *descr, int descr_size, char *mss
428471
int type = get_field(ais, 0, 6);
429472

430473
if (type >= 1 && type <= 27) {
431-
snprintf (mssi, mssi_size, "%d", get_field(ais, 8, 30));
474+
snprintf (mssi, mssi_size, "%09d", get_field(ais, 8, 30));
432475
}
433476
switch (type) {
434477

@@ -439,10 +482,11 @@ int ais_parse (char *sentence, int quiet, char *descr, int descr_size, char *mss
439482
snprintf (descr, descr_size, "AIS %d: Position Report Class A", type);
440483
*symtab = '/';
441484
*symbol = 's'; // Power boat (ship) side view
442-
*odlon = get_field_latlon(ais, 61, 28);
443-
*odlat = get_field_latlon(ais, 89, 27);
485+
*odlon = get_field_lon(ais, 61, 28);
486+
*odlat = get_field_lat(ais, 89, 27);
444487
*ofknots = get_field_speed(ais, 50, 10);
445488
*ofcourse = get_field_course(ais, 116, 12);
489+
get_ship_data(mssi, comment, comment_size);
446490
break;
447491

448492
case 4: // Base Station Report
@@ -456,8 +500,10 @@ int ais_parse (char *sentence, int quiet, char *descr, int descr_size, char *mss
456500
//hour = get_field(ais, 61, 5);
457501
//minute = get_field(ais, 66, 6);
458502
//second = get_field(ais, 72, 6);
459-
*odlon = get_field_latlon(ais, 79, 28);
460-
*odlat = get_field_latlon(ais, 107, 27);
503+
*odlon = get_field_lon(ais, 79, 28);
504+
*odlat = get_field_lat(ais, 107, 27);
505+
// Is this suitable or not? Doesn't hurt, I suppose.
506+
get_ship_data(mssi, comment, comment_size);
461507
break;
462508

463509
case 5: // Static and Voyage Related Data
@@ -472,13 +518,8 @@ int ais_parse (char *sentence, int quiet, char *descr, int descr_size, char *mss
472518
get_field_string(ais, 70, 42, callsign);
473519
get_field_string(ais, 112, 120, shipname);
474520
get_field_string(ais, 302, 120, destination);
475-
476-
if (strlen(destination) > 0) {
477-
snprintf (comment, comment_size, "%s, %s, dest. %s", shipname, callsign, destination);
478-
}
479-
else {
480-
snprintf (comment, comment_size, "%s, %s", shipname, callsign);
481-
}
521+
save_ship_data(mssi, shipname, callsign, destination);
522+
get_ship_data(mssi, comment, comment_size);
482523
}
483524
break;
484525

@@ -489,10 +530,12 @@ int ais_parse (char *sentence, int quiet, char *descr, int descr_size, char *mss
489530
*symtab = '/';
490531
*symbol = '\''; // Small AIRCRAFT
491532
*ofalt_m = get_field(ais, 38, 12); // meters, 4095 means not available
492-
*odlon = get_field_latlon(ais, 61, 28);
493-
*odlat = get_field_latlon(ais, 89, 27);
494-
*ofknots = get_field_speed(ais, 50, 10) * 10.0; // plane is knots, not knots/10
533+
*odlon = get_field_lon(ais, 61, 28);
534+
*odlat = get_field_lat(ais, 89, 27);
535+
*ofknots = get_field_speed(ais, 50, 10); // plane is knots, not knots/10
536+
if (*ofknots != G_UNKNOWN) *ofknots = *ofknots * 10.0;
495537
*ofcourse = get_field_course(ais, 116, 12);
538+
get_ship_data(mssi, comment, comment_size);
496539
break;
497540

498541
case 18: // Standard Class B CS Position Report
@@ -501,28 +544,31 @@ int ais_parse (char *sentence, int quiet, char *descr, int descr_size, char *mss
501544
snprintf (descr, descr_size, "AIS %d: Standard Class B CS Position Report", type);
502545
*symtab = '/';
503546
*symbol = 'Y'; // YACHT (sail)
504-
*odlon = get_field_latlon(ais, 57, 28);
505-
*odlat = get_field_latlon(ais, 85, 27);
547+
*odlon = get_field_lon(ais, 57, 28);
548+
*odlat = get_field_lat(ais, 85, 27);
549+
get_ship_data(mssi, comment, comment_size);
506550
break;
507551

508552
case 19: // Extended Class B CS Position Report
509553

510554
snprintf (descr, descr_size, "AIS %d: Extended Class B CS Position Report", type);
511555
*symtab = '/';
512556
*symbol = 'Y'; // YACHT (sail)
513-
*odlon = get_field_latlon(ais, 57, 28);
514-
*odlat = get_field_latlon(ais, 85, 27);
557+
*odlon = get_field_lon(ais, 57, 28);
558+
*odlat = get_field_lat(ais, 85, 27);
559+
get_ship_data(mssi, comment, comment_size);
515560
break;
516561

517562
case 27: // Long Range AIS Broadcast message
518563

519564
snprintf (descr, descr_size, "AIS %d: Long Range AIS Broadcast message", type);
520565
*symtab = '\\';
521566
*symbol = 's'; // OVERLAY SHIP/boat (top view)
522-
*odlon = get_field_latlon(ais, 44, 18) * 1000; // Note: minutes/10 rather than usual /10000.
523-
*odlat = get_field_latlon(ais, 62, 17) * 1000;
524-
*ofknots = get_field_speed(ais, 79, 6) * 10; // Note: knots, not deciknots.
525-
*ofcourse = get_field_course(ais, 85, 9) * 10; // Note: degrees, not decidegrees.
567+
*odlon = get_field_lon(ais, 44, 18); // Note: minutes/10 rather than usual /10000.
568+
*odlat = get_field_lat(ais, 62, 17);
569+
*ofknots = get_field_speed(ais, 79, 6); // Note: knots, not deciknots.
570+
*ofcourse = get_field_course(ais, 85, 9); // Note: degrees, not decidegrees.
571+
get_ship_data(mssi, comment, comment_size);
526572
break;
527573

528574
default:
@@ -575,4 +621,90 @@ int ais_check_length (int type, int length)
575621
} // end ais_check_length
576622

577623

624+
625+
/*-------------------------------------------------------------------
626+
*
627+
* Name: save_ship_data
628+
*
629+
* Purpose: Save shipname, etc., from "Static and Voyage Related Data"
630+
* so it can be combined later with the position reports.
631+
*
632+
* Inputs: mssi
633+
* shipname
634+
* callsign
635+
* destination
636+
*
637+
*--------------------------------------------------------------------*/
638+
639+
struct ship_data_s {
640+
struct ship_data_s *pnext;
641+
char mssi[9+1];
642+
char shipname[20+1];
643+
char callsign[7+1];
644+
char destination[20+1];
645+
};
646+
647+
// Just use a single linked list for now.
648+
// If I get ambitious, I might use a hash table.
649+
// I don't think we need a critical region because all channels
650+
// should be serialized thru the receive queue.
651+
652+
static struct ship_data_s *ships = NULL;
653+
654+
655+
static void save_ship_data(char *mssi, char *shipname, char *callsign, char *destination)
656+
{
657+
// Get list node, either existing or new.
658+
struct ship_data_s *p = ships;
659+
while (p != NULL) {
660+
if (strcmp(mssi, p->mssi) == 0) {
661+
break;
662+
}
663+
p = p->pnext;
664+
}
665+
if (p == NULL) {
666+
p = calloc(sizeof(struct ship_data_s),1);
667+
p->pnext = ships;
668+
ships = p;
669+
}
670+
671+
strlcpy (p->mssi, mssi, sizeof(p->mssi));
672+
strlcpy (p->shipname, shipname, sizeof(p->shipname));
673+
strlcpy (p->callsign, callsign, sizeof(p->callsign));
674+
strlcpy (p->destination, destination, sizeof(p->destination));
675+
}
676+
677+
/*-------------------------------------------------------------------
678+
*
679+
* Name: save_ship_data
680+
*
681+
* Purpose: Get ship data for specified mssi.
682+
*
683+
* Inputs: mssi
684+
*
685+
* Outputs: comment - If mssi is found, return in single string here,
686+
* suitable for the comment field.
687+
*
688+
*--------------------------------------------------------------------*/
689+
690+
static void get_ship_data(char *mssi, char *comment, int comment_size)
691+
{
692+
struct ship_data_s *p = ships;
693+
while (p != NULL) {
694+
if (strcmp(mssi, p->mssi) == 0) {
695+
break;
696+
}
697+
p = p->pnext;
698+
}
699+
if (p != NULL) {
700+
if (strlen(p->destination) > 0) {
701+
snprintf (comment, comment_size, "%s, %s, dest. %s", p->shipname, p->callsign, p->destination);
702+
}
703+
else {
704+
snprintf (comment, comment_size, "%s, %s", p->shipname, p->callsign);
705+
}
706+
}
707+
}
708+
709+
578710
// end ais.c

‎src/config.c

+32-4
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
885885
p_misc_config->kiss_serial_poll = 0;
886886

887887
strlcpy (p_misc_config->gpsnmea_port, "", sizeof(p_misc_config->gpsnmea_port));
888-
strlcpy (p_misc_config->waypoint_port, "", sizeof(p_misc_config->waypoint_port));
888+
strlcpy (p_misc_config->waypoint_serial_port, "", sizeof(p_misc_config->waypoint_serial_port));
889889

890890
p_misc_config->log_daily_names = 0;
891891
strlcpy (p_misc_config->log_path, "", sizeof(p_misc_config->log_path));
@@ -4602,21 +4602,46 @@ void config_init (char *fname, struct audio_s *p_audio_config,
46024602
}
46034603

46044604
/*
4605-
* WAYPOINT - Generate WPL NMEA sentences for display on map.
4605+
* WAYPOINT - Generate WPL and AIS NMEA sentences for display on map.
46064606
*
46074607
* WAYPOINT serial-device [ formats ]
4608+
* WAYPOINT host:udpport [ formats ]
46084609
*
46094610
*/
46104611
else if (strcasecmp(t, "waypoint") == 0) {
4612+
46114613
t = split(NULL,0);
46124614
if (t == NULL) {
46134615
text_color_set(DW_COLOR_ERROR);
4614-
dw_printf ("Config file: Missing device name for WAYPOINT on line %d.\n", line);
4616+
dw_printf ("Config file: Missing output device for WAYPOINT on line %d.\n", line);
46154617
continue;
46164618
}
4619+
4620+
/* If there is a ':' in the name, split it into hostname:udpportnum. */
4621+
/* Otherwise assume it is serial port name. */
4622+
4623+
char *p = strchr (t, ':');
4624+
if (p != NULL) {
4625+
*p = '\0';
4626+
int n = atoi(p+1);
4627+
if (n >= MIN_IP_PORT_NUMBER && n <= MAX_IP_PORT_NUMBER) {
4628+
strlcpy (p_misc_config->waypoint_udp_hostname, t, sizeof(p_misc_config->waypoint_udp_hostname));
4629+
if (strlen(p_misc_config->waypoint_udp_hostname) == 0) {
4630+
strlcpy (p_misc_config->waypoint_udp_hostname, "localhost", sizeof(p_misc_config->waypoint_udp_hostname));
4631+
}
4632+
p_misc_config->waypoint_udp_portnum = n;
4633+
}
4634+
else {
4635+
text_color_set(DW_COLOR_ERROR);
4636+
dw_printf ("Line %d: Invalid UDP port number %d for sending waypoints.\n", line, n);
4637+
}
4638+
}
46174639
else {
4618-
strlcpy (p_misc_config->waypoint_port, t, sizeof(p_misc_config->waypoint_port));
4640+
strlcpy (p_misc_config->waypoint_serial_port, t, sizeof(p_misc_config->waypoint_serial_port));
46194641
}
4642+
4643+
/* Anthing remaining is the formats to enable. */
4644+
46204645
t = split(NULL,1);
46214646
if (t != NULL) {
46224647
for ( ; *t != '\0' ; t++ ) {
@@ -4633,6 +4658,9 @@ void config_init (char *fname, struct audio_s *p_audio_config,
46334658
case 'K':
46344659
p_misc_config->waypoint_formats |= WPT_FORMAT_KENWOOD;
46354660
break;
4661+
case 'A':
4662+
p_misc_config->waypoint_formats |= WPT_FORMAT_AIS;
4663+
break;
46364664
case ' ':
46374665
case ',':
46384666
break;

‎src/config.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,23 @@ struct misc_config_s {
6565
/* Default is 2947. */
6666

6767

68-
char waypoint_port[20]; /* Serial port name for sending NMEA waypoint sentences */
68+
char waypoint_serial_port[20]; /* Serial port name for sending NMEA waypoint sentences */
6969
/* to a GPS map display or other mapping application. */
7070
/* e.g. COM22, /dev/ttyACM0 */
7171
/* Currently no option for setting non-standard speed. */
72+
/* This was done in 2014 and no one has complained yet. */
73+
74+
char waypoint_udp_hostname[80]; /* Destination host when using UDP. */
75+
76+
int waypoint_udp_portnum; /* UDP port. */
7277

7378
int waypoint_formats; /* Which sentence formats should be generated? */
7479

7580
#define WPT_FORMAT_NMEA_GENERIC 0x01 /* N $GPWPT */
7681
#define WPT_FORMAT_GARMIN 0x02 /* G $PGRMW */
7782
#define WPT_FORMAT_MAGELLAN 0x04 /* M $PMGNWPL */
7883
#define WPT_FORMAT_KENWOOD 0x08 /* K $PKWDWPL */
84+
#define WPT_FORMAT_AIS 0x10 /* A !AIVDM */
7985

8086

8187
int log_daily_names; /* True to generate new log file each day. */

0 commit comments

Comments
 (0)