psionrevo
/
CubeCellRepeater
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update main.cpp 

Major Release - will now work with any channel name and speed setting
This commit is contained in:
tuxphone 2020-09-19 15:00:26 +02:00 committed by GitHub
parent 9ea476e230
commit 97f78c0d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 82 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
main.cpp
View File

@ -7,48 +7,31 @@ so the copyright for this code belongs to Heltec Automation.
Any additional changes are free-to-use, but at your own risk. Any additional changes are free-to-use, but at your own risk.
*/ */
// CONFIGURATION of Meshtastic channel name and speed: change values in MeshRadio.h !
#include <Arduino.h> // needed for platform.io #include <Arduino.h> // needed for platform.io
#include "mesh.pb.h" #include "mesh.pb.h"
#include "MeshRadio.h"
// ToRadio Incoming; // not used right now
// Radio settings for meshtastic channel "Default" @ "very long range (but slow)". Will not work with other settings or channels.
// #define RF_FREQUENCY 865200000 // Hz -- see "CH0" in Meshradio.h
#define TX_OUTPUT_POWER 22 // dBm
#define LORA_BANDWIDTH 0 // [0: 125 kHz, 1: 250 kHz, 2: 500 kHz, 3: 62.5kHz, 4: 41.67kHz, 5: 31.25kHz, 6: 20.83kHz, 7: 15.63kHz, 8: 10.42kHz, 9: 7.81kHz]
// FYI:
// const RadioLoRaBandwidths_t Bandwidths[] = { LORA_BW_125, LORA_BW_250, LORA_BW_500, LORA_BW_062,LORA_BW_041, LORA_BW_031, LORA_BW_020, LORA_BW_015, LORA_BW_010, LORA_BW_007 };
#define LORA_SPREADING_FACTOR 12 // [SF5..SF12]
#define LORA_CODINGRATE 4 // [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
#define LORA_PREAMBLE_LENGTH 32 // Same for Tx and Rx #define LORA_PREAMBLE_LENGTH 32 // Same for Tx and Rx
#define LORA_SYMBOL_TIMEOUT 0 // Symbols #define LORA_SYMBOL_TIMEOUT 0 // Symbols
#define LORA_FIX_LENGTH_PAYLOAD_ON false
#define LORA_IQ_INVERSION_ON false
#define LORA_CHAN_NUM 0 // Channel Number (meshtastic specific)
#define RX_TIMEOUT_VALUE 1000 #define RX_TIMEOUT_VALUE 1000
#define BUFFER_SIZE 0xFF // max payload (see \cores\asr650x\device\asr6501_lrwan\radio.c --> MaxPayloadLength) #define BUFFER_SIZE 0xFF // max payload (see \cores\asr650x\device\asr6501_lrwan\radio.c --> MaxPayloadLength)
#define ID_BUFFER_SIZE 32 #define ID_BUFFER_SIZE 32
char mPacket[BUFFER_SIZE]; char mPacket[BUFFER_SIZE];
#define HW_VERSION_EU865 // define your region _before_ including MeshRadio.h !
#include "MeshRadio.h"
// initializing ChannelSettings with valid data... You can modify it to your settings here. Do not use ModemConfig. Change bw/sf/cr instead!
// "Bandwidth" is the index of the array Bandwidths (see above), not the actual bandwidth! Index is starting with 0.
ChannelSettings_psk_t mPSK; // not used
ChannelSettings ChanSet={ TX_OUTPUT_POWER, ChannelSettings_ModemConfig_Bw125Cr48Sf4096, mPSK, "Default",
LORA_BANDWIDTH, LORA_SPREADING_FACTOR, LORA_CODINGRATE, LORA_CHAN_NUM };
uint32_t receivedID[ID_BUFFER_SIZE];
int receivedCount = -1;
static RadioEvents_t RadioEvents; static RadioEvents_t RadioEvents;
void OnTxDone( void ); void OnTxDone( void );
void OnTxTimeout( void ); void OnTxTimeout( void );
void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr ); void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr );
void ConfigureRadio( ChannelSettings ChanSet ); void ConfigureRadio( ChannelSettings ChanSet );
unsigned long hash(char *str);
ChannelSettings ChanSet;
uint32_t receivedID[ID_BUFFER_SIZE];
int receivedCount = -1;
typedef enum typedef enum
{ {
@ -63,20 +46,66 @@ uint32_t x; // re-used variable of type uint32_t, used in onRxDone()
bool found; // used in onRxDone() bool found; // used in onRxDone()
#define NOTSILENT // delete or change to VERBOSE if serial output is needed #define VERBOSE // delete or change to VERBOSE if serial output is needed
void setup() { void setup() {
#ifndef SILENT #ifndef SILENT
Serial.begin(115200); Serial.begin(115200);
Serial.print("\nSetting up Radio.."); Serial.println("\nSetting up Radio:");
#endif #endif
RadioEvents.TxDone = OnTxDone; RadioEvents.TxDone = OnTxDone;
RadioEvents.TxTimeout = OnTxTimeout; RadioEvents.TxTimeout = OnTxTimeout;
RadioEvents.RxDone = OnRxDone; RadioEvents.RxDone = OnRxDone;
Radio.Init( &RadioEvents ); Radio.Init( &RadioEvents );
ChanSet.name[12] = MESHTASTIC_NAME[12];
ChanSet.channel_num = hash( MESHTASTIC_NAME ) % NUM_CHANNELS; // see MeshRadio.h
ChanSet.tx_power = TX_OUTPUT_POWER;
/* FYI:
"bandwidth":
[0: 125 kHz, 1: 250 kHz, 2: 500 kHz, 3: 62.5kHz, 4: 41.67kHz, 5: 31.25kHz, 6: 20.83kHz, 7: 15.63kHz, 8: 10.42kHz, 9: 7.81kHz]
"speed":
0: ChannelSettings_ModemConfig_Bw125Cr45Sf128 aka short range
1: ChannelSettings_ModemConfig_Bw500Cr45Sf128 aka medium range
2: ChannelSettings_ModemConfig_Bw31_25Cr48Sf512 aka long range
3: ChannelSettings_ModemConfig_Bw125Cr48Sf4096 aka very long range
"coding rate":
[1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
*/
switch ( MESHTASTIC_SPEED ){
case 0: { // short range
ChanSet.bandwidth = 0; // 125 kHz
ChanSet.coding_rate = 1; // = 4/5
ChanSet.spread_factor = 7;
break;
}
case 1: { // medium range
ChanSet.bandwidth = 2; // 500 kHz
ChanSet.coding_rate = 1; // = 4/5
ChanSet.spread_factor = 7;
break;
}
case 2: { // long range
ChanSet.bandwidth = 5; // 31.25 kHz
ChanSet.coding_rate = 4; // = 4/5
ChanSet.spread_factor = 9;
break;
}
case 3: { // very long range
ChanSet.bandwidth = 0; // 125 kHz
ChanSet.coding_rate = 4; // = 4/8
ChanSet.spread_factor = 12;
break;
}
default:{ // default setting is medium range
ChanSet.bandwidth = 2; // 500 kHz
ChanSet.coding_rate = 1; // = 4/5
ChanSet.spread_factor = 7;
}
}
ConfigureRadio( ChanSet ); ConfigureRadio( ChanSet );
#ifndef SILENT #ifndef SILENT
Serial.println(".done!\n"); Serial.println("..done!\n");
#endif #endif
state=RX; // initial mode = receive state=RX; // initial mode = receive
} }
@ -128,6 +157,8 @@ void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
( size > BUFFER_SIZE ) ? rxSize = BUFFER_SIZE : rxSize = size; ( size > BUFFER_SIZE ) ? rxSize = BUFFER_SIZE : rxSize = size;
memcpy( mPacket, payload, size ); memcpy( mPacket, payload, size );
Radio.Sleep(); Radio.Sleep();
uint32_t packetID = (uint32_t)mPacket[11]<<24 | (uint32_t)mPacket[10]<<16 | (uint32_t)mPacket[9]<<8 | (uint32_t)mPacket[8];
#ifndef SILENT #ifndef SILENT
Serial.printf("\nReceived packet! (Size %i bytes, RSSI %i, SNR %i)\n", size, rssi, snr); Serial.printf("\nReceived packet! (Size %i bytes, RSSI %i, SNR %i)\n", size, rssi, snr);
@ -140,11 +171,14 @@ void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
for(int i=7; i>3; i--){ for(int i=7; i>3; i--){
Serial.print(mPacket[i], HEX); Serial.print(mPacket[i], HEX);
} }
/*
Serial.print(" PacketID: "); Serial.print(" PacketID: ");
for(int i=11; i>7; i--){ for(int i=11; i>7; i--){
Serial.print(mPacket[i], HEX); Serial.print(mPacket[i], HEX);
} }
*/
Serial.print(" Packet ID: ");
Serial.println(packetID, HEX);
Serial.print(" Flags: "); Serial.print(" Flags: ");
x = mPacket[12]; x = mPacket[12];
@ -165,11 +199,9 @@ void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
} }
Serial.println(); Serial.println();
#endif #endif
// uint32_t packetID
x = (uint32_t)mPacket[11]<<24 | (uint32_t)mPacket[10]<<16 | (uint32_t)mPacket[9]<<8 | (uint32_t)mPacket[8];
found = false; found = false;
for(int i = 0; i < ID_BUFFER_SIZE; i++){ for(int i = 0; i < ID_BUFFER_SIZE; i++){
if (receivedID[i] == x) found = true; if (receivedID[i] == packetID) found = true;
} }
if (!found){ if (!found){
state=TX; // will repeat package state=TX; // will repeat package
@ -184,12 +216,26 @@ void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
} }
} }
// hash a string into an integer - djb2 by Dan Bernstein. -
// http://www.cse.yorku.ca/~oz/hash.html
unsigned long hash(char *str)
{
unsigned long hash = 5381;
int c;
while ((c = *str++) != 0)
hash = ((hash << 5) + hash) + (unsigned char) c;
return hash;
}
void ConfigureRadio( ChannelSettings ChanSet ) void ConfigureRadio( ChannelSettings ChanSet )
{ {
uint32_t freq = (CH0 + CH_SPACING * ChanSet.channel_num)*1E6; uint32_t freq = (CH0 + CH_SPACING * ChanSet.channel_num)*1E6;
#ifndef SILENT
Serial.printf("\nSetting frequency to: %i ..",freq ); Serial.printf("\nSetting frequency to %i Hz (meshtastic channel %i) .. \n",freq,ChanSet.channel_num );
Serial.printf("Setting bandwidth to index %i ..\n",ChanSet.bandwidth);
Serial.printf("Setting CodeRate to index %i .. \n", ChanSet.coding_rate);
Serial.printf("Setting SpreadingFactor to %i ..\n",ChanSet.spread_factor);
#endif
Radio.SetChannel( freq ); Radio.SetChannel( freq );
Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, ChanSet.bandwidth, ChanSet.spread_factor, ChanSet.coding_rate, Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, ChanSet.bandwidth, ChanSet.spread_factor, ChanSet.coding_rate,
LORA_PREAMBLE_LENGTH, false, true, false, 0, false, 20000 ); LORA_PREAMBLE_LENGTH, false, true, false, 0, false, 20000 );