Merge pull request #11 from nightflyer88/beta

V2.3.3
nightflyer88 · May 5, 2019 · e2ddd67 · e2ddd67
2 parents b75548c + 6b78726
commit e2ddd67
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/...irmware/v232_VarioGPS_Sensor_3V3_8mhz.hex → ...irmware/v233_VarioGPS_Sensor_3V3_8mhz.hex b/...irmware/v232_VarioGPS_Sensor_3V3_8mhz.hex → ...irmware/v233_VarioGPS_Sensor_3V3_8mhz.hex
@@ -51,7 +51,7 @@
 :100320000020324400203344002044697361626C31
 :100330006564002042617369630000000020457815
 :1003400074656E6465640056657273696F6E2056DD
-:10035000322E332E32000000566172696F475053BF
+:10035000322E332E33000000566172696F475053BE
 :100360002053656E736F7200005265736574206F61
 :1003700066667365740000000000475053206D6F7F
 :1003800064653A00000000000000004750532064FC
@@ -1236,7 +1236,7 @@
 :104D3000A02FAB01BC0183E00E9422151092190341
 :104D400060911E0370911F038091200390912103B5
 :104D50000E94DE2F20E030E048EC52E40E942E2F2B
-:104D60000E94A02FAB01BC0189E00E942215809116
+:104D60000E94A02FAB01BC018AE00E942215809115
 :104D7000C8019091C901883B0BE090070CF0A1C3DA
 :104D800001969093C9018093C8010E94D4156B01CC
 :104D90007C016093C4017093C5018093C601909318
@@ -1391,7 +1391,7 @@
 :1056E000242F87FF0AC02BED3FE049EC50E4C701AF
 :1056F000B6010E94462E6B017C0121EE3EE245E69A
 :1057000052E4C701B6010E94D3310E94A02FAB0121
-:10571000BC018AE00E942215A090B801B090B901A6
+:10571000BC0189E00E942215A090B801B090B901A7
 :10572000C090BA01D090BB01E090BC01F090BD01E7
 :105730000091BE011091BF01EBA6FCA60DA71EA70C
 :105740000E94A5152B013C010E94D415EBA4FCA4DA

diff --git a/.../v232_VarioGPS_Sensor_3V3_8mhz_EX-Bus.hex → .../v233_VarioGPS_Sensor_3V3_8mhz_EX-Bus.hex b/.../v232_VarioGPS_Sensor_3V3_8mhz_EX-Bus.hex → .../v233_VarioGPS_Sensor_3V3_8mhz_EX-Bus.hex
@@ -37,7 +37,7 @@
 :100240006E6F776E0020424D5032383000002042F1
 :100250004D453238300000204D53353631310000E5
 :10026000204C5053000000000056657273696F6E99
-:100270002056322E332E32000000566172696F47CD
+:100270002056322E332E33000000566172696F47CC
 :1002800050532053656E736F72000052657365742E
 :10029000206F66667365740000000000507265731D
 :1002A000737572652073656E736F723A0056617272

diff --git a/...irmware/v232_VarioGPS_Sensor_5V_16mhz.hex → ...irmware/v233_VarioGPS_Sensor_5V_16mhz.hex b/...irmware/v232_VarioGPS_Sensor_5V_16mhz.hex → ...irmware/v233_VarioGPS_Sensor_5V_16mhz.hex
@@ -54,7 +54,7 @@
 :100350000020324400203344002044697361626C01
 :1003600065640020426173696300000000204578E5
 :1003700074656E6465640056657273696F6E2056AD
-:10038000322E332E32000000566172696F4750538F
+:10038000322E332E33000000566172696F4750538E
 :100390002053656E736F7200005265736574206F31
 :1003A00066667365740000000000475053206D6F4F
 :1003B00064653A00000000000000004750532064CC
@@ -1238,7 +1238,7 @@
 :104D50000E9447151092FA036091FF0370910004BE
 :104D600080910104909102040E94EA2F20E030E03B
 :104D700048EC52E40E943A2F0E94AC2FAB01BC01D8
-:104D800089E00E9447158091CB019091CC01883B2E
+:104D80008AE00E9447158091CB019091CC01883B2D
 :104D90000BE090070CF0A1C301969093CC01809397
 :104DA000CB010E94F9156B017C016093C7017093E0
 :104DB000C8018093C9019093CA010E94CA156093EB
@@ -1392,7 +1392,7 @@
 :1056F00020E030E0A9010E94302F87FF0AC02BED87
 :105700003FE049EC50E4C701B6010E94522E6B0104
 :105710007C0121EE3EE245E652E4C701B6010E945B
-:10572000DF310E94AC2FAB01BC018AE00E9447151B
+:10572000DF310E94AC2FAB01BC0189E00E9447151C
 :10573000A090BB01B090BC01C090BD01D090BE0153
 :10574000E090BF01F090C0010091C1011091C20131
 :10575000EBA6FCA60DA71EA70E94CA152B013C01B3

diff --git a/.../v232_VarioGPS_Sensor_5V_16mhz_EX-Bus.hex → .../v233_VarioGPS_Sensor_5V_16mhz_EX-Bus.hex b/.../v232_VarioGPS_Sensor_5V_16mhz_EX-Bus.hex → .../v233_VarioGPS_Sensor_5V_16mhz_EX-Bus.hex
@@ -40,7 +40,7 @@
 :100270006E6F776E0020424D5032383000002042C1
 :100280004D453238300000204D53353631310000B5
 :10029000204C5053000000000056657273696F6E69
-:1002A0002056322E332E32000000566172696F479D
+:1002A0002056322E332E33000000566172696F479C
 :1002B00050532053656E736F7200005265736574FE
 :1002C000206F6666736574000000000050726573ED
 :1002D000737572652073656E736F723A0056617242

diff --git a/Arduino/VarioGPS_Sensor/VarioGPS_Sensor.ino b/Arduino/VarioGPS_Sensor/VarioGPS_Sensor.ino
@@ -6,11 +6,12 @@
   Vario, GPS, Strom/Spannung, Empfängerspannungen, Temperaturmessung
 
 */
-#define VARIOGPS_VERSION "Version V2.3.2"
+#define VARIOGPS_VERSION "Version V2.3.3"
 /*
 
   ******************************************************************
   Versionen:
+  V2.3.3  27.04.19  Fehler behoben: Azimuth und Course war vertauscht
   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 
@@ -736,8 +737,8 @@ void loop()
         jetiEx.SetSensorValue( ID_GPSSPEED, gps.speed.kmph() );
       #endif
 
-      // Azimuth
-      jetiEx.SetSensorValue( ID_AZIMUTH, gps.course.deg() );
+      // Course
+      jetiEx.SetSensorValue( ID_COURSE, gps.course.deg() );
 
       // set home position
       if (homeSetCount < 3000) {  
@@ -769,8 +770,8 @@ void loop()
           distToHome = sqrt(pow(uRelAltitude/10,2) + pow(distToHome,2));
         }
 
-        // Course from home to model
-        jetiEx.SetSensorValue( ID_COURSE, gps.courseTo(home_lat,home_lon,gps.location.lat(),gps.location.lng()));
+        // Azimuth (course from home to model)
+        jetiEx.SetSensorValue( ID_AZIMUTH, gps.courseTo(home_lat,home_lon,gps.location.lat(),gps.location.lng()));
 
         // Trip distance
         float distLast = gps.distanceBetween(