Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-25 17:25:10 +03:00
Code Activity

Prep for Nightly (#4089)

Browse source 
* Prep for Nightly

* Compile fix

* Much nicer :)

* One more

* Fix

* Last one

* Cosmetics
This commit is contained in:
3djc 2016-12-03 09:36:51 +01:00 • committed by Bertrand Songis
parent 862ff2f80d
commit 35e199b579
7 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/CMakeLists.txt
View file

@ -27,6 +27,9 @@ if(DEBUG_STORAGE_IMPORT)
add_definitions(-DDEBUG_STORAGE_IMPORT) add_definitions(-DDEBUG_STORAGE_IMPORT)
message(STATUS "Storage import debugging enabled") message(STATUS "Storage import debugging enabled")
endif() endif()
if(DEBUG)
add_definitions(-DDEBUG)
endif()
option(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default option(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
if(TABLE_LAYOUT) if(TABLE_LAYOUT)

6
companion/src/constants.h
View file

@ -64,4 +64,10 @@ const char * const ARROW_UP = "\xE2\x86\x91";
const char * const ARROW_RIGHT = "\xE2\x86\x92"; const char * const ARROW_RIGHT = "\xE2\x86\x92";
const char * const ARROW_DOWN = "\xE2\x86\x93"; const char * const ARROW_DOWN = "\xE2\x86\x93";
#if defined(DEBUG)
#define HORUS_READY_FOR_RELEASE() true
#else
#define HORUS_READY_FOR_RELEASE() false
#endif
#endif // _CONSTANTS_H_ #endif // _CONSTANTS_H_

3
companion/src/helpers.cpp
View file

@ -820,7 +820,8 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
} }
BoardEnum board = GetCurrentFirmware()->getBoard(); BoardEnum board = GetCurrentFirmware()->getBoard();
SimulatorDialog * dialog; SimulatorDialog * dialog;
if (board == BOARD_HORUS) {
if (board == BOARD_HORUS && HORUS_READY_FOR_RELEASE()) {
dialog = new SimulatorDialogHorus(parent, simulator, flags); dialog = new SimulatorDialogHorus(parent, simulator, flags);
GetEepromInterface()->saveFile(*simuData, g.profile[g.id()].sdPath()); GetEepromInterface()->saveFile(*simuData, g.profile[g.id()].sdPath());
dialog->start(NULL); dialog->start(NULL);

6
companion/src/mainwindow.cpp
View file

@ -557,7 +557,7 @@ void MainWindow::openDocURL()
void MainWindow::openFile() void MainWindow::openFile()
{ {
QString fileFilter; QString fileFilter;
if (GetCurrentFirmware()->getBoard() == BOARD_HORUS) { if (GetCurrentFirmware()->getBoard() == BOARD_HORUS && HORUS_READY_FOR_RELEASE()) {
fileFilter = tr(OTX_FILES_FILTER); fileFilter = tr(OTX_FILES_FILTER);
} }
else { else {
@ -751,7 +751,7 @@ void MainWindow::loadBackup()
void MainWindow::readEeprom() void MainWindow::readEeprom()
{ {
if(GetCurrentFirmware()->getBoard()== BOARD_HORUS) { if(GetCurrentFirmware()->getBoard()== BOARD_HORUS && HORUS_READY_FOR_RELEASE()) {
// just an example // just an example
QString path = findMassstoragePath("RADIO"); QString path = findMassstoragePath("RADIO");
if (path.isEmpty()) { if (path.isEmpty()) {
@ -950,7 +950,7 @@ void MainWindow::updateMenus()
bool hasMdiChild = (activeMdiChild() != 0); bool hasMdiChild = (activeMdiChild() != 0);
bool hasSelection = (activeMdiChild() && activeMdiChild()->hasSelection()); bool hasSelection = (activeMdiChild() && activeMdiChild()->hasSelection());
if(false /*GetCurrentFirmware()->getBoard() == BOARD_HORUS*/) { if(GetCurrentFirmware()->getBoard() == BOARD_HORUS && !HORUS_READY_FOR_RELEASE()) {
newAct->setEnabled(false); newAct->setEnabled(false);
openAct->setEnabled(false); openAct->setEnabled(false);
saveAct->setEnabled(false); saveAct->setEnabled(false);

3
companion/src/mdichild.cpp
View file

@ -84,6 +84,9 @@ void MdiChild::eepromInterfaceChanged()
{ {
ui->modelsList->refreshList(); ui->modelsList->refreshList();
ui->SimulateTxButton->setEnabled(GetCurrentFirmware()/*firmware*/->getCapability(Simulation)); ui->SimulateTxButton->setEnabled(GetCurrentFirmware()/*firmware*/->getCapability(Simulation));
if (GetCurrentFirmware()->getBoard() == BOARD_HORUS && !HORUS_READY_FOR_RELEASE()) {
ui->SimulateTxButton->setDisabled(GetCurrentFirmware()/*firmware*/->getCapability(Simulation));
}
updateTitle(); updateTitle();
} }

2
companion/src/simulator.cpp
View file

@ -200,7 +200,7 @@ int main(int argc, char *argv[])
showMessage(QObject::tr("ERROR: Simulator %1 not found").arg(firmwareId), QMessageBox::Critical); showMessage(QObject::tr("ERROR: Simulator %1 not found").arg(firmwareId), QMessageBox::Critical);
return 2; return 2;
} }
if (factory->type() == BOARD_HORUS) if (factory->type() == BOARD_HORUS && HORUS_READY_FOR_RELEASE())
dialog = new SimulatorDialogHorus(NULL, factory->create()); dialog = new SimulatorDialogHorus(NULL, factory->create());
else if (factory->type() == BOARD_FLAMENCO) else if (factory->type() == BOARD_FLAMENCO)
dialog = new SimulatorDialogFlamenco(NULL, factory->create()); dialog = new SimulatorDialogFlamenco(NULL, factory->create());