PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 292 - Remove serial port speed restriction for Mac OSX.

This commit is contained in:
wb2osz 2021-01-01 21:03:04 -05:00
parent 14d6eed205
commit 5d02e0ba0e
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -7,6 +7,8 @@
### New Features: ### ### New Features: ###
- Dire Wolf now advertises itself using DNS Service Discovery. This allows suitable APRS / Packet Radio applications to find a network KISS TNC without knowing the IP address or TCP port. Thanks to Hessu for providing this. Currently available only for Linux and Mac OSX. [Read all about it here.](https://github.com/hessu/aprs-specs/blob/master/TCP-KISS-DNS-SD.md)
- The transmit calibration tone (-x) command line option now accepts a radio channel number and/or a single letter mode: a = alternate tones, m = mark tone, s = space tone, p = PTT only no sound. - The transmit calibration tone (-x) command line option now accepts a radio channel number and/or a single letter mode: a = alternate tones, m = mark tone, s = space tone, p = PTT only no sound.
- The BEACON configuration now recognizes the SOURCE= option. This replaces the AX.25 source address rather than using the MYCALL value for the channel. This is useful for sending more than 5 analog telemetry channels. Use two, or more, source addresses with up to 5 analog channels each. - The BEACON configuration now recognizes the SOURCE= option. This replaces the AX.25 source address rather than using the MYCALL value for the channel. This is useful for sending more than 5 analog telemetry channels. Use two, or more, source addresses with up to 5 analog channels each.

5
src/direwolf.c
View File

@ -296,7 +296,7 @@ int main (int argc, char *argv[])
//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION); //dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
#if defined(ENABLE_GPSD) || defined(USE_HAMLIB) || defined(USE_CM108) #if defined(ENABLE_GPSD) || defined(USE_HAMLIB) || defined(USE_CM108) || USE_AVAHI_CLIENT || USE_MACOS_DNSSD
dw_printf ("Includes optional support for: "); dw_printf ("Includes optional support for: ");
#if defined(ENABLE_GPSD) #if defined(ENABLE_GPSD)
dw_printf (" gpsd"); dw_printf (" gpsd");
@ -306,6 +306,9 @@ int main (int argc, char *argv[])
#endif #endif
#if defined(USE_CM108) #if defined(USE_CM108)
dw_printf (" cm108-ptt"); dw_printf (" cm108-ptt");
#endif
#if (USE_AVAHI_CLIENT|USE_MACOS_DNSSD)
dw_printf (" dns-sd");
#endif #endif
dw_printf ("\n"); dw_printf ("\n");
#endif #endif

6
src/serial_port.c
View File

@ -237,12 +237,14 @@ MYFDTYPE serial_port_open (char *devicename, int baud)
case 9600: cfsetispeed (&ts, B9600); cfsetospeed (&ts, B9600); break; case 9600: cfsetispeed (&ts, B9600); cfsetospeed (&ts, B9600); break;
case 19200: cfsetispeed (&ts, B19200); cfsetospeed (&ts, B19200); break; case 19200: cfsetispeed (&ts, B19200); cfsetospeed (&ts, B19200); break;
case 38400: cfsetispeed (&ts, B38400); cfsetospeed (&ts, B38400); break; case 38400: cfsetispeed (&ts, B38400); cfsetospeed (&ts, B38400); break;
#ifndef __APPLE__ // This does not seem to be a problem anymore.
// Leaving traces behind, as clue, in case failure is encountered in some older version.
//#ifndef __APPLE__
// Not defined for Mac OSX. // Not defined for Mac OSX.
// https://groups.yahoo.com/neo/groups/direwolf_packet/conversations/messages/2072 // https://groups.yahoo.com/neo/groups/direwolf_packet/conversations/messages/2072
case 57600: cfsetispeed (&ts, B57600); cfsetospeed (&ts, B57600); break; case 57600: cfsetispeed (&ts, B57600); cfsetospeed (&ts, B57600); break;
case 115200: cfsetispeed (&ts, B115200); cfsetospeed (&ts, B115200); break; case 115200: cfsetispeed (&ts, B115200); cfsetospeed (&ts, B115200); break;
#endif //#endif
default: text_color_set(DW_COLOR_ERROR); default: text_color_set(DW_COLOR_ERROR);
dw_printf ("serial_port_open: Unsupported speed %d. Using 4800.\n", baud); dw_printf ("serial_port_open: Unsupported speed %d. Using 4800.\n", baud);
cfsetispeed (&ts, B4800); cfsetospeed (&ts, B4800); cfsetispeed (&ts, B4800); cfsetospeed (&ts, B4800);