Skip to content

Commit f381339

Browse files
committed
Update IRFD to ITelemLink
1 parent a80d4b1 commit f381339

File tree

24 files changed

+79
-81
lines changed

24 files changed

+79
-81
lines changed

stm32h753iitx/.cproject

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<listOptionValue builtIn="false" value="../boardfiles/drivers/motor"/>
102102
<listOptionValue builtIn="false" value="../boardfiles/drivers/queue"/>
103103
<listOptionValue builtIn="false" value="../boardfiles/drivers/rc"/>
104-
<listOptionValue builtIn="false" value="../boardfiles/drivers/rfd"/>
104+
<listOptionValue builtIn="false" value="../boardfiles/drivers/telemlink"/>
105105
<listOptionValue builtIn="false" value="../boardfiles/drivers/gps"/>
106106
<listOptionValue builtIn="false" value="../boardfiles/drivers/systemutils"/>
107107
<listOptionValue builtIn="false" value="../boardfiles/model/inc"/>
@@ -250,7 +250,7 @@
250250
<listOptionValue builtIn="false" value="../boardfiles/drivers/motor"/>
251251
<listOptionValue builtIn="false" value="../boardfiles/drivers/queue"/>
252252
<listOptionValue builtIn="false" value="../boardfiles/drivers/rc"/>
253-
<listOptionValue builtIn="false" value="../boardfiles/drivers/rfd"/>
253+
<listOptionValue builtIn="false" value="../boardfiles/drivers/telemlink"/>
254254
<listOptionValue builtIn="false" value="../boardfiles/drivers/gps"/>
255255
<listOptionValue builtIn="false" value="../boardfiles/drivers/systemutils"/>
256256
<listOptionValue builtIn="false" value="../boardfiles/model/inc"/>
File renamed without changes.

stm32h753iitx/boardfiles/drivers/rfd/rfd.hpp renamed to stm32h753iitx/boardfiles/drivers/telemlink/rfd.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include "rfd_iface.hpp"
3+
#include "telemlink_iface.hpp"
44
#include "rfd_defines.hpp"
55
#include "stm32h7xx_hal.h"
66

7-
class RFD : public IRFD {
7+
class RFD : public ITelemLink {
88

99
public:
1010
static RFD* instance; // assumes only one instance defined at a time

stm32h753iitx/boardfiles/drivers/rfd/rfd_defines.hpp renamed to stm32h753iitx/boardfiles/drivers/telemlink/rfd_defines.hpp

File renamed without changes.

stm32h753iitx/boardfiles/model/inc/drivers.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern MotorControl *steeringMotorHandle;
3333
extern CRSFReceiver *rcHandle;
3434
extern GPS *gpsHandle;
3535
extern IMU *imuHandle;
36-
extern RFD *rfdHandle;
36+
extern RFD *telemLinkHandle;
3737
extern PowerModule *pmHandle;
3838

3939
extern MessageQueue<RCMotorControlMessage_t> *amRCQueueHandle;

stm32h753iitx/boardfiles/model/src/drivers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ MotorControl *steeringMotorHandle = nullptr;
6161

6262
GPS *gpsHandle = nullptr;
6363
CRSFReceiver *rcHandle = nullptr;
64-
RFD *rfdHandle = nullptr;
64+
RFD *telemLinkHandle = nullptr;
6565
IMU *imuHandle = nullptr;
6666
PowerModule *pmHandle = nullptr;
6767

@@ -115,7 +115,7 @@ void initDrivers()
115115
// Peripherals
116116
gpsHandle = new (&gpsStorage) GPS(&huart2);
117117
rcHandle = new (&rcStorage) CRSFReceiver(&huart4);
118-
rfdHandle = new (&rfdStorage) RFD(&huart1);
118+
telemLinkHandle = new (&rfdStorage) RFD(&huart1);
119119
imuHandle = new (&imuStorage) IMU(&hspi1, GPIOC, GPIO_PIN_5);
120120
pmHandle = new (&pmStorage) PowerModule(&hi2c1);
121121

@@ -140,7 +140,7 @@ void initDrivers()
140140
rcHandle->init();
141141
gpsHandle->init();
142142
imuHandle->init();
143-
rfdHandle->startReceive();
143+
telemLinkHandle->startReceive();
144144

145145
// Motor instance bindings
146146
leftAileronMotorInstance = {leftAileronMotorHandle, true, 0};

stm32h753iitx/boardfiles/model/src/managers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void initManagers()
4545
// TM initialization
4646
tmHandle = new (&tmHandleStorage) TelemetryManager(
4747
systemUtilsHandle,
48-
rfdHandle,
48+
telemLinkHandle,
4949
tmQueueHandle,
5050
amRCQueueHandle,
5151
messageBufferHandle

stm32h753iitx/boardfiles/override.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size) {
4646
rcHandle->parse();
4747
rcHandle->startDMA();
4848
}
49-
else if (huart == rfdHandle->getHuart()) {
50-
rfdHandle->receiveCallback(Size);
49+
else if (huart == telemLinkHandle->getHuart()) {
50+
telemLinkHandle->receiveCallback(Size);
5151
}
5252
// GPS dma callback
5353
else if (huart == gpsHandle->getHUART()) {

stm32l552xx/.cproject

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<listOptionValue builtIn="false" value="../boardfiles/drivers/motor"/>
9292
<listOptionValue builtIn="false" value="../boardfiles/drivers/queue"/>
9393
<listOptionValue builtIn="false" value="../boardfiles/drivers/rc"/>
94-
<listOptionValue builtIn="false" value="../boardfiles/drivers/rfd"/>
94+
<listOptionValue builtIn="false" value="../boardfiles/drivers/telemlink"/>
9595
<listOptionValue builtIn="false" value="../boardfiles/drivers/gps"/>
9696
<listOptionValue builtIn="false" value="../boardfiles/drivers/systemutils"/>
9797
<listOptionValue builtIn="false" value="../boardfiles/model/inc"/>
@@ -217,7 +217,7 @@
217217
<listOptionValue builtIn="false" value="../boardfiles/drivers/motor"/>
218218
<listOptionValue builtIn="false" value="../boardfiles/drivers/queue"/>
219219
<listOptionValue builtIn="false" value="../boardfiles/drivers/rc"/>
220-
<listOptionValue builtIn="false" value="../boardfiles/drivers/rfd"/>
220+
<listOptionValue builtIn="false" value="../boardfiles/drivers/telemlink"/>
221221
<listOptionValue builtIn="false" value="../boardfiles/drivers/gps"/>
222222
<listOptionValue builtIn="false" value="../boardfiles/drivers/systemutils"/>
223223
<listOptionValue builtIn="false" value="../boardfiles/model/inc"/>
@@ -234,8 +234,6 @@
234234
<listOptionValue builtIn="false" value="../FATFS/Target"/>
235235
<listOptionValue builtIn="false" value="../FATFS/App"/>
236236
<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FatFs/src"/>
237-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/boardfiles/drivers/rfd}&quot;"/>
238-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/boardfiles/drivers/imu}&quot;"/>
239237
</option>
240238
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.358133794" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
241239
</tool>
@@ -255,7 +253,7 @@
255253
<listOptionValue builtIn="false" value="../boardfiles/drivers/motor"/>
256254
<listOptionValue builtIn="false" value="../boardfiles/drivers/queue"/>
257255
<listOptionValue builtIn="false" value="../boardfiles/drivers/rc"/>
258-
<listOptionValue builtIn="false" value="../boardfiles/drivers/rfd"/>
256+
<listOptionValue builtIn="false" value="../boardfiles/drivers/telemlink"/>
259257
<listOptionValue builtIn="false" value="../boardfiles/drivers/gps"/>
260258
<listOptionValue builtIn="false" value="../boardfiles/drivers/systemutils"/>
261259
<listOptionValue builtIn="false" value="../boardfiles/model/inc"/>
File renamed without changes.

0 commit comments

Comments
 (0)