piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Companion][Boards] Remove final usage of two function alias macros.

Browse Source
This commit is contained in:
Max Paperno
2018-09-19 06:47:36 -04:00
parent 681bc82185
commit f8afc40198
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/boards.h
-2
View File
@@ -179,8 +179,6 @@ class Boards
// temporary aliases for transition period, use Boards class instead.
#define getBoardCapability(b__, c__) Boards::getCapability(b__, c__)
#define getEEpromSize(b__) Boards::getEEpromSize(b__)
#define getSwitchInfo(b__, i__) Boards::getSwitchInfo(b__, i__)
#define IS_9X(board) (board==Board::BOARD_STOCK || board==Board::BOARD_M128)
#define IS_STOCK(board) (board==Board::BOARD_STOCK)
companion/src/firmwares/rawswitch.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
if (generalSettings)
swName = QString(generalSettings->switchName[qr.quot]);
if (swName.isEmpty())
swName = getSwitchInfo(board, qr.quot).name;
swName = Boards::getSwitchInfo(board, qr.quot).name;
return swName + directionIndicators.at(qr.rem > -1 && qr.rem < directionIndicators.size() ? qr.rem : 1);
}
else {
companion/src/simulation/simulatorwidget.cpp
+3 -3
View File
@@ -241,7 +241,7 @@ bool SimulatorWidget::setStartupData(const QByteArray & dataSource, bool fromFil
}
// Assume a byte array of radio data was passed, load it.
else if (!dataSource.isEmpty()) {
ret = firmware->getEEpromInterface()->load(simuData, (uint8_t *)dataSource.constData(), getEEpromSize(m_board));
ret = firmware->getEEpromInterface()->load(simuData, (uint8_t *)dataSource.constData(), Boards::getEEpromSize(m_board));
startupData = dataSource; // save the data for start()
}
// we're :-(
@@ -374,7 +374,7 @@ bool SimulatorWidget::saveTempData()
fh.close();
}
if (!firmware->getEEpromInterface()->load(radioData, (uint8_t *)startupData.constData(), getEEpromSize(m_board))) {
if (!firmware->getEEpromInterface()->load(radioData, (uint8_t *)startupData.constData(), Boards::getEEpromSize(m_board))) {
error = tr("Error saving data: could not get data from simulator interface.");
}
else {
@@ -489,7 +489,7 @@ void SimulatorWidget::onSimulatorStopped()
m_heartbeatTimer.invalidate();
if (simulator && !simulator->isRunning() && saveTempRadioData) {
startupData.fill(0, getEEpromSize(m_board));
startupData.fill(0, Boards::getEEpromSize(m_board));
simulator->readRadioData(startupData);
}
}