kopia lustrzana https://github.com/meshtastic/firmware
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
commit
139f61d03e
|
@ -57,6 +57,9 @@ lib_deps =
|
|||
; Used for the code analysis in PIO Home / Inspect
|
||||
check_tool = cppcheck
|
||||
check_skip_packages = yes
|
||||
check_flags =
|
||||
--common-flag
|
||||
cppcheck: --enable=--inline-suppr
|
||||
|
||||
; Common settings for conventional (non Portduino) Arduino targets
|
||||
[arduino_base]
|
||||
|
|
|
@ -423,7 +423,7 @@ void RadioInterface::applyModemConfig()
|
|||
power = 17; // Default to default power if we don't have a valid power
|
||||
|
||||
// Set final tx_power back onto config
|
||||
loraConfig.tx_power = power;
|
||||
loraConfig.tx_power = (int8_t)power; // cppcheck-suppress assignmentAddressToInteger
|
||||
|
||||
// Calculate the number of channels
|
||||
uint32_t numChannels = floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000)));
|
||||
|
|
|
@ -279,7 +279,7 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
|
|||
// if it isn't, then we need to create a json object
|
||||
// with the string as the value
|
||||
DEBUG_MSG("text message payload is of type plaintext\n");
|
||||
msgPayload = Json::object({{"text", payloadStr}});
|
||||
msgPayload = Json::object{{"text", payloadStr}};
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ static const uint8_t SCK = 33;
|
|||
|
||||
// https://docs.rakwireless.com/Product-Categories/WisBlock/RAK13300/
|
||||
|
||||
#define LORA_DIO0 26 // a No connect on the SX1262/SX1268 module
|
||||
#define LORA_DIO0 -1 // a No connect on the SX1262/SX1268 module
|
||||
#define LORA_RESET WB_IO4 // RST for SX1276, and for SX1262/SX1268
|
||||
#define LORA_DIO1 WB_IO6 // IRQ for SX1262/SX1268
|
||||
#define LORA_DIO2 WB_IO5 // BUSY for SX1262/SX1268
|
||||
|
|
Ładowanie…
Reference in New Issue