ua1zbe
/
rdz_ttgo_sonde_dl9rdz
mirror of https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SondeMap on index.html, typo in DFM.cpp altitude fixed. Fix startSpectrum in RX_FSK when joining WLAN.

This commit is contained in:
DL2MF 2019-04-27 00:10:11 +02:00
parent 25b438db84
commit e2161c57d1
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
RX_FSK/data/index.html
View File

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>AutoRX Sonde Server</title> <title>RDZSonde Server</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="data:,"> <link rel="icon" href="data:,">
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
</head> </head>
<body> <body>
<h2>AutoRX Sonde Server</h2> <h2>RDZSonde Server</h2>
<!-- <!--
<p>GPIO state: <strong> %STATE%</strong></p> <p>GPIO state: <strong> %STATE%</strong></p>
<p><a href="/on"><button class="button">ON</button></a></p> <p><a href="/on"><button class="button">ON</button></a></p>
@ -18,7 +18,7 @@
<button class="tablinks" onclick="selTab(event,'QRG')" id="defaultTab">QRG</button> <button class="tablinks" onclick="selTab(event,'QRG')" id="defaultTab">QRG</button>
<button class="tablinks" onclick="selTab(event,'WLAN')">WLAN</button> <button class="tablinks" onclick="selTab(event,'WLAN')">WLAN</button>
<button class="tablinks" onclick="selTab(event,'Data')">Data</button> <button class="tablinks" onclick="selTab(event,'Data')">Data</button>
<button class="tablinks" onclick="selTab(event,'WebWX')">Webwx</button> <button class="tablinks" onclick="selTab(event,'SondeMap')">SondeMap</button>
<button class="tablinks" onclick="selTab(event,'Config')">Config</button> <button class="tablinks" onclick="selTab(event,'Config')">Config</button>
<button class="tablinks" onclick="selTab(event,'About')">About</button> <button class="tablinks" onclick="selTab(event,'About')">About</button>
</div> </div>
@ -38,9 +38,8 @@
<iframe src="status.html" style="border:none;" width="100%%" height="100%%"></iframe> <iframe src="status.html" style="border:none;" width="100%%" height="100%%"></iframe>
</div> </div>
<div id="Data" class="tabcontent"> <div id="SondeMap" class="tabcontent">
<h3>wetterson.de</h3> <iframe src="https://wx.dl2mf.de/#?" style="border:none;" width="98%%" height="98%%"></iframe>
<iframe src="https://wetterson.de/karte/" style="border:none;" width="100%%" height="100%%"></iframe>
</div> </div>
<div id="Config" class="tabcontent"> <div id="Config" class="tabcontent">
@ -50,12 +49,17 @@
<div id="About" class="tabcontent"> <div id="About" class="tabcontent">
<h3>About</h3> <h3>About</h3>
RDZSonde - OpenSource<br> RDZSonde<br>
Copyright &copy; 2019<br> Copyright &copy; 2019 by Hansi Reiser, DL9RDZ<br>
by Hans P. Reiser, DL9RDZ<br> (master-version v0.4)<br>
-------------------------------<br> with mods by <a href="https://www.dl2mf.de/" target="_blank">Meinhard Guenther, DL2MF</a><br>
Version 0.1e - devel<br> <br>
Mods by Meinhard Guenther, DL2MF<br> This program is free software; you can redistribute it and/or<br>
modify it under the terms of the GNU General Public License as<br>
published by the Free Software Foundation; either version 2 of<br>
the License, or (at your option) any later version.<br>
see <a href="https://www.gnu.org/licenses/gpl-2.0.txt">https://www.gnu.org/licenses/gpl-2.0.txt</a>
for details
</div> </div>
<script> <script>

8
libraries/SondeLib/DFM.cpp
View File

@ -228,12 +228,12 @@ int DFM::decodeDAT(uint8_t *dat)
break; break;
case 4: case 4:
{ {
float lat, vv; float alt, vv;
lat = ((uint32_t)dat[0]<<24) + ((uint32_t)dat[1]<<16) + ((uint32_t)dat[2]<<8) + dat[3]; alt = ((uint32_t)dat[0]<<24) + ((uint32_t)dat[1]<<16) + ((uint32_t)dat[2]<<8) + dat[3];
vv = (int16_t)( (dat[4]<<8) | dat[5] ); vv = (int16_t)( (dat[4]<<8) | dat[5] );
Serial.print("GPS-height: "); Serial.print(lat*0.01); Serial.print("GPS-height: "); Serial.print(alt*0.01);
Serial.print(", vv: "); Serial.print(vv*0.01); Serial.print(", vv: "); Serial.print(vv*0.01);
sonde.si()->lat = lat*0.01; sonde.si()->alt = alt*0.01;
sonde.si()->vs = vv*0.01; sonde.si()->vs = vv*0.01;
sonde.si()->validPos |= 0x0C; sonde.si()->validPos |= 0x0C;
} }