Merge branch '2.3' into 3djc/T-Lite
# Conflicts: # companion/src/firmwares/boards.h # companion/src/firmwares/opentx/opentxeeprom.h # radio/src/gui/common/stdlcd/radio_hardware.cpp # radio/src/targets/common/arm/stm32/adc_driver.cpp # radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt # radio/src/targets/taranis/board.h # radio/src/targets/taranis/hal.h # radio/src/targets/taranis/keys_driver.cpp # radio/src/targets/taranis/lcd_driver_spi.cpp
This commit is contained in:
@@ -117,6 +117,7 @@ namespace Ui {
|
||||
class SimulatedUIWidgetJumperT18;
|
||||
class SimulatedUIWidgetTX16S;
|
||||
class SimulatedUIWidgetTX12;
|
||||
class SimulatedUIWidgetT8;
|
||||
}
|
||||
|
||||
class SimulatedUIWidget9X: public SimulatedUIWidget
|
||||
@@ -291,6 +292,17 @@ class SimulatedUIWidgetTX12: public SimulatedUIWidget
|
||||
Ui::SimulatedUIWidgetTX12 * ui;
|
||||
};
|
||||
|
||||
class SimulatedUIWidgetT8: public SimulatedUIWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SimulatedUIWidgetT8(SimulatorInterface * simulator, QWidget * parent = nullptr);
|
||||
virtual ~SimulatedUIWidgetT8();
|
||||
|
||||
private:
|
||||
Ui::SimulatedUIWidgetT8 * ui;
|
||||
};
|
||||
|
||||
class SimulatedUIWidgetTX16S: public SimulatedUIWidget
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user