Merge remote-tracking branch 'upstream/master'

This commit is contained in:
K7MDL2 2020-08-28 13:50:16 -07:00
commit 098ee327e0
11 changed files with 1531 additions and 595 deletions

File diff suppressed because it is too large Load Diff

View File

@ -263,10 +263,10 @@
#define ACTIVATE_SUN_TRACKING 5
#define ACTIVATE_SATELLITE_TRACKING 6
#define UPDATE_CURRENT_SAT_AZ_EL_NEXT_AOS_AND_LOS 0
// #define UPDATE_CURRENT_SAT_AZ_EL_NEXT_AOS_AND_LOS 0 //***
#define PRINT_AOS_LOS_MULTILINE_REPORT 1
#define PRINT_AOS_LOS_TABULAR_REPORT 2
#define UPDATE_CURRENT_SAT_JUST_AZ_EL 3
// #define UPDATE_CURRENT_SAT_JUST_AZ_EL 3 //****
#define UPDATE_SAT_ARRAY_SLOT_AZ_EL_NEXT_AOS_LOS 4
#define UPDATE_SAT_ARRAY_SLOT_JUST_AZ_EL 5
@ -293,8 +293,8 @@
#define DO_NOT_LOAD_HARDCODED_TLE 0
#define LOAD_HARDCODED_TLE 1
#define LOAD_INTO_CURRENT_SATELLITE 0
#define LOAD_INTO_CALC_SATELLITE 1
#define MAKE_IT_THE_CURRENT_SATELLITE 0
#define DO_NOT_MAKE_IT_THE_CURRENT_SATELLITE 1
#define NOT_VERBOSE 0
#define _VERBOSE_ 1

View File

@ -222,6 +222,49 @@ void DebugClass::print(double i)
// #endif //defined(FEATURE_ETHERNET) && defined(ETHERNET_TCP_PORT_1)
}
void DebugClass::println(long i)
{
#if defined(FEATURE_REMOTE_UNIT_SLAVE) || defined(FEATURE_YAESU_EMULATION) || defined(FEATURE_EASYCOM_EMULATION)
if (debug_mode & CONTROL_PORT0){
control_port->println(i);
}
#endif //defined(FEATURE_REMOTE_UNIT_SLAVE) || defined(FEATURE_YAESU_EMULATION) || defined(FEATURE_EASYCOM_EMULATION)
// #ifdef FEATURE_ETHERNET
// if (debug_mode & ETHERNET_PORT0){
// ethernetclient0.println(i);
// }
// #endif //FEATURE_ETHERNET
// #if defined(FEATURE_ETHERNET) && defined(ETHERNET_TCP_PORT_1)
// if (debug_mode & ETHERNET_PORT1){
// ethernetclient1.println(i);
// }
// #endif //defined(FEATURE_ETHERNET) && defined(ETHERNET_TCP_PORT_1)
}
void DebugClass::println(int i)
{
#if defined(FEATURE_REMOTE_UNIT_SLAVE) || defined(FEATURE_YAESU_EMULATION) || defined(FEATURE_EASYCOM_EMULATION)
if (debug_mode & CONTROL_PORT0){
control_port->println(i);
}
#endif //defined(FEATURE_REMOTE_UNIT_SLAVE) || defined(FEATURE_YAESU_EMULATION) || defined(FEATURE_EASYCOM_EMULATION)
// #ifdef FEATURE_ETHERNET
// if (debug_mode & ETHERNET_PORT0){
// ethernetclient0.println(i);
// }
// #endif //FEATURE_ETHERNET
// #if defined(FEATURE_ETHERNET) && defined(ETHERNET_TCP_PORT_1)
// if (debug_mode & ETHERNET_PORT1){
// ethernetclient1.println(i);
// }
// #endif //defined(FEATURE_ETHERNET) && defined(ETHERNET_TCP_PORT_1)
}
void DebugClass::println(double i)
{
#if defined(FEATURE_REMOTE_UNIT_SLAVE) || defined(FEATURE_YAESU_EMULATION) || defined(FEATURE_EASYCOM_EMULATION)

View File

@ -49,6 +49,8 @@ class DebugClass
void print(long i);
void print(double i);
void println(int i);
void println(long i);
void println(double i);
void println(const char *str);
void println(const __FlashStringHelper *str);

View File

@ -72,3 +72,6 @@
// #define DEBUG_SATELLITE_SERVICE
// #define DEBUG_SATELLITE_TLE_EEPROM
// #define DEBUG_SATELLITE_ARRAY_ORDER
// #define DEBUG_SATELLITE_TRACKING_CALC_PROFILE
// #define DEBUG_SATELLITE_POPULATE_LIST_ARRAY
// #define DEBUG_SATELLITE_LIST_EXTRA_INFO

View File

@ -17,7 +17,7 @@
// #define FEATURE_EASYCOM_EMULATION // Easycom protocol emulation on control port (undefine FEATURE_YAESU_EMULATION above)
// #define FEATURE_DCU_1_EMULATION // DCU-1 protocol emulation on control port
#define FEATURE_MOON_TRACKING
// #define FEATURE_MOON_TRACKING
// #define FEATURE_SUN_TRACKING
#define FEATURE_CLOCK
#define FEATURE_GPS

View File

@ -354,12 +354,8 @@ You can tweak these, but read the online documentation!
#define DEFAULT_ALTITUDE_M 50
// Added in 2020.07.24.01
#define SATELLITE_UPDATE_POSITION_INTERVAL_MS 5000
#define SATELLITE_UPDATE_ARRAY_ORDER_INTERVAL_MS 5000
#define SATELLITE_TRACKING_UPDATE_INTERVAL 5000
#define SATELLITE_AOS_AZIMUTH_MIN 0.0
#define SATELLITE_AOS_AZIMUTH_MAX 360.0
#define SATELLITE_AOS_ELEVATION_MIN 0.0
#define SATELLITE_AOS_ELEVATION_MAX 180.0
// Added in 2020.07.25.01
#define LCD_SATELLITE_TRACKING_ROW 4
@ -378,4 +374,14 @@ You can tweak these, but read the online documentation!
// Added in 2020.08.24.01
#define NEXTION_NUMBER_OF_NEXT_SATELLITES 6
// Added / Updated in 2020.08.26.02
#define SATELLITE_CALC_THROTTLE_DOWN_TO_MEDIUM_RESOLUTION_MS 1000
#define SATELLITE_CALC_THROTTLE_DOWN_TO_LOW_RESOLUTION_MS 5000
#define SATELLITE_CALC_TIMEOUT_MS 10000
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_SECS 10
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_SECS 30
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_LOW_SECS 120
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_TRIGGER_SECS 300 //next event is < 5 minutes
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_TRIGGER_SECS 3600 //next < 1 hour
#define SATELLITE_AOS_ELEVATION_MIN 0.0

View File

@ -350,12 +350,8 @@ You can tweak these, but read the online documentation!
#define DEFAULT_ALTITUDE_M 50
// Added in 2020.07.24.01
#define SATELLITE_UPDATE_POSITION_INTERVAL_MS 5000
#define SATELLITE_UPDATE_ARRAY_ORDER_INTERVAL_MS 5000
#define SATELLITE_TRACKING_UPDATE_INTERVAL 5000
#define SATELLITE_AOS_AZIMUTH_MIN 0
#define SATELLITE_AOS_AZIMUTH_MAX 360
#define SATELLITE_AOS_ELEVATION_MIN 2
#define SATELLITE_AOS_ELEVATION_MAX 180
// Added in 2020.07.25.01
#define LCD_SATELLITE_TRACKING_ROW 4
@ -367,9 +363,20 @@ You can tweak these, but read the online documentation!
#define LCD_DISPLAY_SATELLITE_VISIBLE_TRACKED_CHAR "*"
#define LCD_DISPLAY_SATELLITE_NOT_VISIBLE_TRACKED_CHAR "."
#define LCD_DISPLAY_MOON_TRACKING_ACTIVE_CHAR "*"
#define LCD_DISPLAY_MON_TRACKING_INACTIVE_CHAR "-"
#define LCD_DISPLAY_MOON_TRACKING_INACTIVE_CHAR "-"
#define LCD_DISPLAY_SUN_TRACKING_ACTIVE_CHAR "*"
#define LCD_DISPLAY_SUN_TRACKING_INACTIVE_CHAR "-"
// Added in 2020.08.24.01
#define NEXTION_NUMBER_OF_NEXT_SATELLITES 6
// Added / Updated in 2020.08.26.02
#define SATELLITE_CALC_THROTTLE_DOWN_TO_MEDIUM_RESOLUTION_MS 1000
#define SATELLITE_CALC_THROTTLE_DOWN_TO_LOW_RESOLUTION_MS 5000
#define SATELLITE_CALC_TIMEOUT_MS 10000
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_SECS 10
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_SECS 30
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_LOW_SECS 120
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_TRIGGER_SECS 300 //next event is < 5 minutes
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_TRIGGER_SECS 3600 //next < 1 hour
#define SATELLITE_AOS_ELEVATION_MIN 0.0

View File

@ -347,12 +347,8 @@ You can tweak these, but read the online documentation!
#define DEFAULT_ALTITUDE_M 50
// Added in 2020.07.24.01
#define SATELLITE_UPDATE_POSITION_INTERVAL_MS 5000
#define SATELLITE_UPDATE_ARRAY_ORDER_INTERVAL_MS 5000
#define SATELLITE_TRACKING_UPDATE_INTERVAL 5000
#define SATELLITE_AOS_AZIMUTH_MIN 0.0
#define SATELLITE_AOS_AZIMUTH_MAX 360.0
#define SATELLITE_AOS_ELEVATION_MIN 0.0
#define SATELLITE_AOS_ELEVATION_MAX 180.0
// Added in 2020.07.25.01
#define LCD_SATELLITE_TRACKING_ROW 4
@ -371,3 +367,13 @@ You can tweak these, but read the online documentation!
// Added in 2020.08.24.01
#define NEXTION_NUMBER_OF_NEXT_SATELLITES 6
// Added / Updated in 2020.08.26.02
#define SATELLITE_CALC_THROTTLE_DOWN_TO_MEDIUM_RESOLUTION_MS 1000
#define SATELLITE_CALC_THROTTLE_DOWN_TO_LOW_RESOLUTION_MS 5000
#define SATELLITE_CALC_TIMEOUT_MS 10000
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_SECS 10
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_SECS 30
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_LOW_SECS 120
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_TRIGGER_SECS 300 //next event is < 5 minutes
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_TRIGGER_SECS 3600 //next < 1 hour
#define SATELLITE_AOS_ELEVATION_MIN 0.0

View File

@ -365,13 +365,8 @@ You can tweak these, but read the online documentation!
#define DEFAULT_ALTITUDE_M 500
// Added in 2020.07.24.01
#define SATELLITE_UPDATE_POSITION_INTERVAL_MS 5000
#define SATELLITE_UPDATE_ARRAY_ORDER_INTERVAL_MS 5000
#define SATELLITE_TRACKING_UPDATE_INTERVAL 5000
#define SATELLITE_AOS_AZIMUTH_MIN 0.0
#define SATELLITE_AOS_AZIMUTH_MAX 360.0
#define SATELLITE_AOS_ELEVATION_MIN 0.0
#define SATELLITE_AOS_ELEVATION_MAX 180.0
// Added in 2020.07.25.01
#define LCD_SATELLITE_TRACKING_ROW 4
@ -390,6 +385,16 @@ You can tweak these, but read the online documentation!
// Added in 2020.08.24.01
#define NEXTION_NUMBER_OF_NEXT_SATELLITES 6
// Added / Updated in 2020.08.26.02
#define SATELLITE_CALC_THROTTLE_DOWN_TO_MEDIUM_RESOLUTION_MS 1000
#define SATELLITE_CALC_THROTTLE_DOWN_TO_LOW_RESOLUTION_MS 5000
#define SATELLITE_CALC_TIMEOUT_MS 10000
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_SECS 10
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_SECS 30
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_LOW_SECS 120
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_TRIGGER_SECS 3600 //300 //next event is < 5 minutes
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_TRIGGER_SECS 10800 //3600 //next < 1 hour
#define SATELLITE_AOS_ELEVATION_MIN 0.0
// ######## ######## ###### ########
// ## ## ## ## ##

View File

@ -349,12 +349,8 @@ You can tweak these, but read the online documentation!
#define DEFAULT_ALTITUDE_M 50
// Added in 2020.07.24.01
#define SATELLITE_UPDATE_POSITION_INTERVAL_MS 5000
#define SATELLITE_UPDATE_ARRAY_ORDER_INTERVAL_MS 5000
#define SATELLITE_TRACKING_UPDATE_INTERVAL 5000
#define SATELLITE_AOS_AZIMUTH_MIN 0.0
#define SATELLITE_AOS_AZIMUTH_MAX 360.0
#define SATELLITE_AOS_ELEVATION_MIN 0.0
#define SATELLITE_AOS_ELEVATION_MAX 180.0
// Added in 2020.07.25.01
#define LCD_SATELLITE_TRACKING_ROW 4
@ -373,5 +369,15 @@ You can tweak these, but read the online documentation!
// Added in 2020.08.24.01
#define NEXTION_NUMBER_OF_NEXT_SATELLITES 6
// Added / Updated in 2020.08.26.02
#define SATELLITE_CALC_THROTTLE_DOWN_TO_MEDIUM_RESOLUTION_MS 1000
#define SATELLITE_CALC_THROTTLE_DOWN_TO_LOW_RESOLUTION_MS 5000
#define SATELLITE_CALC_TIMEOUT_MS 10000
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_SECS 10
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_SECS 30
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_LOW_SECS 120
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_HIGH_TRIGGER_SECS 300 //next event is < 5 minutes
#define SATELLITE_AOS_LOS_CALC_RESOLUTION_MEDIUM_TRIGGER_SECS 3600 //next < 1 hour
#define SATELLITE_AOS_ELEVATION_MIN 0.0