Skip to content

Commit

Permalink
Merge pull request #10 from nightflyer88/beta
Browse files Browse the repository at this point in the history
V2.3.2
  • Loading branch information
nightflyer88 committed Mar 16, 2019
2 parents 5dd4485 + 4b8fb92 commit b75548c
Show file tree
Hide file tree
Showing 14 changed files with 6,567 additions and 6,613 deletions.
1,874 changes: 0 additions & 1,874 deletions Arduino/Firmware/v231_VarioGPS_Sensor_3V3_8mhz.hex

This file was deleted.

1,378 changes: 0 additions & 1,378 deletions Arduino/Firmware/v231_VarioGPS_Sensor_3V3_8mhz_EX-Bus.hex

This file was deleted.

1,911 changes: 0 additions & 1,911 deletions Arduino/Firmware/v231_VarioGPS_Sensor_5V_16mhz.hex

This file was deleted.

1,442 changes: 0 additions & 1,442 deletions Arduino/Firmware/v231_VarioGPS_Sensor_5V_16mhz_EX-Bus.hex

This file was deleted.

1,865 changes: 1,865 additions & 0 deletions Arduino/Firmware/v232_VarioGPS_Sensor_3V3_8mhz.hex

Large diffs are not rendered by default.

1,413 changes: 1,413 additions & 0 deletions Arduino/Firmware/v232_VarioGPS_Sensor_3V3_8mhz_EX-Bus.hex

Large diffs are not rendered by default.

1,868 changes: 1,868 additions & 0 deletions Arduino/Firmware/v232_VarioGPS_Sensor_5V_16mhz.hex

Large diffs are not rendered by default.

1,415 changes: 1,415 additions & 0 deletions Arduino/Firmware/v232_VarioGPS_Sensor_5V_16mhz_EX-Bus.hex

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions Arduino/VarioGPS_Sensor/VarioGPS_Sensor.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
Vario, GPS, Strom/Spannung, Empfängerspannungen, Temperaturmessung
*/
#define VARIOGPS_VERSION "Version V2.3.1"
#define VARIOGPS_VERSION "Version V2.3.2"
/*
******************************************************************
Versionen:
V2.3.1 22.08.19 Fehler bei Temepraturwert behoben (Dezimalstelle wurde nicht angezeigt)
V2.3.2 07.03.19 Fehler bei AirSpeed Sensor behoben, Geschwindigkeit wurde nur in 3-4Kmh Schritten angezeigt
V2.3.1 22.08.18 Fehler bei Temepraturwert behoben (Dezimalstelle wurde nicht angezeigt)
V2.3 09.07.18 MPXV7002/MPXV5004 für Air-Speed wird unterstützt
TEK (Total Energie Kompensation) mit Air-Speed oder GPS-Speed (basierend auf Code von Rainer Stransky)
EX-Bus mit 125kbaud, Lib (v0.95) von Bernd Wokoeck
Expand Down Expand Up @@ -109,8 +110,7 @@

// Check airspeed-sensor supply voltage
#if defined(SUPPORT_MPXV7002_MPXV5004) && V_REF < 4750
#undef SUPPORT_MPXV7002_MPXV5004
#warning Supply voltage is lower than 4750mV, Airspeed sensor (MPXV7002 / MPXV5004) is disabled
#warning Supply voltage is below 4750 mV, the airspeed sensor (MPXV7002 / MPXV5004) may not work properly
#endif

// Check the compatibility of EX-Bus and GPS sensor
Expand Down Expand Up @@ -204,7 +204,6 @@ const float factorVoltageDivider[] = { float(voltageInputR1[0]+voltageInputR2[0]

// pressure sensor variables
long startAltitude = 0;
//bool setStartAltitude = false;
long uRelAltitude = 0;
long uAbsAltitude = 0;
long uPressure = PRESSURE_SEALEVEL;
Expand All @@ -214,8 +213,8 @@ long lastAltitude = 0;

// airspeed variables
int refAirspeedPressure;
int uAirSpeed = 0;
int lastAirSpeed = 0;
float uAirSpeed = 0;
float lastAirSpeed = 0;

// TEC variables
unsigned long dT = 0;
Expand Down
1 change: 0 additions & 1 deletion Arduino/VarioGPS_Sensor/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@
#define SUPPORT_EXT_TEMP // NTC temperature sensor

#define SUPPORT_JETIBOX_MENU // JetiBox menu

Empty file modified Doc/img/EX_gps.bmp
100755 → 100644
Empty file.
Empty file modified Doc/img/EX_gps2.bmp
100755 → 100644
Empty file.
Empty file modified Doc/img/EX_vario.bmp
100755 → 100644
Empty file.
Empty file modified Doc/img/EX_volt_amp.bmp
100755 → 100644
Empty file.

0 comments on commit b75548c

Please sign in to comment.