diff --git a/MW_OSD/Def.h b/MW_OSD/Def.h index 306146a2..d4667f9e 100644 --- a/MW_OSD/Def.h +++ b/MW_OSD/Def.h @@ -833,6 +833,10 @@ enum { #define DEBUG 4 // Display debug secreen at boot #endif +#ifdef PIOAUDIOVARIO // This is for travis build only + #define AUDIOVARIO A3 // Enable AUDIOVARIO on RSSI +#endif + #ifdef PWM_THROTTLE #define ALWAYSARMED // starts OSD in armed mode #endif diff --git a/MW_OSD/GPS.ino b/MW_OSD/GPS.ino index 6d0a1c9e..70593529 100644 --- a/MW_OSD/GPS.ino +++ b/MW_OSD/GPS.ino @@ -219,7 +219,7 @@ void GPS_NewData() { if (GPS_armedangleset == 1) { if ((GPS_distanceToHome < GPSOSDHOMEDISTANCE) && (GPS_speed < 75)) { - if ((GPS_home_timer + (GPSOSDLANDED*1000) > millis()) { + if ((GPS_home_timer + (GPSOSDLANDED*1000)) > millis()) { } else if ((GPS_home_timer + (GPSOSDSUMMARY*1000)) > millis()) { configPage = 0; diff --git a/MW_OSD/MW_OSD.ino b/MW_OSD/MW_OSD.ino index b66d1865..b9e9a449 100644 --- a/MW_OSD/MW_OSD.ino +++ b/MW_OSD/MW_OSD.ino @@ -79,8 +79,8 @@ uint16_t UntouchedStack(void) #define PGMSTR(p) (char *)pgm_read_word(p) //------------------------------------------------------------------------ -#define MWVERS "MW-OSD - R1.7.2.2" -#define MWOSDVERSION 1722 // 1660=1.6.6.0 for GUI +#define MWVERS "MW-OSD - R1.7.3.0" +#define MWOSDVERSION 1730 // 1660=1.6.6.0 for GUI #define EEPROMVER 13 // for eeprom layout verification #include #undef PROGMEM diff --git a/platformio.ini b/platformio.ini index 46ab080e..bc870207 100644 --- a/platformio.ini +++ b/platformio.ini @@ -162,6 +162,12 @@ framework = arduino board = pro16MHzatmega328 src_build_flags = -DMINIMOSD -DGPSOSD_MTK +[env:minim.gpsosdvario.ublox] +platform = atmelavr +framework = arduino +board = pro16MHzatmega328 +src_build_flags = -DMINIMOSD -DGPSOSD_UBLOX -DPIOAUDIOVARIO + # MINIM BOARDS SPECIALS ######################################################## [env:minim.standalone] platform = atmelavr @@ -278,6 +284,12 @@ framework = arduino board = pro16MHzatmega328 src_build_flags = -DAEROMAX -DGPSOSD_MTK +[env:aeromax.gpsosdvario.ublox] +platform = atmelavr +framework = arduino +board = pro16MHzatmega328 +src_build_flags = -DAEROMAX -DGPSOSD_UBLOX -DPIOAUDIOVARIO + # AEROMAX BOARDS SPECIALS ###################################################### [env:aeromax.standalone] platform = atmelavr