mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-16 10:02:05 +00:00
More Spelling Checks
This commit is contained in:
parent
ef4c6b475b
commit
af439eafe6
@ -140,7 +140,7 @@ const RegionInfo regions[] = {
|
|||||||
Philippines
|
Philippines
|
||||||
433 - 434.7 MHz <10 mW erp, NTC approved device required
|
433 - 434.7 MHz <10 mW erp, NTC approved device required
|
||||||
868 - 869.4 MHz <25 mW erp, NTC approved device required
|
868 - 869.4 MHz <25 mW erp, NTC approved device required
|
||||||
915 - 918 MHz <250 mW EIRP, no external antennna allowed
|
915 - 918 MHz <250 mW EIRP, no external antenna allowed
|
||||||
https://github.com/meshtastic/firmware/issues/4948#issuecomment-2394926135
|
https://github.com/meshtastic/firmware/issues/4948#issuecomment-2394926135
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -348,7 +348,7 @@ void RadioLibInterface::handleTransmitInterrupt()
|
|||||||
// ignore the transmit interrupt
|
// ignore the transmit interrupt
|
||||||
if (sendingPacket)
|
if (sendingPacket)
|
||||||
completeSending();
|
completeSending();
|
||||||
powerMon->clearState(meshtastic_PowerMon_State_Lora_TXOn); // But our transmitter is deffinitely off now
|
powerMon->clearState(meshtastic_PowerMon_State_Lora_TXOn); // But our transmitter is definitely off now
|
||||||
}
|
}
|
||||||
|
|
||||||
void RadioLibInterface::completeSending()
|
void RadioLibInterface::completeSending()
|
||||||
|
@ -224,7 +224,7 @@ int32_t ReliableRouter::doRetransmissions()
|
|||||||
|
|
||||||
bool stillValid = true; // assume we'll keep this record around
|
bool stillValid = true; // assume we'll keep this record around
|
||||||
|
|
||||||
// FIXME, handle 51 day rolloever here!!!
|
// FIXME, handle 51 day rollover here!!!
|
||||||
if (p.nextTxMsec <= now) {
|
if (p.nextTxMsec <= now) {
|
||||||
if (p.numRetransmissions == 0) {
|
if (p.numRetransmissions == 0) {
|
||||||
LOG_DEBUG("Reliable send failed, returning a nak for fr=0x%x,to=0x%x,id=0x%x", p.packet->from, p.packet->to,
|
LOG_DEBUG("Reliable send failed, returning a nak for fr=0x%x,to=0x%x,id=0x%x", p.packet->from, p.packet->to,
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An identifier for a globalally unique message - a pair of the sending nodenum and the packet id assigned
|
* An identifier for a globally unique message - a pair of the sending nodenum and the packet id assigned
|
||||||
* to that message
|
* to that message
|
||||||
*/
|
*/
|
||||||
struct GlobalPacketId {
|
struct GlobalPacketId {
|
||||||
|
@ -426,7 +426,7 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Return 0 for success or a Routing_Errror code for failure
|
/** Return 0 for success or a Routing_Error code for failure
|
||||||
*/
|
*/
|
||||||
meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
|
meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
|
||||||
{
|
{
|
||||||
|
@ -132,7 +132,7 @@ class Router : protected concurrency::OSThread
|
|||||||
*/
|
*/
|
||||||
void handleReceived(meshtastic_MeshPacket *p, RxSource src = RX_SRC_RADIO);
|
void handleReceived(meshtastic_MeshPacket *p, RxSource src = RX_SRC_RADIO);
|
||||||
|
|
||||||
/** Frees the provided packet, and generates a NAK indicating the speicifed error while sending */
|
/** Frees the provided packet, and generates a NAK indicating the specifed error while sending */
|
||||||
void abortSendAndNak(meshtastic_Routing_Error err, meshtastic_MeshPacket *p);
|
void abortSendAndNak(meshtastic_Routing_Error err, meshtastic_MeshPacket *p);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -143,7 +143,7 @@ class Router : protected concurrency::OSThread
|
|||||||
*/
|
*/
|
||||||
bool perhapsDecode(meshtastic_MeshPacket *p);
|
bool perhapsDecode(meshtastic_MeshPacket *p);
|
||||||
|
|
||||||
/** Return 0 for success or a Routing_Errror code for failure
|
/** Return 0 for success or a Routing_Error code for failure
|
||||||
*/
|
*/
|
||||||
meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p);
|
meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p);
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ template <typename T> bool SX126xInterface<T>::init()
|
|||||||
|
|
||||||
// Overriding current limit
|
// Overriding current limit
|
||||||
// (https://github.com/jgromes/RadioLib/blob/690a050ebb46e6097c5d00c371e961c1caa3b52e/src/modules/SX126x/SX126x.cpp#L85) using
|
// (https://github.com/jgromes/RadioLib/blob/690a050ebb46e6097c5d00c371e961c1caa3b52e/src/modules/SX126x/SX126x.cpp#L85) using
|
||||||
// value in SX126xInterface.h (currently 140 mA) It may or may not be neccessary, depending on how RadioLib functions, from
|
// value in SX126xInterface.h (currently 140 mA) It may or may not be necessary, depending on how RadioLib functions, from
|
||||||
// SX1261/2 datasheet: OCP after setting DeviceSel with SetPaConfig(): SX1261 - 60 mA, SX1262 - 140 mA For the SX1268 the IC
|
// SX1261/2 datasheet: OCP after setting DeviceSel with SetPaConfig(): SX1261 - 60 mA, SX1262 - 140 mA For the SX1268 the IC
|
||||||
// defaults to 140mA no matter the set power level, but RadioLib set it lower, this would need further checking Default values
|
// defaults to 140mA no matter the set power level, but RadioLib set it lower, this would need further checking Default values
|
||||||
// are: SX1262, SX1268: 0x38 (140 mA), SX1261: 0x18 (60 mA)
|
// are: SX1262, SX1268: 0x38 (140 mA), SX1261: 0x18 (60 mA)
|
||||||
|
@ -126,7 +126,7 @@ int32_t NeighborInfoModule::runOnce()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Collect a recieved neighbor info packet from another node
|
Collect a received neighbor info packet from another node
|
||||||
Pass it to an upper client; do not persist this data on the mesh
|
Pass it to an upper client; do not persist this data on the mesh
|
||||||
*/
|
*/
|
||||||
bool NeighborInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_NeighborInfo *np)
|
bool NeighborInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_NeighborInfo *np)
|
||||||
|
@ -78,7 +78,7 @@ RoutingModule::RoutingModule() : ProtobufModule("routing", meshtastic_PortNum_RO
|
|||||||
{
|
{
|
||||||
isPromiscuous = true;
|
isPromiscuous = true;
|
||||||
|
|
||||||
// moved the ReboradcastMode logic into handleReceivedProtobuf
|
// moved the RebroadcastMode logic into handleReceivedProtobuf
|
||||||
// LocalOnly requires either the from or to to be a known node
|
// LocalOnly requires either the from or to to be a known node
|
||||||
// knownOnly specifically requires the from to be a known node.
|
// knownOnly specifically requires the from to be a known node.
|
||||||
encryptedOk = true;
|
encryptedOk = true;
|
||||||
|
@ -532,7 +532,7 @@ void SerialModule::processWXSerial()
|
|||||||
batVoltageF, capVoltageF, temperatureF);
|
batVoltageF, capVoltageF, temperatureF);
|
||||||
}
|
}
|
||||||
if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
|
if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
|
||||||
// calulate averages and send to the mesh
|
// calculate averages and send to the mesh
|
||||||
float velAvg = 1.0 * velSum / velCount;
|
float velAvg = 1.0 * velSum / velCount;
|
||||||
|
|
||||||
double avgSin = dir_sum_sin / dirCount;
|
double avgSin = dir_sum_sin / dirCount;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include "UnitConversions.h"
|
#include "UnitConversions.h"
|
||||||
|
|
||||||
float UnitConversions::CelsiusToFahrenheit(float celcius)
|
float UnitConversions::CelsiusToFahrenheit(float celsius)
|
||||||
{
|
{
|
||||||
return (celcius * 9) / 5 + 32;
|
return (celsius * 9) / 5 + 32;
|
||||||
}
|
}
|
||||||
|
|
||||||
float UnitConversions::MetersPerSecondToKnots(float metersPerSecond)
|
float UnitConversions::MetersPerSecondToKnots(float metersPerSecond)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
class UnitConversions
|
class UnitConversions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static float CelsiusToFahrenheit(float celcius);
|
static float CelsiusToFahrenheit(float celsius);
|
||||||
static float MetersPerSecondToKnots(float metersPerSecond);
|
static float MetersPerSecondToKnots(float metersPerSecond);
|
||||||
static float MetersPerSecondToMilesPerHour(float metersPerSecond);
|
static float MetersPerSecondToMilesPerHour(float metersPerSecond);
|
||||||
static float HectoPascalToInchesOfMercury(float hectoPascal);
|
static float HectoPascalToInchesOfMercury(float hectoPascal);
|
||||||
|
@ -12,7 +12,7 @@ bool LSM6DS3Sensor::init()
|
|||||||
// Default threshold of 2G, less sensitive options are 4, 8 or 16G
|
// Default threshold of 2G, less sensitive options are 4, 8 or 16G
|
||||||
sensor.setAccelRange(LSM6DS_ACCEL_RANGE_2_G);
|
sensor.setAccelRange(LSM6DS_ACCEL_RANGE_2_G);
|
||||||
|
|
||||||
// Duration is number of occurances needed to trigger, higher threshold is less sensitive
|
// Duration is number of occurrences needed to trigger, higher threshold is less sensitive
|
||||||
sensor.enableWakeup(config.display.wake_on_tap_or_motion, 1, LSM6DS3_WAKE_THRESH);
|
sensor.enableWakeup(config.display.wake_on_tap_or_motion, 1, LSM6DS3_WAKE_THRESH);
|
||||||
|
|
||||||
LOG_DEBUG("LSM6DS3Sensor::init ok");
|
LOG_DEBUG("LSM6DS3Sensor::init ok");
|
||||||
|
Loading…
Reference in New Issue
Block a user