Merge remote-tracking branch 'upstream/master'

This commit is contained in:
K7MDL2 2020-08-21 12:22:45 -07:00
commit 0674f2b01e
8 changed files with 587 additions and 489 deletions

File diff suppressed because it is too large Load Diff

View File

@ -263,9 +263,11 @@
#define ACTIVATE_SUN_TRACKING 5
#define ACTIVATE_SATELLITE_TRACKING 6
#define UPDATE_CURRENT_SAT_AOS_AND_LOS_GLOBAL_VARS 0
#define AOS_LOS_MULTILINE_REPORT 1
#define AOS_LOS_TABULAR_REPORT 2
#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_SAT_ARRAY_SLOT_AZ_EL_NEXT_AOS_LOS 4
#define DO_NOT_INCLUDE_RESPONSE_CODE 0
#define INCLUDE_RESPONSE_CODE 1
@ -296,11 +298,15 @@
#define NOT_VERBOSE 0
#define _VERBOSE_ 1
#define CURRENT_SATELLITE 0
#define CALC_SATELLITE 1
#define SERVICE_IDLE 0
#define SERVICE_CALC_IN_PROGRESS 1
#define VT100_CODE_CHAR_ATTR_OFF "[0m"
#define VT100_CODE_BLINK "[5m"
#define VT100_CLEAR_SCREEN "[2J"
#define VT100_CURSOR_UPPER_LEFT_CORNER "[f"
#define VT100_BOLD "[1m"
/* ------end of macros ------- */

View File

@ -67,6 +67,7 @@
// #define DEBUG_NEXTION_DISPLAY_INIT // set DEFAULT_DEBUG_STATE to 1 above
// #define DEBUG_TEST_POLAR_TO_CARTESIAN
// #define DEBUG_SATELLITE_TRACKING
// #define DEBUG_SATELLITE_TRACKING_LOAD
// #define DEBUG_SATELLITE_TRACKING_CALC
// #define DEBUG_SATELLITE_TLE_EEPROM

View File

@ -23,7 +23,6 @@
// #define FEATURE_TEST_DISPLAY_AT_STARTUP
// #define FEATURE_SATELLITE_TRACKING // https://github.com/k3ng/k3ng_rotator_controller/wiki/707-Satellite-Tracking
// #define FEATURE_SATELLITE_TRACKING_MULTI_SAT_AOS_LOS
#define LANGUAGE_ENGLISH // all languages customized in rotator_language.h
// #define LANGUAGE_SPANISH

View File

@ -23,8 +23,6 @@
//#define FEATURE_TEST_DISPLAY_AT_STARTUP
//#define FEATURE_SATELLITE_TRACKING // https://github.com/k3ng/k3ng_rotator_controller/wiki/707-Satellite-Tracking
//#define FEATURE_SATELLITE_TRACKING_MULTI_SAT_AOS_LOS
#define LANGUAGE_ENGLISH // all languages customized in rotator_language.h
//#define LANGUAGE_SPANISH

View File

@ -29,7 +29,6 @@
// #define FEATURE_TEST_DISPLAY_AT_STARTUP
#define FEATURE_SATELLITE_TRACKING // https://github.com/k3ng/k3ng_rotator_controller/wiki/707-Satellite-Tracking
#define FEATURE_SATELLITE_TRACKING_MULTI_SAT_AOS_LOS
#define LANGUAGE_ENGLISH // all languages customized in rotator_language.h
// #define LANGUAGE_SPANISH
@ -186,6 +185,7 @@
#define OPTION_STEPPER_MOTOR_USE_TIMER_ONE_INSTEAD_OF_FIVE
// #define OPTION_ALLOW_ROTATIONAL_AND_CONFIGURATION_CMDS_AT_BOOT_UP // if disabled, rotational and configuration commands will be ignored on the serial port for the first 10 second after boot up
#define OPTION_CLI_VT100
// ######## ######## ###### ########
// ## ## ## ## ##

View File

@ -22,7 +22,6 @@
//#define FEATURE_TEST_DISPLAY_AT_STARTUP
//#define FEATURE_SATELLITE_TRACKING // https://github.com/k3ng/k3ng_rotator_controller/wiki/707-Satellite-Tracking
//#define FEATURE_SATELLITE_TRACKING_MULTI_SAT_AOS_LOS
#define LANGUAGE_ENGLISH // all languages customized in rotator_language.h
//#define LANGUAGE_SPANISH

View File

@ -35,17 +35,6 @@
#define ESE_STRING "ESE"
#define ENE_STRING "ENE"
#define NNE_STRING "NNE"
// #define TOUCH_DISPLAY_TITLE "K3NG Rotator Controller"
// #define TOUCH_DISPLAY_STOP_STRING "Stop"
// #define TOUCH_DISPLAY_OVERLAP_STRING "overlap"
// #define TOUCH_DISPLAY_DATA_ENTRY_CANCEL "cancel"
// #define TOUCH_DISPLAY_DATA_ENTRY_ENTER "enter"
// #define TOUCH_DISPLAY_DATA_ENTRY_SEPERATOR "."
// #define TOUCH_DISPLAY_DATA_ENTRY_DELETE "del"
// #define TOUCH_DISPLAY_PARKED_STRING "parked"
// #define TOUCH_DISPLAY_PARKING_STRING "Parking"
// #define TOUCH_DISPLAY_ENTER_AZ "Enter Azimuth"
// #define TOUCH_DISPLAY_ENTER_EL "Enter Elevation"
#define NEXTION_GPS_STRING "Sats"
#define NEXTION_PARKING_STRING "PARKING"
#define NEXTION_PARKED_STRING "PARKED"