Merge pull request #70 from athertop/s-c-l-v-rc-opentx2.1

Scaling and label fixes
Clooney82 · Dec 8, 2016 · 6760031 · 6760031
2 parents b317bb8 + 08cf0d9
commit 6760031
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Lua_Telemetry/DisplayApmPosition/SCRIPTS/TELEMETRY/telempc.lua b/Lua_Telemetry/DisplayApmPosition/SCRIPTS/TELEMETRY/telempc.lua
@@ -204,7 +204,7 @@
 
 -- GPS Panel
 	local function gpspanel()
-		telem_t1 = getValue("T1") -- Temp1
+		telem_t1 = getValue("Tmp1") -- Temp1
 		telem_lock = 0
 		telem_sats = 0
 		telem_lock = telem_t1%10
@@ -384,7 +384,7 @@
 
 --APM Armed and errors
 	local function armed_status()
-		t2 = getValue("T2")
+		t2 = getValue("Tmp2")
 		apmarmed = t2%0x02
 		gpsLatLon = getValue("GPS")
 		if (type(gpsLatLon) == "table") then
@@ -459,7 +459,6 @@
 		end
 		if FmodeNr~=last_flight_mode then
 			playFile("/SOUNDS/en/TELEM/AVFM"..(FmodeNr-1)..WavSfx..".wav")
-			playNumber(gAPType,0,0)
 			last_flight_mode=FmodeNr
 		end
 	end

diff --git a/MavLink_FrSkySPort/FrSkySPortTelemetry.ino b/MavLink_FrSkySPort/FrSkySPortTelemetry.ino
@@ -415,10 +415,10 @@ void FrSkySportTelemetry_FLVSS() {
  */
 void FrSkySportTelemetry_GPS() {
     gps.setData(ap_latitude / 1E7, ap_longitude / 1E7,    // Latitude and longitude in degrees decimal (positive for N/E, negative for S/W)
-        ap_gps_altitude / 10.0,                     // Altitude (AMSL, NOT WGS84), in meters * 1000 (positive for up). Note that virtually all GPS modules provide the AMSL altitude in addition to the WGS84 altitude.
-        ap_groundspeed,
-        ap_heading,                                // Heading, in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
-        ap_gps_hdop);                               // GPS HDOP horizontal dilution of position in cm (m*100)
+        ap_gps_altitude / 10.0,                           // Altitude (AMSL, NOT WGS84), in meters * 1000 (positive for up). Note that virtually all GPS modules provide the AMSL altitude in addition to the WGS84 altitude.
+        ap_groundspeed / 1.944,                           // Counteract Sport library which converts to kts (allows us to use default GPS settings on Taranis)
+        ap_heading,                                       // Heading, in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
+        ap_gps_hdop);                                     // GPS HDOP horizontal dilution of position in cm (m*100)
 
     #ifdef DEBUG_FrSkySportTelemetry_GPS
       if (millis() > GPS_debug_time) {