ExternalVendorCode/k3ng_rotator_controller
1
0
Fork 0
mirror of https://github.com/k3ng/k3ng_rotator_controller.git synced 2024-12-19 05:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2018.03.02.01

Browse Source 
Added code to handle GPS serial data that is missing terminator characters.  Created OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING which disables this function.
This commit is contained in:
Anthony Good 2018-03-02 17:49:29 -05:00
parent 2a5da3653f
commit 3e80a18912
6 changed files with 114 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
k3ng_rotator_controller/k3ng_rotator_controller.ino
View File

@ -345,6 +345,12 @@
2018.02.24.01
Added OPTION_GPS_DO_PORT_FLUSHES
2018.02.25.01
Small change to FEATURE_GPS and gps_port_read
2018.03.02.01
Added code to handle GPS serial data that is missing terminator characters. Created OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING which disables this function.
All library files should be placed in directories likes \sketchbook\libraries\library1\ , \sketchbook\libraries\library2\ , etc.
Anything rotator_*.* should be in the ino directory!
@ -354,7 +360,7 @@
*/
#define CODE_VERSION "2018.02.24.01"
#define CODE_VERSION "2018.03.02.01"
#include <avr/pgmspace.h>
#include <EEPROM.h>
@ -2700,6 +2706,12 @@ void check_serial(){
float tempfloat = 0;
char return_string[100] = "";
#if defined(FEATURE_GPS)
static byte gps_port_read = 0;
static byte gps_port_read_data_sent = 0;
static byte gps_missing_terminator_flag = 0;
#endif
#if !defined(FEATURE_AZ_POSITION_ROTARY_ENCODER) && !defined(FEATURE_AZ_POSITION_PULSE_INPUT) && !defined(FEATURE_AZ_POSITION_ROTARY_ENCODER_USE_PJRC_LIBRARY)
long place_multiplier = 0;
byte decimalplace = 0;
@ -2905,41 +2917,89 @@ void check_serial(){
#ifdef FEATURE_GPS
#if defined(OPTION_DONT_READ_GPS_PORT_AS_OFTEN)
if (gps_port->available()) {
byte gps_port_read = gps_port->read();
#ifdef GPS_MIRROR_PORT
gps_mirror_port->write(gps_port_read);
#endif //GPS_MIRROR_PORT
#ifdef DEBUG_GPS_SERIAL
debug.write(gps_port_read);
if (gps_port_read == 10){debug.write(13);}
#endif //DEBUG_GPS_SERIAL
#if defined(DEBUG_GPS_SERIAL) || defined(OPTION_GPS_DO_PORT_FLUSHES)
port_flush();
#endif
if (gps.encode(gps_port_read)) {
gps_data_available = 1;
if (gps_missing_terminator_flag){
gps.encode('$');
gps_missing_terminator_flag = 0;
gps_port_read_data_sent = 1;
} else {
#if defined(OPTION_DONT_READ_GPS_PORT_AS_OFTEN)
if (gps_port->available()) {
gps_port_read = gps_port->read();
#ifdef GPS_MIRROR_PORT
gps_mirror_port->write(gps_port_read);
#endif //GPS_MIRROR_PORT
#if defined(DEBUG_GPS_SERIAL) || defined(DEBUG_TEST_1)
debug.write(gps_port_read);
if (gps_port_read == 10){debug.write(13);}
#endif //DEBUG_GPS_SERIAL
#if defined(DEBUG_GPS_SERIAL) || defined(OPTION_GPS_DO_PORT_FLUSHES) || defined(DEBUG_TEST_1)
port_flush();
#endif
#if defined(OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING)
if (gps.encode(gps_port_read)) {
gps_data_available = 1;
}
#else
if ((gps_port_read == '$') && (gps_port_read_data_sent)){ // handle missing LF/CR
if (gps.encode('\r')) {
gps_data_available = 1;
gps_missing_terminator_flag = 1;
} else {
gps.encode(gps_port_read);
}
} else {
if (gps.encode(gps_port_read)) {
gps_data_available = 1;
gps_port_read_data_sent = 0;
} else {
gps_port_read_data_sent = 1;
}
}
#endif // OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
}
}
#else //OPTION_DONT_READ_GPS_PORT_AS_OFTEN
while (gps_port->available()) {
byte gps_port_read = gps_port->read();
#ifdef GPS_MIRROR_PORT
gps_mirror_port->write(gps_port_read);
#endif //GPS_MIRROR_PORT
#ifdef DEBUG_GPS_SERIAL
debug.write(gps_port_read);
if (gps_port_read == 10){debug.write(13);}
#endif //DEBUG_GPS_SERIAL
#if defined(DEBUG_GPS_SERIAL) || defined(OPTION_GPS_DO_PORT_FLUSHES)
port_flush();
#endif
if (gps.encode(gps_port_read)) {
gps_data_available = 1;
#else //OPTION_DONT_READ_GPS_PORT_AS_OFTEN
while (gps_port->available()) {
gps_port_read = gps_port->read();
#ifdef GPS_MIRROR_PORT
gps_mirror_port->write(gps_port_read);
#endif //GPS_MIRROR_PORT
#if defined(DEBUG_GPS_SERIAL) || defined(DEBUG_TEST_1)
debug.write(gps_port_read);
if (gps_port_read == 10){debug.write(13);}
#endif //DEBUG_GPS_SERIAL
#if defined(DEBUG_GPS_SERIAL) || defined(OPTION_GPS_DO_PORT_FLUSHES) || defined(DEBUG_TEST_1)
port_flush();
#endif
#if defined(OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING)
if (gps.encode(gps_port_read)) {
gps_data_available = 1;
}
#else
if ((gps_port_read == '$') && (gps_port_read_data_sent)){ // handle missing LF/CR
if (gps.encode('\r')) {
gps_data_available = 1;
gps_missing_terminator_flag = 1;
} else {
gps.encode(gps_port_read);
}
} else {
if (gps.encode(gps_port_read)) {
gps_data_available = 1;
gps_port_read_data_sent = 0;
} else {
gps_port_read_data_sent = 1;
}
}
#endif // OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
}
}
#endif //OPTION_DONT_READ_GPS_PORT_AS_OFTEN
#endif //OPTION_DONT_READ_GPS_PORT_AS_OFTEN
} // if (gps_missing_terminator_flag)
#endif // FEATURE_GPS
#if defined(GPS_MIRROR_PORT) && defined(FEATURE_GPS)
@ -5059,7 +5119,7 @@ void output_debug(){
if (((millis() - last_debug_output_time) >= 3000) && (debug_mode)) {
#ifdef DEBUG_GPS_SERIAL
#if defined(DEBUG_GPS_SERIAL) || defined(DEBUG_TEST_2)
debug.println("");
#endif //DEBUG_GPS_SERIAL
@ -9844,15 +9904,15 @@ void port_flush(){
#if defined(CONTROL_PORT_MAPPED_TO) && (defined(FEATURE_REMOTE_UNIT_SLAVE) || defined(FEATURE_YAESU_EMULATION) || defined(FEATURE_EASYCOM_EMULATION))
control_port->flush();
control_port->flush();
#endif //CONTROL_PORT_MAPPED_TO
#if defined(FEATURE_MASTER_WITH_SERIAL_SLAVE)
remote_unit_port->flush();
remote_unit_port->flush();
#endif
#if defined(GPS_PORT_MAPPED_TO) && defined(FEATURE_GPS)
gps_port->flush();
gps_port->flush();
#endif //defined(GPS_PORT_MAPPED_TO) && defined(FEATURE_GPS)
@ -10467,7 +10527,7 @@ void service_gps(){
gps.get_position(&gps_lat, &gps_lon, &fix_age);
gps.crack_datetime(&gps_year, &gps_month, &gps_day, &gps_hours, &gps_minutes, &gps_seconds, &gps_hundredths, &fix_age);
#ifdef DEBUG_GPS
#ifdef DEBUG_GPS_SERIAL
#if defined(DEBUG_GPS_SERIAL) || defined(DEBUG_TEST_3)
debug.println("");
#endif //DEBUG_GPS_SERIAL
debug.print("service_gps: fix_age:");

1
k3ng_rotator_controller/rotator_features.h
View File

@ -161,6 +161,7 @@
// #define OPTION_DONT_READ_GPS_PORT_AS_OFTEN
// #define OPTION_GPS_DO_PORT_FLUSHES
// #define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
// #define OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
/* ---------------------- debug stuff - don't touch unless you know what you are doing --------------------------- */

4
k3ng_rotator_controller/rotator_features_ea4tx_ars_usb.h
View File

@ -51,8 +51,8 @@
#define OPTION_SAVE_MEMORY_EXCLUDE_EXTENDED_COMMANDS
//#define OPTION_GPS_DO_PORT_FLUSHES
//#define OPTION_DONT_READ_GPS_PORT_AS_OFTEN
// #define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
//#define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
//#define OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
/* ---------------------- debug stuff - don't touch unless you know what you are doing --------------------------- */

3
k3ng_rotator_controller/rotator_features_m0upu.h
View File

@ -147,7 +147,8 @@
#define OPTION_SAVE_MEMORY_EXCLUDE_EXTENDED_COMMANDS
//#define OPTION_DONT_READ_GPS_PORT_AS_OFTEN
//#define OPTION_GPS_DO_PORT_FLUSHES
// #define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
//#define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
//#define OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
/* ---------------------- debug stuff - don't touch unless you know what you are doing --------------------------- */

16
k3ng_rotator_controller/rotator_features_test.h
View File

@ -66,13 +66,13 @@
// #define FEATURE_EL_POSITION_GET_FROM_REMOTE_UNIT // requires FEATURE_MASTER_WITH_SERIAL_SLAVE or FEATURE_MASTER_WITH_ETHERNET_SLAVE
// #define FEATURE_EL_POSITION_ADAFRUIT_LSM303 // Uncomment for elevation using LSM303 accelerometer and Adafruit library (https://github.com/adafruit/Adafruit_LSM303) (also uncomment object declaration below)
// #define FEATURE_EL_POSITION_POLOLU_LSM303 // Uncomment for elevation using LSM303 compass and Polulu library
//#define FEATURE_EL_POSITION_HH12_AS5045_SSI
// #define FEATURE_EL_POSITION_HH12_AS5045_SSI
// #define FEATURE_EL_POSITION_INCREMENTAL_ENCODER
// #define FEATURE_EL_POSITION_MEMSIC_2125
// #define FEATURE_EL_POSITION_A2_ABSOLUTE_ENCODER
// And if you are using an Adafruit, Yourduino, RFRobot, YWRobot, or SainSmart display, you must also change the feature setting in rotator_k3ngdisplay.h!!!!
// #define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common)
#define FEATURE_4_BIT_LCD_DISPLAY // Uncomment for classic 4 bit LCD display (most common)
// #define FEATURE_ADAFRUIT_I2C_LCD
// #define FEATURE_ADAFRUIT_BUTTONS // Uncomment this to use Adafruit I2C LCD buttons for manual AZ/EL instead of normal buttons (also set this feature in rotator_k3ngdisplay.h)
// #define FEATURE_YOURDUINO_I2C_LCD
@ -119,9 +119,9 @@
//#define OPTION_DELAY_C_CMD_OUTPUT // uncomment this when using Yaesu emulation with Ham Radio Deluxe
#define FEATURE_ONE_DECIMAL_PLACE_HEADINGS
//#define FEATURE_TWO_DECIMAL_PLACE_HEADINGS // under development - not working yet!
// #define FEATURE_AZIMUTH_CORRECTION // correct the azimuth using a calibration table in rotator_settings.h
// #define FEATURE_ELEVATION_CORRECTION // correct the elevation using a calibration table in rotator_settings.h
// #define FEATURE_ANCILLARY_PIN_CONTROL // control I/O pins with serial commands \F, \N, \P
//#define FEATURE_AZIMUTH_CORRECTION // correct the azimuth using a calibration table in rotator_settings.h
//#define FEATURE_ELEVATION_CORRECTION // correct the elevation using a calibration table in rotator_settings.h
//#define FEATURE_ANCILLARY_PIN_CONTROL // control I/O pins with serial commands \F, \N, \P
//#define FEATURE_JOYSTICK_CONTROL // analog joystick support
//#define OPTION_JOYSTICK_REVERSE_X_AXIS
//#define OPTION_JOYSTICK_REVERSE_Y_AXIS
@ -164,9 +164,9 @@
// #define OPTION_REVERSE_AZ_HH12_AS5045
// #define OPTION_REVERSE_EL_HH12_AS5045
// #define OPTION_DONT_READ_GPS_PORT_AS_OFTEN
#define OPTION_GPS_DO_PORT_FLUSHES
// #define OPTION_GPS_DO_PORT_FLUSHES
// #define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
// #define OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
// ######## ######## ###### ########
// ## ## ## ## ##
@ -221,7 +221,7 @@
// #define DEBUG_EL_POSITION_INCREMENTAL_ENCODER
// #define DEBUG_MOON_TRACKING
// #define DEBUG_SUN_TRACKING
#define DEBUG_GPS
// #define DEBUG_GPS
// #define DEBUG_GPS_SERIAL
// #define DEBUG_OFFSET
// #define DEBUG_RTC

1
k3ng_rotator_controller/rotator_features_wb6kcn.h
View File

@ -145,6 +145,7 @@
//#define OPTION_GPS_DO_PORT_FLUSHES
//#define OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING // change OPTION_SEND_STRING_OUT_CONTROL_PORT_WHEN_INITIALIZING_STRING in settings file
//#define OPTION_SAVE_MEMORY_EXCLUDE_EXTENDED_COMMANDS
// #define OPTION_GPS_EXCLUDE_MISSING_LF_CR_HANDLING
/*