From a65c880b80c23ab672fd92af2f55da9b4bfaaa64 Mon Sep 17 00:00:00 2001 From: Technologyman00 Date: Sat, 2 Nov 2024 00:09:31 -0500 Subject: [PATCH] Spelling Fixes --- src/gps/GPS.cpp | 2 +- src/gps/GPSUpdateScheduling.cpp | 6 +++--- src/gps/GeoCoord.cpp | 6 +++--- src/gps/ubx.h | 16 ++++++++-------- src/graphics/EInkDynamicDisplay.cpp | 6 +++--- src/graphics/Screen.h | 2 +- src/graphics/TFTDisplay.cpp | 2 +- src/input/ExpressLRSFiveWay.h | 2 +- src/input/MPR121Keyboard.cpp | 6 +++--- src/input/ScanAndSelect.h | 2 +- src/input/TouchScreenBase.cpp | 2 +- src/input/kbI2cBase.cpp | 2 +- src/main.cpp | 4 ++-- src/mesh/Channels.cpp | 2 +- src/mesh/Default.h | 2 +- src/mesh/compression/unishox2.cpp | 8 ++++---- src/mesh/compression/unishox2.h | 10 +++++----- src/mesh/generated/meshtastic/admin.pb.h | 2 +- src/mesh/generated/meshtastic/atak.pb.h | 4 ++-- src/mesh/generated/meshtastic/channel.pb.h | 2 +- src/mesh/generated/meshtastic/config.pb.h | 8 ++++---- src/mesh/generated/meshtastic/device_ui.pb.h | 4 ++-- src/mesh/generated/meshtastic/portnums.pb.h | 4 ++-- src/mesh/http/ContentHandler.cpp | 2 +- src/mesh/http/WebServer.cpp | 2 +- src/mesh/raspihttp/PiWebServer.cpp | 16 ++++++++-------- 26 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 60d9e8b24..295b5162f 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -640,7 +640,7 @@ bool GPS::setup() SEND_UBX_PACKET(0x06, 0x86, _message_PMS, "enable powersaving for GPS", 500); SEND_UBX_PACKET(0x06, 0x3B, _message_CFG_PM2, "enable powersaving details for GPS", 500); - // For M8 we want to enable NMEA vserion 4.10 so we can see the additional sats. + // For M8 we want to enable NMEA version 4.10 so we can see the additional sats. if (gnssModel == GNSS_MODEL_UBLOX8) { clearBuffer(); SEND_UBX_PACKET(0x06, 0x17, _message_NMEA, "enable NMEA 4.10", 500); diff --git a/src/gps/GPSUpdateScheduling.cpp b/src/gps/GPSUpdateScheduling.cpp index abcf6b196..09c92788e 100644 --- a/src/gps/GPSUpdateScheduling.cpp +++ b/src/gps/GPSUpdateScheduling.cpp @@ -49,7 +49,7 @@ uint32_t GPSUpdateScheduling::msUntilNextSearch() } // How long have we already been searching? -// Used to abort a search in progress, if it runs unnaceptably long +// Used to abort a search in progress, if it runs unacceptably long uint32_t GPSUpdateScheduling::elapsedSearchMs() { // If searching @@ -98,7 +98,7 @@ void GPSUpdateScheduling::updateLockTimePrediction() // Ignore the first lock-time: likely to be long, will skew data - // Second locktime: likely stable. Use to intialize the smoothing filter + // Second locktime: likely stable. Use to initialize the smoothing filter if (searchCount == 1) predictedMsToGetLock = lockTime; @@ -106,7 +106,7 @@ void GPSUpdateScheduling::updateLockTimePrediction() else if (searchCount > 1) predictedMsToGetLock = (lockTime * weighting) + (predictedMsToGetLock * (1 - weighting)); - searchCount++; // Only tracked so we can diregard initial lock-times + searchCount++; // Only tracked so we can disregard initial lock-times LOG_DEBUG("Predicting %us to get next lock", predictedMsToGetLock / 1000); } diff --git a/src/gps/GeoCoord.cpp b/src/gps/GeoCoord.cpp index 5abb25a06..9a6da942e 100644 --- a/src/gps/GeoCoord.cpp +++ b/src/gps/GeoCoord.cpp @@ -12,7 +12,7 @@ GeoCoord::GeoCoord(int32_t lat, int32_t lon, int32_t alt) : _latitude(lat), _lon GeoCoord::GeoCoord(float lat, float lon, int32_t alt) : _altitude(alt) { - // Change decimial representation to int32_t. I.e., 12.345 becomes 123450000 + // Change decimal representation to int32_t. I.e., 12.345 becomes 123450000 _latitude = int32_t(lat * 1e+7); _longitude = int32_t(lon * 1e+7); GeoCoord::setCoords(); @@ -20,7 +20,7 @@ GeoCoord::GeoCoord(float lat, float lon, int32_t alt) : _altitude(alt) GeoCoord::GeoCoord(double lat, double lon, int32_t alt) : _altitude(alt) { - // Change decimial representation to int32_t. I.e., 12.345 becomes 123450000 + // Change decimal representation to int32_t. I.e., 12.345 becomes 123450000 _latitude = int32_t(lat * 1e+7); _longitude = int32_t(lon * 1e+7); GeoCoord::setCoords(); @@ -467,7 +467,7 @@ int32_t GeoCoord::bearingTo(const GeoCoord &pointB) } /** - * Create a new point bassed on the passed in poin + * Create a new point based on the passed in point * Ported from http://www.edwilliams.org/avform147.htm#LL * @param bearing * The bearing in raidans diff --git a/src/gps/ubx.h b/src/gps/ubx.h index 68cca00a3..82fbc2cf2 100644 --- a/src/gps/ubx.h +++ b/src/gps/ubx.h @@ -155,7 +155,7 @@ const uint8_t GPS::_message_NAVX5[] = { 0x00, 0x00, 0x00, 0x00, // Reserved 9 0x00, // Reserved 10 0x00, // Reserved 11 - 0x00, // usePPP (Precice Point Positioning) (0 = false, 1 = true) + 0x00, // usePPP (Precise Point Positioning) (0 = false, 1 = true) 0x01, // useAOP (AssistNow Autonomous configuration) = 1 (enabled) 0x00, // Reserved 12 0x00, // Reserved 13 @@ -183,7 +183,7 @@ const uint8_t GPS::_message_NAVX5_8[] = { 0x00, // Reserved 4 0x00, 0x00, // Reserved 5 0x00, 0x00, // Reserved 6 - 0x00, // usePPP (Precice Point Positioning) (0 = false, 1 = true) + 0x00, // usePPP (Precise Point Positioning) (0 = false, 1 = true) 0x01, // aopCfg (AssistNow Autonomous configuration) = 1 (enabled) 0x00, 0x00, // Reserved 7 0x00, 0x00, // aopOrbMaxErr = 0 to reset to firmware default @@ -222,7 +222,7 @@ const uint8_t GPS::_message_GSA[] = { 0x00, // Rate for DDC 0x00, // Rate for UART1 0x00, // Rate for UART2 - 0x00, // Rate for USB usefull for native linux + 0x00, // Rate for USB useful for native linux 0x00, // Rate for SPI 0x00 // Reserved }; @@ -256,7 +256,7 @@ const uint8_t GPS::_message_RMC[] = { 0x00, // Rate for DDC 0x01, // Rate for UART1 0x00, // Rate for UART2 - 0x01, // Rate for USB usefull for native linux + 0x01, // Rate for USB useful for native linux 0x00, // Rate for SPI 0x00 // Reserved }; @@ -267,7 +267,7 @@ const uint8_t GPS::_message_GGA[] = { 0x00, // Rate for DDC 0x01, // Rate for UART1 0x00, // Rate for UART2 - 0x01, // Rate for USB, usefull for native linux + 0x01, // Rate for USB, useful for native linux 0x00, // Rate for SPI 0x00 // Reserved }; @@ -312,7 +312,7 @@ const uint8_t GPS::_message_DISABLE_TXT_INFO[] = { // This command applies to M8 products const uint8_t GPS::_message_PMS[] = { 0x00, // Version (0) - 0x03, // Power setup value 3 = Agresssive 1Hz + 0x03, // Power setup value 3 = Aggressive 1Hz 0x00, 0x00, // period: not applicable, set to 0 0x00, 0x00, // onTime: not applicable, set to 0 0x00, 0x00 // reserved, generated by u-center @@ -335,7 +335,7 @@ const uint8_t GPS::_message_SAVE_10[] = { // As the M10 has no flash, the best we can do to preserve the config is to set it in RAM and BBR. // BBR will survive a restart, and power off for a while, but modules with small backup // batteries or super caps will not retain the config for a long power off time. -// for all configurations using sleep / low power modes, V_BCKP needs to be hooked to permanent power for fast aquisition after +// for all configurations using sleep / low power modes, V_BCKP needs to be hooked to permanent power for fast acquisition after // sleep // VALSET Commands for M10 @@ -462,7 +462,7 @@ the PM config. Lets try without it. PMREQ sort of works with SBAS, but the awake time is too short to re-acquire any SBAS sats. The defination of "Got Fix" doesn't seem to include SBAS. Much more too this... Even if it was, it can take minutes (up to 12.5), -even under good sat visability conditions to re-acquire the SBAS data. +even under good sat viability conditions to re-acquire the SBAS data. Another effect fo the quick transition to sleep is that no other sats will be acquired so the sat count will tend to remain at what the initial fix was. diff --git a/src/graphics/EInkDynamicDisplay.cpp b/src/graphics/EInkDynamicDisplay.cpp index ac5755bc1..cfa5b354f 100644 --- a/src/graphics/EInkDynamicDisplay.cpp +++ b/src/graphics/EInkDynamicDisplay.cpp @@ -95,7 +95,7 @@ void EInkDynamicDisplay::adjustRefreshCounters() // Trigger the display update by calling base class bool EInkDynamicDisplay::update() { - // Detemine the refresh mode to use, and start the update + // Determine the refresh mode to use, and start the update bool refreshApproved = determineMode(); if (refreshApproved) { EInkDisplay::forceDisplay(0); // Bypass base class' own rate-limiting system @@ -317,7 +317,7 @@ void EInkDynamicDisplay::checkFrameMatchesPrevious() LOG_DEBUG("refresh=SKIPPED, reason=FRAME_MATCHED_PREVIOUS, frameFlags=0x%x", frameFlags); } -// Have too many fast-refreshes occured consecutively, since last full refresh? +// Have too many fast-refreshes occurred consecutively, since last full refresh? void EInkDynamicDisplay::checkConsecutiveFastRefreshes() { // If a decision was already reached, don't run the check @@ -450,7 +450,7 @@ void EInkDynamicDisplay::resetGhostPixelTracking() } #endif // EINK_LIMIT_GHOSTING_PX -// Handle any asyc tasks +// Handle any async tasks void EInkDynamicDisplay::onNotify(uint32_t notification) { // Which task diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h index b2e6e905b..fc4727d54 100644 --- a/src/graphics/Screen.h +++ b/src/graphics/Screen.h @@ -424,7 +424,7 @@ class Screen : public concurrency::OSThread #endif - // If we already returned an unconvertable-character symbol for this unconvertable-character sequence, return NULs for the + // If we already returned an unconvertible-character symbol for this unconvertible-character sequence, return NULs for the // rest of it if (SKIPREST) return (uint8_t)0; diff --git a/src/graphics/TFTDisplay.cpp b/src/graphics/TFTDisplay.cpp index 3ba847c23..36341f20a 100644 --- a/src/graphics/TFTDisplay.cpp +++ b/src/graphics/TFTDisplay.cpp @@ -687,7 +687,7 @@ void TFTDisplay::display(bool fromBlank) for (x = 0; x < displayWidth; x++) { auto isset = buffer[x + (y / 8) * displayWidth] & (1 << (y & 7)); if (!fromBlank) { - // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficent + // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficient auto dblbuf_isset = buffer_back[x + (y / 8) * displayWidth] & (1 << (y & 7)); if (isset != dblbuf_isset) { tft->drawPixel(x, y, isset ? TFT_MESH : TFT_BLACK); diff --git a/src/input/ExpressLRSFiveWay.h b/src/input/ExpressLRSFiveWay.h index c53aa9c09..6198c57fb 100644 --- a/src/input/ExpressLRSFiveWay.h +++ b/src/input/ExpressLRSFiveWay.h @@ -38,7 +38,7 @@ class ExpressLRSFiveWay : public Observable, public concurre static constexpr uint32_t KEY_LONG_PRESS_MS = 3000; // How many milliseconds to hold key for a long press // This merged an enum used by the ExpressLRS code, with meshtastic canned message values - // Key names are kept simple, to allow user customizaton + // Key names are kept simple, to allow user customization typedef enum { UP = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP, DOWN = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN, diff --git a/src/input/MPR121Keyboard.cpp b/src/input/MPR121Keyboard.cpp index e1b32aa54..197add3ee 100644 --- a/src/input/MPR121Keyboard.cpp +++ b/src/input/MPR121Keyboard.cpp @@ -168,13 +168,13 @@ void MPR121Keyboard::reset() // Set Debounce to 0x02 writeRegister(_MPR121_REG_DEBOUNCE, 0x00); delay(20); - // Set Filter1 itterations and discharge current 6x and 16uA respectively (0x10) + // Set Filter1 iterations and discharge current 6x and 16uA respectively (0x10) writeRegister(_MPR121_REG_CONFIG1, 0x10); delay(20); - // Set CDT to 0.5us, Filter2 itterations to 4x, and Sample interval = 0 (0x20) + // Set CDT to 0.5us, Filter2 iterations to 4x, and Sample interval = 0 (0x20) writeRegister(_MPR121_REG_CONFIG2, 0x20); delay(20); - // Enter run mode by Seting partial filter calibration tracking, disable proximity detection, enable 12 channels + // Enter run mode by Setting partial filter calibration tracking, disable proximity detection, enable 12 channels writeRegister(_MPR121_REG_ELECTRODE_CONFIG, ECR_CALIBRATION_TRACK_FROM_PARTIAL_FILTER | ECR_PROXIMITY_DETECTION_OFF | ECR_TOUCH_DETECTION_12CH); delay(100); diff --git a/src/input/ScanAndSelect.h b/src/input/ScanAndSelect.h index 0b3e2716e..bdc0e1a0d 100644 --- a/src/input/ScanAndSelect.h +++ b/src/input/ScanAndSelect.h @@ -39,7 +39,7 @@ class ScanAndSelectInput : public Observable, public concurr bool held = false; // Have we handled a change in button state? bool longPressFired = false; // Long press fires while button still held. This bool ensures the release is no-op uint32_t downSinceMs = 0; // Debouncing for short press, timing for long press - uint8_t pin = -1; // Read from cannned message config during init + uint8_t pin = -1; // Read from canned message config during init bool alertingNoMessage = false; // Is the "no canned messages" alert shown on screen? uint32_t alertingSinceMs = 0; // Used to dismiss the "no canned message" alert several seconds diff --git a/src/input/TouchScreenBase.cpp b/src/input/TouchScreenBase.cpp index 03618b338..ab417e48d 100644 --- a/src/input/TouchScreenBase.cpp +++ b/src/input/TouchScreenBase.cpp @@ -102,7 +102,7 @@ int32_t TouchScreenBase::runOnce() } _touchedOld = touched; - // fire TAP event when no 2nd tap occured within time + // fire TAP event when no 2nd tap occurred within time if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) { _tapped = false; e.touchEvent = static_cast(TOUCH_ACTION_TAP); diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp index d0f36c386..105ca7600 100644 --- a/src/input/kbI2cBase.cpp +++ b/src/input/kbI2cBase.cpp @@ -353,7 +353,7 @@ int32_t KbI2cBase::runOnce() e.kbchar = INPUT_BROKER_MSG_RIGHT; break; case 0xc: // Modifier key: 0xc is alt+c (Other options could be: 0xea = shift+mic button or 0x4 shift+$(speaker)) - // toggle moddifiers button. + // toggle modifiers button. is_sym = !is_sym; e.inputEvent = ANYKEY; e.kbchar = is_sym ? INPUT_BROKER_MSG_FN_SYMBOL_ON // send 0xf1 to tell CannedMessages to display that the diff --git a/src/main.cpp b/src/main.cpp index 0ce6b3bae..745235394 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -220,7 +220,7 @@ static OSThread *ambientLightingThread; RadioInterface *rIf = NULL; /** - * Some platforms (nrf52) might provide an alterate version that suppresses calling delay from sleep. + * Some platforms (nrf52) might provide an alternate version that suppresses calling delay from sleep. */ __attribute__((weak, noinline)) bool loopCanSleep() { @@ -365,7 +365,7 @@ void setup() digitalWrite(HICHG, LOW); // 100 mA charging current if set to LOW and 50mA (actually about 20mA) if set to HIGH pinMode(BAT_READ, OUTPUT); - digitalWrite(BAT_READ, LOW); // This is pin P0_14 = 14 and by pullling low to GND it provices path to read on pin 32 (P0,31) + digitalWrite(BAT_READ, LOW); // This is pin P0_14 = 14 and by pulling low to GND it provides path to read on pin 32 (P0,31) // PIN_VBAT the voltage from divider on XIAO board #endif diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index b9fe95678..a314a5498 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -398,7 +398,7 @@ bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash) * * This method is called before encoding outbound packets * - * @eturn the (0 to 255) hash for that channel - if no suitable channel could be found, return -1 + * @return the (0 to 255) hash for that channel - if no suitable channel could be found, return -1 */ int16_t Channels::setActiveByIndex(ChannelIndex channelIndex) { diff --git a/src/mesh/Default.h b/src/mesh/Default.h index 2406dafc5..6177aa2f6 100644 --- a/src/mesh/Default.h +++ b/src/mesh/Default.h @@ -44,7 +44,7 @@ class Default if (numOnlineNodes <= 40) { return 1.0; // No scaling for 40 or fewer nodes } else { - // Sscaling based on number of nodes over 40 + // Scaling based on number of nodes over 40 int nodesOverForty = (numOnlineNodes - 40); return 1.0 + (nodesOverForty * 0.075); // Each number of online node scales by 0.075 } diff --git a/src/mesh/compression/unishox2.cpp b/src/mesh/compression/unishox2.cpp index 9fc012a76..1c0310605 100644 --- a/src/mesh/compression/unishox2.cpp +++ b/src/mesh/compression/unishox2.cpp @@ -15,7 +15,7 @@ * * @author Arundale Ramanathan * - * Port for Particle (particle.io) / Aruino - Jonathan Greenblatt + * Port for Particle (particle.io) / Arduino - Jonathan Greenblatt */ /** * @file unishox2.c @@ -197,7 +197,7 @@ int append_switch_code(char *out, int olen, int ol, uint8_t state) return ol; } -/// Appends given horizontal and veritical code bits to out +/// Appends given horizontal and vertical code bits to out int append_code(char *out, int olen, int ol, uint8_t code, uint8_t *state, const uint8_t usx_hcodes[], const uint8_t usx_hcode_lens[]) { @@ -897,7 +897,7 @@ int read8bitCode(const char *in, int len, int bit_no) return code; } -/// The list of veritical codes is split into 5 sections. Used by readVCodeIdx() +/// The list of vertical codes is split into 5 sections. Used by readVCodeIdx() #define SECTION_COUNT 5 /// Used by readVCodeIdx() for finding the section under which the code read using read8bitCode() falls uint8_t usx_vsections[] = {0x7F, 0xBF, 0xDF, 0xEF, 0xFF}; @@ -924,7 +924,7 @@ uint8_t usx_vcode_lookup[36] = {(1 << 5) + 0, (1 << 5) + 0, (2 << 5) + 1, (2 /// compared to using a 256 uint8_t buffer to decode the next 8 bits read by read8bitCode() \n /// by splitting the list of vertical codes. \n /// Decoder is designed for using less memory, not speed. \n -/// Returns the veritical code index or 99 if match could not be found. \n +/// Returns the vertical code index or 99 if match could not be found. \n /// Also updates bit_no_p with how many ever bits used by the vertical code. int readVCodeIdx(const char *in, int len, int *bit_no_p) { diff --git a/src/mesh/compression/unishox2.h b/src/mesh/compression/unishox2.h index 5e2cc8b4c..8ae475f9d 100644 --- a/src/mesh/compression/unishox2.h +++ b/src/mesh/compression/unishox2.h @@ -15,7 +15,7 @@ * * @author Arundale Ramanathan * - * Port for Particle (particle.io) / Aruino - Jonathan Greenblatt + * Port for Particle (particle.io) / Arduino - Jonathan Greenblatt * * This file describes each function of the Unishox2 API \n * For finding out how this API can be used in your program, \n @@ -291,8 +291,8 @@ extern int unishox2_decompress_simple(const char *in, int len, char *out); * @param[in] olen length of 'out' buffer in bytes. Can be omitted if sufficient buffer is provided * @param[in] usx_hcodes Horizontal codes (array of bytes). See macro section for samples. * @param[in] usx_hcode_lens Length of each element in usx_hcodes array - * @param[in] usx_freq_seq Frequently occuring sequences. See USX_FREQ_SEQ_* macros for samples - * @param[in] usx_templates Templates of frequently occuring patterns. See USX_TEMPLATES macro. + * @param[in] usx_freq_seq Frequently occurring sequences. See USX_FREQ_SEQ_* macros for samples + * @param[in] usx_templates Templates of frequently occurring patterns. See USX_TEMPLATES macro. */ extern int unishox2_compress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen), const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[], const char *usx_freq_seq[], @@ -310,8 +310,8 @@ extern int unishox2_compress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(ch * @param[in] olen length of 'out' buffer in bytes. Can be omitted if sufficient buffer is provided * @param[in] usx_hcodes Horizontal codes (array of bytes). See macro section for samples. * @param[in] usx_hcode_lens Length of each element in usx_hcodes array - * @param[in] usx_freq_seq Frequently occuring sequences. See USX_FREQ_SEQ_* macros for samples - * @param[in] usx_templates Templates of frequently occuring patterns. See USX_TEMPLATES macro. + * @param[in] usx_freq_seq Frequently occurring sequences. See USX_FREQ_SEQ_* macros for samples + * @param[in] usx_templates Templates of frequently occurring patterns. See USX_TEMPLATES macro. */ extern int unishox2_decompress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen), const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[], const char *usx_freq_seq[], diff --git a/src/mesh/generated/meshtastic/admin.pb.h b/src/mesh/generated/meshtastic/admin.pb.h index d802eb3da..0328300e6 100644 --- a/src/mesh/generated/meshtastic/admin.pb.h +++ b/src/mesh/generated/meshtastic/admin.pb.h @@ -71,7 +71,7 @@ typedef enum _meshtastic_AdminMessage_ModuleConfigType { } meshtastic_AdminMessage_ModuleConfigType; /* Struct definitions */ -/* Parameters for setting up Meshtastic for ameteur radio usage */ +/* Parameters for setting up Meshtastic for amateur radio usage */ typedef struct _meshtastic_HamParameters { /* Amateur radio call sign, eg. KD2ABC */ char call_sign[8]; diff --git a/src/mesh/generated/meshtastic/atak.pb.h b/src/mesh/generated/meshtastic/atak.pb.h index 15a86788b..cad7fbc7d 100644 --- a/src/mesh/generated/meshtastic/atak.pb.h +++ b/src/mesh/generated/meshtastic/atak.pb.h @@ -11,7 +11,7 @@ /* Enum definitions */ typedef enum _meshtastic_Team { - /* Unspecifed */ + /* Unspecified */ meshtastic_Team_Unspecifed_Color = 0, /* White */ meshtastic_Team_White = 1, @@ -45,7 +45,7 @@ typedef enum _meshtastic_Team { /* Role of the group member */ typedef enum _meshtastic_MemberRole { - /* Unspecifed */ + /* Unspecified */ meshtastic_MemberRole_Unspecifed = 0, /* Team Member */ meshtastic_MemberRole_TeamMember = 1, diff --git a/src/mesh/generated/meshtastic/channel.pb.h b/src/mesh/generated/meshtastic/channel.pb.h index 3d617ae39..2cfad9e22 100644 --- a/src/mesh/generated/meshtastic/channel.pb.h +++ b/src/mesh/generated/meshtastic/channel.pb.h @@ -90,7 +90,7 @@ typedef struct _meshtastic_ChannelSettings { a table of well known IDs. (see Well Known Channels FIXME) */ uint32_t id; - /* If true, messages on the mesh will be sent to the *public* internet by any gateway ndoe */ + /* If true, messages on the mesh will be sent to the *public* internet by any gateway node */ bool uplink_enabled; /* If true, messages seen on the internet will be forwarded to the local mesh. */ bool downlink_enabled; diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h index fab23ae34..495f9fffe 100644 --- a/src/mesh/generated/meshtastic/config.pb.h +++ b/src/mesh/generated/meshtastic/config.pb.h @@ -293,7 +293,7 @@ typedef enum _meshtastic_Config_BluetoothConfig_PairingMode { typedef struct _meshtastic_Config_DeviceConfig { /* Sets the role of node */ meshtastic_Config_DeviceConfig_Role role; - /* Disabling this will disable the SerialConsole by not initilizing the StreamAPI + /* Disabling this will disable the SerialConsole by not initializing the StreamAPI Moved to SecurityConfig */ bool serial_enabled; /* For boards without a hard wired button, this is the pin number that will be used @@ -326,7 +326,7 @@ typedef struct _meshtastic_Config_PositionConfig { /* We should send our position this often (but only if it has changed significantly) Defaults to 15 minutes */ uint32_t position_broadcast_secs; - /* Adaptive position braoadcast, which is now the default. */ + /* Adaptive position broadcast, which is now the default. */ bool position_broadcast_smart_enabled; /* If set, this node is at a fixed position. We will generate GPS position updates at the regular interval, but use whatever the last lat/lon/alt we have for the node. @@ -412,7 +412,7 @@ typedef struct _meshtastic_Config_NetworkConfig { char wifi_ssid[33]; /* If set, will be use to authenticate to the named wifi */ char wifi_psk[65]; - /* NTP server to use if WiFi is conneced, defaults to `0.pool.ntp.org` */ + /* NTP server to use if WiFi is connected, defaults to `0.pool.ntp.org` */ char ntp_server[33]; /* Enable Ethernet */ bool eth_enabled; @@ -440,7 +440,7 @@ typedef struct _meshtastic_Config_DisplayConfig { bool compass_north_top; /* Flip screen vertically, for cases that mount the screen upside down */ bool flip_screen; - /* Perferred display units */ + /* Preferred display units */ meshtastic_Config_DisplayConfig_DisplayUnits units; /* Override auto-detect in screen */ meshtastic_Config_DisplayConfig_OledType oled; diff --git a/src/mesh/generated/meshtastic/device_ui.pb.h b/src/mesh/generated/meshtastic/device_ui.pb.h index 5c1e067ab..67e46f660 100644 --- a/src/mesh/generated/meshtastic/device_ui.pb.h +++ b/src/mesh/generated/meshtastic/device_ui.pb.h @@ -72,7 +72,7 @@ typedef struct _meshtastic_NodeFilter { } meshtastic_NodeFilter; typedef struct _meshtastic_NodeHighlight { - /* Hightlight nodes w/ active chat */ + /* Highlight nodes w/ active chat */ bool chat_switch; /* Highlight nodes w/ position */ bool position_switch; @@ -106,7 +106,7 @@ typedef struct _meshtastic_DeviceUIConfig { /* Node list filter */ bool has_node_filter; meshtastic_NodeFilter node_filter; - /* Node list highlightening */ + /* Node list highlighting */ bool has_node_highlight; meshtastic_NodeHighlight node_highlight; } meshtastic_DeviceUIConfig; diff --git a/src/mesh/generated/meshtastic/portnums.pb.h b/src/mesh/generated/meshtastic/portnums.pb.h index df6cf32c2..442a81b7c 100644 --- a/src/mesh/generated/meshtastic/portnums.pb.h +++ b/src/mesh/generated/meshtastic/portnums.pb.h @@ -17,7 +17,7 @@ PortNums should be assigned in the following range: 0-63 Core Meshtastic use, do not use for third party apps 64-127 Registered 3rd party apps, send in a pull request that adds a new entry to portnums.proto to register your application - 256-511 Use one of these portnums for your private applications that you don't want to register publically + 256-511 Use one of these portnums for your private applications that you don't want to register publicly All other values are reserved. Note: This was formerly a Type enum named 'typ' with the same id # We have change to this 'portnum' based scheme for specifying app handlers for particular payloads. @@ -77,7 +77,7 @@ typedef enum _meshtastic_PortNum { ENCODING: ASCII Plaintext */ meshtastic_PortNum_REPLY_APP = 32, /* Used for the python IP tunnel feature - ENCODING: IP Packet. Handled by the python API, firmware ignores this one and pases on. */ + ENCODING: IP Packet. Handled by the python API, firmware ignores this one and passes on. */ meshtastic_PortNum_IP_TUNNEL_APP = 33, /* Paxcounter lib included in the firmware ENCODING: protobuf */ diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp index 8535a335f..a65bd8609 100644 --- a/src/mesh/http/ContentHandler.cpp +++ b/src/mesh/http/ContentHandler.cpp @@ -23,7 +23,7 @@ /* Including the esp32_https_server library will trigger a compile time error. I've - tracked it down to a reoccurrance of this bug: + tracked it down to a reoccurrence of this bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57824 The work around is described here: https://forums.xilinx.com/t5/Embedded-Development-Tools/Error-with-Standard-Libaries-in-Zynq/td-p/450032 diff --git a/src/mesh/http/WebServer.cpp b/src/mesh/http/WebServer.cpp index 62a8431fa..a3934326d 100644 --- a/src/mesh/http/WebServer.cpp +++ b/src/mesh/http/WebServer.cpp @@ -22,7 +22,7 @@ Preferences prefs; /* Including the esp32_https_server library will trigger a compile time error. I've - tracked it down to a reoccurrance of this bug: + tracked it down to a reoccurrence of this bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57824 The work around is described here: https://forums.xilinx.com/t5/Embedded-Development-Tools/Error-with-Standard-Libaries-in-Zynq/td-p/450032 diff --git a/src/mesh/raspihttp/PiWebServer.cpp b/src/mesh/raspihttp/PiWebServer.cpp index 711a81024..e9e8d1957 100644 --- a/src/mesh/raspihttp/PiWebServer.cpp +++ b/src/mesh/raspihttp/PiWebServer.cpp @@ -1,12 +1,12 @@ /* Adds a WebServer and WebService callbacks to meshtastic as Linux Version. The WebServer & Webservices runs in a real linux thread beside the portdunio threading emulation. It replaces the complete ESP32 -Webserver libs including generation of SSL certifcicates, because the use ESP specific details in +Webserver libs including generation of SSL certificates, because the use ESP specific details in the lib that can't be emulated. The WebServices adapt to the two major phoneapi functions "handleAPIv1FromRadio,handleAPIv1ToRadio" -The WebServer just adds basaic support to deliver WebContent, so it can be used to -deliver the WebGui definded by the WebClient Project. +The WebServer just adds basic support to deliver WebContent, so it can be used to +deliver the WebGui defined by the WebClient Project. Steps to get it running: 1.) Add these Linux Libs to the compile and target machine: @@ -16,7 +16,7 @@ Steps to get it running: libulfius-dev liborcania-dev 2.) Configure the root directory of the web Content in the config.yaml file. - The followinng tags should be included and set at your needs + The following tags should be included and set at your needs Example entry in the config.yaml Webserver: @@ -335,7 +335,7 @@ int generate_self_signed_x509(EVP_PKEY *pkey, X509 **x509) // Selfsigned, Issuer = Subject X509_set_issuer_name(*x509, name); - // Certificate signed with our privte key + // Certificate signed with our private key if (X509_sign(*x509, pkey, EVP_sha256()) <= 0) return -1; @@ -408,7 +408,7 @@ int PiWebServerThread::CreateSSLCertificate() } if (generate_self_signed_x509(pkey, &x509) != 0) { - LOG_ERROR("Error generating of X509-Certificat."); + LOG_ERROR("Error generating of X509-Certificate."); return 2; } @@ -428,13 +428,13 @@ int PiWebServerThread::CreateSSLCertificate() LOG_ERROR("Error opening certificate."); return 4; } - // write cirtificate + // write certificate PEM_write_X509(x509_file, x509); fclose(x509_file); EVP_PKEY_free(pkey); X509_free(x509); - LOG_INFO("Create SSL Certifictate -certificate.pem- succesfull "); + LOG_INFO("Create SSL Certificate -certificate.pem- successful "); return 0; }