From a0bc0fd2e12d98dd0764a075fb415f344de2adb4 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 24 Dec 2021 10:09:46 +0100 Subject: [PATCH] Use temporary SD card path for all radios using SD card storage --- companion/src/simulation/simulatorwidget.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index 365cb57d4..406e2bdbe 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -294,17 +294,20 @@ bool SimulatorWidget::setRadioData(RadioData * radioData) saveTempRadioData = (flags & SIMULATOR_FLAGS_STANDALONE); - if (IS_FAMILY_HORUS_OR_T16(m_board)) + // All radios use SD card data path from 2.6.0 on + bool hasSdCard = Boards::getCapability(m_board, Board::HasSDCard); + if (hasSdCard) ret = useTempDataPath(true); if (ret) { - if (radioDataPath.isEmpty()) { + if (!hasSdCard) { startupData.fill(0, Boards::getEEpromSize(m_board)); - if (firmware->getEEpromInterface()->save((uint8_t *)startupData.data(), *radioData, 0, firmware->getCapability(SimulatorVariant)) <= 0) { + if (firmware->getEEpromInterface()->save( + (uint8_t *)startupData.data(), *radioData, 0, + firmware->getCapability(SimulatorVariant)) <= 0) { ret = false; } - } - else { + } else { ret = saveRadioData(radioData, radioDataPath); } }