Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for RX FS2A version with LQFP STM32 chip. #307

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix for RX FS2A version with LQFP STM32 chip. #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ce4e95
Fix for FS2A version with LQFP STM32 chip.
ajjjjjjjj Nov 20, 2022
8ffacf0
remove not used fixUpModel
ajjjjjjjj Jan 3, 2025
d02ddfd
DE translation fix
ajjjjjjjj Jan 3, 2025
eee0b7e
Merge branch 'master' into janek/fs2a-fix
ajjjjjjjj Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions radio/src/storage/storage_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ void storageDirty(uint8_t msk) {
#endif
}

void preModelLoad() {
void preModelLoad()
{
watchdogSuspend(500 /*5s*/);

#if defined(SDCARD)
Expand All @@ -51,18 +52,9 @@ void preModelLoad() {

pauseMixerCalculations();
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
static void fixUpModel() {
// Ensure that when rfProtocol is RF_PROTO_OFF the type of the module is MODULE_TYPE_NONE
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT && g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF)
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_NONE;
}
#endif

void postModelLoad(bool alarms) {
#if defined(PCBTARANIS) || defined(PCBHORUS)
fixUpModel();
#endif
void postModelLoad(bool alarms)
{
AUDIO_FLUSH();
flightReset(false);

Expand Down Expand Up @@ -106,7 +98,8 @@ void postModelLoad(bool alarms) {
SEND_FAILSAFE_1S();
}

void storageFlushCurrentModel() {
void storageFlushCurrentModel()
{
saveTimers();

for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) {
Expand Down
2 changes: 1 addition & 1 deletion radio/src/targets/flysky/AFHDS2A_a7105.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ void ActionAFHDS2A(void) {
goto Send_;
EndSendBIND123_: //-----------------------------------------------------------
A7105_SetPower();
A7105_SetTxRxMode(TXRX_OFF); // Turn LNA off since we are in near range and we want to prevent swamping
A7105_SetTxRxMode((packet_count & 0x40) ? TXRX_OFF : RX_EN); // Turn LNA off time to time since we are in near range and we want to prevent swamping
A7105_Strobe(A7105_RX);
EnableGIO();
RadioState++;
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/de.h.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@
#define TR_TEMP_CALIB "Temp. abgl."
#define TR_TIME "Uhrzeit:"
#define TR_MAXBAUDRATE "Baudrate"
#define TR_CRSF_ARMING_MODE "Armen via"
#define TR_CRSF_ARMING_MODE "Arm via"
#define LEN_CRSF_ARMING_MODES "\006"
#define TR_CRSF_ARMING_MODES TR_CH "5\0 " TR_SWITCH

Expand Down