Add narrow band (31.25KHz) for 1200 and 300 modes

lora-esp32-dev
US1GHQ 2021-10-29 23:26:35 +03:00
parent 67e023d4a3
commit 184967190a
6 changed files with 23 additions and 4 deletions

View File

@ -60,6 +60,8 @@
<div>
<label for="lora_speed">Speed</label>
<select id="lora_speed" name="lora_speed">
<option value="439">BW 31.25khz CR 4:5 SF 9 (300bps)</option>
<option value="1367">BW 31.25khz CR 4:5 SF 7 (1200bps)</option>
<option value="300">BW 125khz CR 4:5 SF 12 (default, 300bps)</option>
<option value="240">BW 125khz CR 4:6 SF 12 (244bps)</option>
<option value="210">BW 125khz CR 4:7 SF 12 (209bps)</option>

View File

@ -1,10 +1,10 @@
#ifndef BUILD_NUMBER
#define BUILD_NUMBER "133"
#define BUILD_NUMBER "26"
#endif
#ifndef VERSION
#define VERSION "v0.4.5.133- - 2021-10-27 20:09:46.395374"
#define VERSION "v0.4.6.26-b7078b9 - 2021-10-29 23:12:14.496732"
#endif
#ifndef VERSION_SHORT
#define VERSION_SHORT "v0.4.5.133-"
#define VERSION_SHORT "v0.4.6.26-b7078b9"
#endif

View File

@ -31,6 +31,9 @@ PROGMEM static const RH_RF95::ModemConfig MODEM_CONFIG_TABLE[] =
{ 0x72, 0xb4, 0x00}, // Bw125Cr45Sf2048 <= M0IGA messup speed
{ 0x72, 0x94, 0x04}, // Bw125Cr45Sf512 <= corrected 1200baud
{ 0x78, 0xa4, 0x00}, // Bw125Cr48Sf1024
{ 0x42, 0x74, 0x00}, // Bw31_25Cr45Sf128 <= Narrow band 1200
{ 0x42, 0x94, 0x00}, // Bw31_25Cr45Sf512 <= Narrow band 300
};
RH_RF95::RH_RF95(uint8_t slaveSelectPin, uint8_t interruptPin, RHGenericSPI& spi)

View File

@ -613,6 +613,8 @@ public:
Bw125Cr45Sf2048, ///< M0IGA Messup speed / 698baud (not 1200)
Bw125Cr45Sf512, ///< corrected 1200 baud
Bw125Cr48Sf1024, /// Bw 125, Cr = 4/8, Sf = 1024chips/symbol, CRC on
Bw31_25Cr45Sf128, /// Bw31_25Cr45Sf128 <= Narrow band 1200bod
Bw31_25Cr45Sf512, /// Bw31_25Cr45Sf128 <= Narrow band 300bod
} ModemConfigChoice;
/// Constructor. You can have multiple instances, but each instance must have its own

View File

@ -533,6 +533,12 @@ void loraSend(byte lora_LTXPower, float lora_FREQ, const String &message) {
}
else if(lora_speed==240){
rf95.setModemConfig(RH_RF95::Bw125Cr46Sf4096);
}
else if(lora_speed==1367){
rf95.setModemConfig(RH_RF95::Bw31_25Cr45Sf128);
}
else if(lora_speed==439){
rf95.setModemConfig(RH_RF95::Bw31_25Cr45Sf512);
}
else {
rf95.setModemConfig(RH_RF95::Bw125Cr45Sf4096);
@ -1119,6 +1125,12 @@ void setup(){
}
else if(lora_speed==240){
rf95.setModemConfig(RH_RF95::Bw125Cr46Sf4096);
}
else if(lora_speed==1367){
rf95.setModemConfig(RH_RF95::Bw31_25Cr45Sf128);
}
else if(lora_speed==439){
rf95.setModemConfig(RH_RF95::Bw31_25Cr45Sf512);
}
else {
rf95.setModemConfig(RH_RF95::Bw125Cr45Sf4096);

View File

@ -1,6 +1,6 @@
FILENAME_BUILDNO = '.pio/versioning'
FILENAME_VERSION_H = 'include/version.h'
version = 'v0.4.5.'
version = 'v0.4.6.'
import datetime
from subprocess import *