ua1zbe
/
TTGO-T-Beam-LoRa-APRS
mirror of https://github.com/SQ9MDD/TTGO-T-Beam-LoRa-APRS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get self telemetry path working.

This commit is contained in:
Matt 2021-09-19 15:50:35 -05:00
parent 58cef88e9d
commit 60ed3c0a02
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -9,8 +9,9 @@ After connection with APRX based DIGI it can be used as KISS-TNC
## Contributors ## Contributors
* Initial work: OE1ACM, OE3CJB * Initial work: OE1ACM, OE3CJB
* Redesigned: SQ9MDD * Redesigned: SQ9MDD
* KISS TNC Over Seriall or Bluetooth: SQ5RWU * KISS TNC Over Serial or Bluetooth: SQ5RWU
* Lora32 board support DJ1AN * Lora32 board support: DJ1AN
* Self-telemetry improvement: KB1GIM
## Supported boards ## Supported boards
* TTGO T-beam v.0.7 * TTGO T-beam v.0.7

11
src/TTGO_T-Beam_LoRa_APRS.ino
View File

@ -552,13 +552,20 @@ String prepareCallsign(const String& callsign){
sprintf_P(tel_sequence_char, "%03u", tel_sequence); sprintf_P(tel_sequence_char, "%03u", tel_sequence);
tel_sequence_str = String(tel_sequence_char); tel_sequence_str = String(tel_sequence_char);
} }
// Format telemetry path
String tel_path_str;
if(tel_path == ""){
tel_path_str = tel_path;
}else{
tel_path_str = "," + tel_path;
}
String telemetryParamsNames = String(":") + Tcall_message + ":PARM.B Volt,B In,B Out,AC V,AC C"; String telemetryParamsNames = String(":") + Tcall_message + ":PARM.B Volt,B In,B Out,AC V,AC C";
String telemetryUnitNames = String(":") + Tcall_message + ":UNIT.mV,mA,mA,mV,mA"; String telemetryUnitNames = String(":") + Tcall_message + ":UNIT.mV,mA,mA,mV,mA";
String telemetryEquations = String(":") + Tcall_message + ":EQNS.0,5.1,3000,0,10,0,0,10,0,0,28,3000,0,10,0"; String telemetryEquations = String(":") + Tcall_message + ":EQNS.0,5.1,3000,0,10,0,0,10,0,0,28,3000,0,10,0";
String telemetryData = String("T#") + tel_sequence_str + "," + String(b_volt) + "," + String(b_in_c) + "," + String(b_out_c) + "," + String(ac_volt) + "," + String(ac_c) + ",00000000"; String telemetryData = String("T#") + tel_sequence_str + "," + String(b_volt) + "," + String(b_in_c) + "," + String(b_out_c) + "," + String(ac_volt) + "," + String(ac_c) + ",00000000";
String telemetryBase = ""; String telemetryBase = "";
telemetryBase += Tcall + ">APLO01," + tel_path + ":"; telemetryBase += Tcall + ">APLO01" + tel_path_str + ":";
Serial.print(telemetryBase); Serial.print(telemetryBase);
sendToTNC(telemetryBase + telemetryParamsNames); sendToTNC(telemetryBase + telemetryParamsNames);
sendToTNC(telemetryBase + telemetryUnitNames); sendToTNC(telemetryBase + telemetryUnitNames);

2
src/taskWebServer.cpp
View File

@ -214,7 +214,7 @@ void handle_Cfg() {
jsonData += jsonLineFromPreferenceBool(PREF_ENABLE_TNC_SELF_TELEMETRY); jsonData += jsonLineFromPreferenceBool(PREF_ENABLE_TNC_SELF_TELEMETRY);
jsonData += jsonLineFromPreferenceInt(PREF_TNC_SELF_TELEMETRY_INTERVAL); jsonData += jsonLineFromPreferenceInt(PREF_TNC_SELF_TELEMETRY_INTERVAL);
jsonData += jsonLineFromPreferenceInt(PREF_TNC_SELF_TELEMETRY_MIC); jsonData += jsonLineFromPreferenceInt(PREF_TNC_SELF_TELEMETRY_MIC);
jsonData += jsonLineFromPreferenceInt(PREF_TNC_SELF_TELEMETRY_PATH); jsonData += jsonLineFromPreferenceString(PREF_TNC_SELF_TELEMETRY_PATH);
jsonData += jsonLineFromPreferenceBool(PREF_DEV_OL_EN); jsonData += jsonLineFromPreferenceBool(PREF_DEV_OL_EN);
jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_CMT); jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_CMT);
jsonData += jsonLineFromPreferenceBool(PREF_DEV_BT_EN); jsonData += jsonLineFromPreferenceBool(PREF_DEV_BT_EN);