Set Freq now working

pull/1/head
US1GHQ 2021-07-23 13:33:07 +03:00
parent c19229130f
commit b46d4e5801
3 changed files with 16 additions and 11 deletions

View File

@ -43,7 +43,7 @@ build_flags =
-D 'SHOW_BATT'
-D 'SHOW_RX_PACKET'
-D 'SHOW_RX_TIME=10000'
-D 'TXFREQ=433.775'
-D 'TXFREQ="433.775"'
; -D 'SPEED_1200' ; comment out to set 300baud
-D 'TXdbmW=20'
-D 'ENABLE_OLED'

View File

@ -113,7 +113,9 @@ String relay_path;
String aprsComment = MY_COMMENT;
String aprsLatPreset = LATIDUDE_PRESET;
String aprsLonPreset = LONGITUDE_PRESET;
float aprsFreq;
//temporary hack for setfreq
String aprsFreq = TXFREQ;
String aprsMode = "1200";
boolean gps_state = true;
@ -356,7 +358,7 @@ void sendpacket(){
* @param aprsFreq
* @param message
*/
void loraSend(byte lora_LTXPower, float aprsFreq, const String &message) {
void loraSend(byte lora_LTXPower, String aprsFreq, const String &message) {
#ifdef TX_RX_LNA
digitalWrite(TXPIN, HIGH);
digitalWrite(RXPIN, LOW);
@ -374,7 +376,8 @@ void loraSend(byte lora_LTXPower, float aprsFreq, const String &message) {
#else
rf95.setModemConfig(BG_RF95::Bw125Cr45Sf4096);
#endif
rf95.setFrequency(aprsFreq);
float aprsFreq2 = aprsFreq.toFloat();
rf95.setFrequency(aprsFreq2);
rf95.setTxPower(lora_LTXPower);
rf95.sendAPRS(lora_TXBUFF, messageSize);
rf95.waitPacketSent();
@ -661,9 +664,9 @@ void setup(){
//Set parameters (freq,mode,txpower)
if (!preferences.getBool(PREF_APRS_FREQ_INIT)){
preferences.putBool(PREF_APRS_FREQ_INIT, true);
preferences.putFloat(PREF_APRS_FREQ, aprsFreq);
preferences.putString(PREF_APRS_FREQ, aprsFreq);
}
aprsFreq = preferences.getFloat(PREF_APRS_FREQ);
aprsFreq = preferences.getString(PREF_APRS_FREQ);
if (!preferences.getBool(PREF_APRS_MODE_INIT)){
preferences.putBool(PREF_APRS_MODE_INIT, true);
@ -825,7 +828,8 @@ void setup(){
#else
rf95.setModemConfig(BG_RF95::Bw125Cr45Sf4096);
#endif
rf95.setFrequency(aprsFreq);
float aprsFreq2 = aprsFreq.toFloat();
rf95.setFrequency(aprsFreq2);
rf95.setTxPower(txPower);
delay(250);
#ifdef KISS_PROTOCOL
@ -951,6 +955,7 @@ void loop() {
writedisplaytext("((KISSTX))","","","","","");
time_to_refresh = millis() + showRXTime;
loraSend(txPower, aprsFreq, *TNC2DataFrame);
Serial.print(aprsFreq);
delete TNC2DataFrame;
}
}

View File

@ -149,9 +149,9 @@ void handle_Cfg() {
jsonData += jsonLineFromPreferenceBool(PREF_APRS_FIXED_BEACON_PRESET);
jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_ALTITUDE);
jsonData += jsonLineFromPreferenceBool(PREF_APRS_GPS_EN);
jsonData += jsonLineFromPreferenceFloat(PREF_APRS_FREQ);
jsonData += jsonLineFromPreferenceString(PREF_APRS_FREQ);
jsonData += jsonLineFromPreferenceString(PREF_APRS_MODE);
jsonData += jsonLineFromPreferenceString(PREF_APRS_TXPOWER);
jsonData += jsonLineFromPreferenceInt(PREF_APRS_TXPOWER);
jsonData += jsonLineFromPreferenceBool(PREF_DEV_OL_EN);
jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_CMT);
jsonData += jsonLineFromPreferenceBool(PREF_DEV_BT_EN);
@ -243,13 +243,13 @@ void handle_saveDeviceCfg(){
preferences.putInt(PREF_DEV_AUTO_SHUT_PRESET, server.arg(PREF_DEV_AUTO_SHUT_PRESET).toInt());
}
if (server.hasArg(PREF_APRS_FREQ)){
preferences.putFloat(PREF_APRS_FREQ, server.arg(PREF_APRS_FREQ).toFloat());
preferences.putString(PREF_APRS_FREQ, server.arg(PREF_APRS_FREQ));
}
if (server.hasArg(PREF_APRS_MODE)){
preferences.putString(PREF_APRS_MODE, server.arg(PREF_APRS_MODE));
}
if (server.hasArg(PREF_APRS_TXPOWER)){
preferences.putString(PREF_APRS_TXPOWER, server.arg(PREF_APRS_TXPOWER));
preferences.putInt(PREF_APRS_TXPOWER, server.arg(PREF_APRS_TXPOWER).toInt());
}
server.sendHeader("Location", "/");
server.send(302,"text/html", "");