Skip to content

Commit b82eb6d

Browse files
committed
Ran spell checker
1 parent bcd86f7 commit b82eb6d

4 files changed

Lines changed: 41 additions & 12 deletions

File tree

.vscode/settings.json

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
11
{
2-
"sonarlint.pathToCompileCommands": "${workspaceFolder}\\compile_commands.json"
2+
"sonarlint.pathToCompileCommands": "${workspaceFolder}\\compile_commands.json",
3+
"cSpell.words": [
4+
"Adafruit",
5+
"CIPO",
6+
"COPI",
7+
"DISSLW",
8+
"GPINTEN",
9+
"GPPU",
10+
"HAEN",
11+
"INTPOL",
12+
"IPOL",
13+
"JTAG",
14+
"LOGD",
15+
"LOGI",
16+
"LOGV",
17+
"LOGW",
18+
"LSBFIRST",
19+
"MOSI",
20+
"MTCK",
21+
"MTDI",
22+
"MTDO",
23+
"MTMS",
24+
"NOSONAR",
25+
"OLAT",
26+
"PSENSOR",
27+
"RPMPS",
28+
"rssi",
29+
"tsens",
30+
"UHCI"
31+
]
332
}

include/LoadContainer.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class LoadContainer {
5050
inline ESTOP_TYPE_FAST getSafetyFlag() const { return (safetyFlag); }
5151
inline bool isPowerPositive() const { return (INA260::current_mA > 0); }
5252
inline bool isSteadyRPM() const {
53-
return (angularAccell_RPMPS < 20);
53+
return (angularAccel_RPMPS < 20);
5454
} // todo - steady power is actually more important
5555
inline bool isTargetRPMExceeded() const {
5656
constexpr uint_fast16_t TARGET_RPM = 2200; // todo
@@ -78,11 +78,11 @@ class LoadContainer {
7878
}
7979
inline void setRPM(int_fast16_t rpm) { this->currentRPM = rpm; }
8080
inline int_fast16_t getRPM() const { return this->currentRPM; }
81-
inline void setAngularAccell_RPMPS(int_fast16_t angularAccell_RPMPS) {
82-
this->angularAccell_RPMPS = angularAccell_RPMPS;
81+
inline void setAngularAccel_RPMPS(int_fast16_t angularAccel_RPMPS) {
82+
this->angularAccel_RPMPS = angularAccel_RPMPS;
8383
}
84-
inline int_fast16_t getAngularAccell_RPMPS() const {
85-
return this->angularAccell_RPMPS;
84+
inline int_fast16_t getAngularAccel_RPMPS() const {
85+
return this->angularAccel_RPMPS;
8686
}
8787

8888
static constexpr uint_fast8_t LOG_STRING_SIZE =
@@ -108,7 +108,7 @@ class LoadContainer {
108108
decFormatA, true); // 5 chars
109109
(void)logString.append(", dRPM/s: "); // 10 chars
110110

111-
etl::to_string(getAngularAccell_RPMPS(), logString, decFormatA,
111+
etl::to_string(getAngularAccel_RPMPS(), logString, decFormatA,
112112
true); // 5 chars
113113

114114
(void)logString.append(", SF: "); // 6 chars
@@ -126,7 +126,7 @@ class LoadContainer {
126126
ESTOP_TYPE_FAST safetyFlag = ESTOP_TYPE_FAST::NONE; // todo - make atomic?
127127
LoadComms &loadComms;
128128
// bool powerPositive = false;
129-
int_fast16_t angularAccell_RPMPS = 0; // todo
129+
int_fast16_t angularAccel_RPMPS = 0; // todo
130130

131131
/**
132132
* @brief Check for C++17 support, which allows us to verify if std::atomic

lib/2026-Controls_Core

src/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "MCP23008T.hpp"
2424
#define COMMS_STRATEGY_OLD 0
2525
#define COMMS_STRATEGY_NEW 1
26-
#define COMMS_STRATEGY_UCHI 2
26+
#define COMMS_STRATEGY_UHCI 2
2727
#define COMMS_STRATEGY COMMS_STRATEGY_NEW
2828
#if COMMS_STRATEGY == COMMS_STRATEGY_OLD
2929
# include "2026Core/Net/Net-Application/NTP.hpp"
@@ -34,7 +34,7 @@
3434
# include "2026Core/Net/NetAdapter_A.hpp"
3535
#elif COMMS_STRATEGY == COMMS_STRATEGY_NEW
3636
# include "2026Core/TurbinePacket/TurbinePacket.hpp"
37-
#elif COMMS_STRATEGY == COMMS_STRATEGY_UCHI
37+
#elif COMMS_STRATEGY == COMMS_STRATEGY_UHCI
3838
# include "2026Core/Net/Net-Link/AdapterUHCI.hpp"
3939
#else
4040
# error "Invalid COMMS_STRATEGY"
@@ -405,7 +405,7 @@ vTaskRecvData([[maybe_unused]] void *pvParameters) { // NOSONAR
405405
if (xQueueReceive(LoadComms::priorityDataQueue, &packet, 0) == pdPASS) {
406406
ESP_LOGV(TAG, "Received packet: rpm=%u", packet.rpm);
407407
load.setRPM(packet.rpm);
408-
load.setAngularAccell_RPMPS(packet.angularAccell_RPMPS);
408+
load.setAngularAccel_RPMPS(packet.angularAccel_RPMPS);
409409
}
410410

411411
BaseType_t xWasDelayed = xTaskDelayUntil(

0 commit comments

Comments
 (0)