From f1f995e9d81364a53538422833cc8d3c50888b00 Mon Sep 17 00:00:00 2001 From: jgromes Date: Sun, 22 Mar 2020 08:12:38 +0100 Subject: [PATCH] [SX126x] Fixed typos --- .../SX126x_FSK_Modem/SX126x_FSK_Modem.ino | 4 ++-- .../SX126x/SX126x_Settings/SX126x_Settings.ino | 8 ++++---- .../SX126x_Transmit_Interrupt.ino | 12 ++++++------ src/modules/SX126x/SX126x.cpp | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/SX126x/SX126x_FSK_Modem/SX126x_FSK_Modem.ino b/examples/SX126x/SX126x_FSK_Modem/SX126x_FSK_Modem.ino index e3e04627..90730ed0 100644 --- a/examples/SX126x/SX126x_FSK_Modem/SX126x_FSK_Modem.ino +++ b/examples/SX126x/SX126x_FSK_Modem/SX126x_FSK_Modem.ino @@ -99,8 +99,8 @@ void loop() { // transmit FSK packet int state = fsk.transmit("Hello World!"); /* - byte byteArr[] = {0x01, 0x23, 0x45, 0x56, - 0x78, 0xAB, 0xCD, 0xEF}; + byte byteArr[] = {0x01, 0x23, 0x45, 0x67, + 0x89, 0xAB, 0xCD, 0xEF}; int state = lora.transmit(byteArr, 8); */ if (state == ERR_NONE) { diff --git a/examples/SX126x/SX126x_Settings/SX126x_Settings.ino b/examples/SX126x/SX126x_Settings/SX126x_Settings.ino index 3c8a3e5e..3da7d650 100644 --- a/examples/SX126x/SX126x_Settings/SX126x_Settings.ino +++ b/examples/SX126x/SX126x_Settings/SX126x_Settings.ino @@ -76,12 +76,12 @@ void setup() { // bandwidth: 500.0 kHz // spreading factor: 6 // coding rate: 5 - // sync word: 0x34 (public network) + // sync word: 0x34 (public network/LoRaWAN) // output power: 2 dBm // current limit: 50 mA // preamble length: 20 symbols // CRC: enabled - state = loraSX1268.begin(915.0, 500.0, 6, 5, 0x3444, 50, 20); + state = loraSX1268.begin(915.0, 500.0, 6, 5, 0x34, 50, 20); if (state == ERR_NONE) { Serial.println(F("success!")); } else { @@ -117,8 +117,8 @@ void setup() { while (true); } - // set LoRa sync word to 0x1234 - if (loraSX1262.setSyncWord(0x1234) != ERR_NONE) { + // set LoRa sync word to 0xAB + if (loraSX1262.setSyncWord(0xAB) != ERR_NONE) { Serial.println(F("Unable to set sync word!")); while (true); } diff --git a/examples/SX126x/SX126x_Transmit_Interrupt/SX126x_Transmit_Interrupt.ino b/examples/SX126x/SX126x_Transmit_Interrupt/SX126x_Transmit_Interrupt.ino index 157f00a1..724e05dc 100644 --- a/examples/SX126x/SX126x_Transmit_Interrupt/SX126x_Transmit_Interrupt.ino +++ b/examples/SX126x/SX126x_Transmit_Interrupt/SX126x_Transmit_Interrupt.ino @@ -65,9 +65,9 @@ void setup() { // you can also transmit byte array up to 256 bytes long /* - byte byteArr[] = {0x01, 0x23, 0x45, 0x56, - 0x78, 0xAB, 0xCD, 0xEF}; - state = lora.transmit(byteArr, 8); + byte byteArr[] = {0x01, 0x23, 0x45, 0x67, + 0x89, 0xAB, 0xCD, 0xEF}; + state = lora.startTransmit(byteArr, 8); */ } @@ -127,9 +127,9 @@ void loop() { // you can also transmit byte array up to 256 bytes long /* - byte byteArr[] = {0x01, 0x23, 0x45, 0x56, - 0x78, 0xAB, 0xCD, 0xEF}; - int state = lora.transmit(byteArr, 8); + byte byteArr[] = {0x01, 0x23, 0x45, 0x67, + 0x89, 0xAB, 0xCD, 0xEF}; + int state = lora.startTransmit(byteArr, 8); */ // we're ready to send more packets, diff --git a/src/modules/SX126x/SX126x.cpp b/src/modules/SX126x/SX126x.cpp index 6b72f690..5754893f 100644 --- a/src/modules/SX126x/SX126x.cpp +++ b/src/modules/SX126x/SX126x.cpp @@ -310,7 +310,7 @@ int16_t SX126x::transmitDirect(uint32_t frf) { } int16_t SX126x::receiveDirect() { - // SX126x is unable to ouput received data directly + // SX126x is unable to output received data directly return(ERR_UNKNOWN); } @@ -486,7 +486,7 @@ int16_t SX126x::startReceiveDutyCycleAuto(uint16_t senderPreambleLength, uint16_ senderPreambleLength = _preambleLength; } - // worst case is that the sender starts transmiting when we're just less than minSymbols from going back to sleep. + // worst case is that the sender starts transmitting when we're just less than minSymbols from going back to sleep. // in this case, we don't catch minSymbols before going to sleep, // so we must be awake for at least that long before the sender stops transmitting. uint16_t sleepSymbols = senderPreambleLength - 2 * minSymbols; @@ -504,7 +504,7 @@ int16_t SX126x::startReceiveDutyCycleAuto(uint16_t senderPreambleLength, uint16_ // when the unit detects a preamble, it starts a timer that will timeout if it doesn't receive a header in time. // the duration is sleepPeriod + 2 * wakePeriod. // The sleepPeriod doesn't take into account shutdown and startup time for the unit (~1ms) - // We need to ensure that the timout is longer than senderPreambleLength. + // We need to ensure that the timeout is longer than senderPreambleLength. // So we must satisfy: wakePeriod > (preamblePeriod - (sleepPeriod - 1000)) / 2. (A) // we also need to ensure the unit is awake to see at least minSymbols. (B) uint32_t wakePeriod = max( @@ -513,7 +513,7 @@ int16_t SX126x::startReceiveDutyCycleAuto(uint16_t senderPreambleLength, uint16_ RADIOLIB_DEBUG_PRINT(F("Auto wake period: ")); RADIOLIB_DEBUG_PRINTLN(wakePeriod); - //If our sleep period is shorter than our transition time, just use the standard startReceive + // If our sleep period is shorter than our transition time, just use the standard startReceive if(sleepPeriod < _tcxoDelay + 1016) { return(startReceive()); } @@ -711,7 +711,7 @@ int16_t SX126x::setFrequencyDeviation(float freqDev) { return(ERR_WRONG_MODEM); } - // check alowed frequency deviation values + // check allowed frequency deviation values if(!(freqDev <= 200.0)) { return(ERR_INVALID_FREQUENCY_DEVIATION); } @@ -735,7 +735,7 @@ int16_t SX126x::setBitRate(float br) { return(ERR_WRONG_MODEM); } - // check alowed bit rate values + // check allowed bit rate values if(!((br >= 0.6) && (br <= 300.0))) { return(ERR_INVALID_BIT_RATE); } @@ -765,7 +765,7 @@ int16_t SX126x::setRxBandwidth(float rxBw) { }*/ _rxBwKhz = rxBw; - // check alowed receiver bandwidth values + // check allowed receiver bandwidth values if(abs(rxBw - 4.8) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_4_8; } else if(abs(rxBw - 5.8) <= 0.001) { @@ -980,7 +980,7 @@ int16_t SX126x::setCRC(uint8_t len, uint16_t initial, uint16_t polynomial, bool return(state); } else if(modem == SX126X_PACKET_TYPE_LORA) { - // LoRa CRC doesn't allow to set CRC polynomial, inital value, or inversion + // LoRa CRC doesn't allow to set CRC polynomial, initial value, or inversion // update packet parameters if(len) { @@ -1526,7 +1526,7 @@ int16_t SX126x::SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* d // pull NSS low digitalWrite(_mod->getCs(), LOW); - // ensure BUSY is low (state meachine ready) + // ensure BUSY is low (state machine ready) uint32_t start = millis(); while(digitalRead(_mod->getGpio())) { if(millis() - start >= timeout) {