Merge against latest 2.3

This commit is contained in:
Bertrand Songis
2019-09-17 13:28:42 +02:00
247 changed files with 35085 additions and 42445 deletions
+2 -2
View File
@@ -602,7 +602,7 @@ class OpenTxSimulatorFactory: public SimulatorFactory
virtual Board::Type type()
{
#if defined(PCBX12S)
return Board::BOARD_X12S;
return Board::BOARD_HORUS_X12S;
#elif defined(PCBX10)
return Board::BOARD_X10;
#elif defined(PCBX7)
@@ -612,7 +612,7 @@ class OpenTxSimulatorFactory: public SimulatorFactory
#elif defined(PCBTARANIS)
return Board::BOARD_TARANIS_X9D;
#else
return Board::BOARD_STOCK;
return Board::BOARD_9X_M64;
#endif
}
};