App Preferences dialog tabs fully functional, except for adding profiles.

Splash Editor fully functional. Improved handling of image formats remain.
Merged branch 'origin/next'
This commit is contained in:
Kjell Kernen
2014-02-10 16:59:49 +01:00
28 changed files with 786 additions and 408 deletions
+1
View File
@@ -317,3 +317,4 @@ Arold Reinders
Robert Miller Robert Miller
Aviomotive - www.aviomotive.com Aviomotive - www.aviomotive.com
Mark Gaskievicz Mark Gaskievicz
Roland Müller
+138 -105
View File
@@ -7,19 +7,128 @@
#include "splashlibrary.h" #include "splashlibrary.h"
#include "flashinterface.h" #include "flashinterface.h"
//*** Side Class ***
Side::Side(){ Side::Side(){
imageLabel = 0; imageLabel = 0;
fileNameEdit = 0; fileNameEdit = 0;
saveButton = 0; saveButton = 0;
source=new Source; saveToFileName = new QString("");
*source = UNDEFINED; source = new Source(UNDEFINED);
} }
void Side::copyImage( Side side ){ void Side::copyImage( Side side )
if ((*source!=UNDEFINED) && (*side.source!=UNDEFINED)) {
if ((*source!=UNDEFINED) && (*side.source!=UNDEFINED))
imageLabel->setPixmap(*side.imageLabel->pixmap()); imageLabel->setPixmap(*side.imageLabel->pixmap());
} }
bool Side::displayImage( QString fileName, Source pictSource )
{
QImage image;
if (fileName.isEmpty()) {
return false;
}
if (pictSource == FW ){
FlashInterface flash(fileName);
if (!flash.hasSplash())
return false;
else
image = flash.getSplash();
}
else {
image.load(fileName);
}
if (image.isNull()) {
return false;
}
if (imageLabel->width()==424) {
image=image.convertToFormat(QImage::Format_RGB32);
QRgb col;
int gray;
int width = image.width();
int height = image.height();
for (int i = 0; i < width; ++i) {
for (int j = 0; j < height; ++j) {
col = image.pixel(i, j);
gray = qGray(col);
image.setPixel(i, j, qRgb(gray, gray, gray));
}
}
imageLabel->setPixmap(QPixmap::fromImage(image.scaled(imageLabel->width()/2, imageLabel->height()/2)));
}
else {
imageLabel->setPixmap(QPixmap::fromImage(image.scaled(imageLabel->width()/2, imageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
}
switch (pictSource){
case FW:
fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));
*saveToFileName = fileName;
*source=FW;
break;
case PICT:
fileNameEdit->setText(QObject::tr("Pict: %1").arg(fileName));
*saveToFileName = fileName;
*source=PICT;
break;
case PROFILE:
fileNameEdit->setText(QObject::tr("Profile image"));
*saveToFileName = fileName;
*source=PROFILE;
break;
default:
break;
}
saveButton->setEnabled(true);
libraryButton->setEnabled(true);
invertButton->setEnabled(true);
return true;
}
bool Side::refreshImage()
{
return displayImage( *saveToFileName, *source );
}
bool Side::saveImage()
{
QSettings settings;
if (*source == FW )
{
FlashInterface flash(*saveToFileName);
if (!flash.hasSplash()) {
return false;
}
QImage image = imageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight());
if (flash.setSplash(image) && (flash.saveFlash(*saveToFileName) > 0)) {
settings.setValue("lastFlashDir", QFileInfo(*saveToFileName).dir().absolutePath());
}
else {
return false;
}
}
else if (*source == PICT) {
QImage image = imageLabel->pixmap()->toImage().scaled(imageLabel->width()/2, imageLabel->height()/2).convertToFormat(QImage::Format_Indexed8);
if (image.save(*saveToFileName)) {
settings.setValue("lastImagesDir", QFileInfo(*saveToFileName).dir().absolutePath());
}
else {
return false;
}
}
else if (*source == PROFILE) {
QImage image = imageLabel->pixmap()->toImage().scaled(imageLabel->width()/2, imageLabel->height()/2).convertToFormat(QImage::Format_Indexed8);
if (!image.save(*saveToFileName)) {
return false;
}
}
return true;
}
//*** customizeSplashDialog Class ***
customizeSplashDialog::customizeSplashDialog(QWidget *parent) : customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::customizeSplashDialog) ui(new Ui::customizeSplashDialog)
@@ -39,6 +148,7 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
left.invertButton = ui->leftInvertButton; left.invertButton = ui->leftInvertButton;
right.invertButton = ui->rightInvertButton; right.invertButton = ui->rightInvertButton;
loadProfile(left);
resize(0,0); resize(0,0);
} }
@@ -62,25 +172,10 @@ void customizeSplashDialog::loadFirmware(Side side)
QSettings settings; QSettings settings;
QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER); QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER);
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
QFile file(fileName); if (!side.displayImage( fileName, FW ))
if (fileName.isEmpty() || !file.exists()) QMessageBox::critical(this, tr("Error"), tr("Cannot load embedded FW image from %1.").arg(fileName));
return; else
FlashInterface flash(fileName);
if (!flash.hasSplash()) {
QMessageBox::information(this, tr("Error"), tr("Could not find bitmap to replace in file"));
return;
}
side.saveButton->setEnabled(true);
side.imageLabel->setPixmap(QPixmap::fromImage(flash.getSplash()));
side.imageLabel->setFixedSize(flash.getSplashWidth()*2,flash.getSplashHeight()*2);
side.fileNameEdit->setText(fileName);
settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath()); settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath());
*side.source=FW;
side.saveButton->setEnabled(true);
side.libraryButton->setEnabled(true);
side.invertButton->setEnabled(true);
} }
} }
@@ -96,46 +191,25 @@ void customizeSplashDialog::loadPicture(Side side)
QString fileName = QFileDialog::getOpenFileName(this, QString fileName = QFileDialog::getOpenFileName(this,
tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats)); tr("Open Image to load"), settings.value("lastImagesDir").toString(), tr("Images (%1)").arg(supportedImageFormats));
if (fileName.isEmpty()){ if (!fileName.isEmpty()) {
return; if (!side.displayImage( fileName, PICT ))
QMessageBox::critical(this, tr("Error"), tr("Cannot load the image file %1.").arg(fileName));
else
settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath());
} }
QImage image(fileName);
if (image.isNull()) {
QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName));
return;
}
if (side.imageLabel->width()==424) {
image=image.convertToFormat(QImage::Format_RGB32);
QRgb col;
int gray;
int width = image.width();
int height = image.height();
for (int i = 0; i < width; ++i)
{
for (int j = 0; j < height; ++j)
{
col = image.pixel(i, j);
gray = qGray(col);
image.setPixel(i, j, qRgb(gray, gray, gray));
}
}
side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2)));
} else {
side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
}
settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath());
side.fileNameEdit->setText(fileName);
*side.source=PICT;
side.saveButton->setEnabled(true);
side.libraryButton->setEnabled(true);
side.invertButton->setEnabled(true);
} }
void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);} void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);} void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
void customizeSplashDialog::loadProfile(Side side) void customizeSplashDialog::loadProfile(Side side)
{ {
QSettings settings;
QString fileName=settings.value("SplashFileName","").toString();
if (!fileName.isEmpty()) {
if (!side.displayImage( fileName, PROFILE ))
QMessageBox::critical(this, tr("Error"), tr("Cannot load the profile image %1.").arg(fileName));
}
} }
void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);} void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
@@ -143,67 +217,26 @@ void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicke
void customizeSplashDialog::libraryButton_clicked( Side side ) void customizeSplashDialog::libraryButton_clicked( Side side )
{ {
QString fileName; QString fileName;
splashLibrary *ld = new splashLibrary(this,&fileName); splashLibrary *ld = new splashLibrary(this,&fileName);
ld->exec(); ld->exec();
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
QImage image(fileName); if (!side.displayImage( fileName, UNDEFINED ))
if (image.isNull()) { QMessageBox::critical(this, tr("Error"), tr("Cannot load the library image %1.").arg(fileName));
QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName));
return;
}
if (side.imageLabel->width()==424) {
image=image.convertToFormat(QImage::Format_RGB32);
QRgb col;
int gray;
int width = image.width();
int height = image.height();
for (int i = 0; i < width; ++i)
{
for (int j = 0; j < height; ++j)
{
col = image.pixel(i, j);
gray = qGray(col);
image.setPixel(i, j, qRgb(gray, gray, gray));
}
}
side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2)));
} else {
side.imageLabel->setPixmap(QPixmap::fromImage(image.scaled(side.imageLabel->width()/2, side.imageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
}
} }
} }
void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);} void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);} void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
void customizeSplashDialog::saveButton_clicked(Side side) void customizeSplashDialog::saveButton_clicked( Side side )
{ {
QSettings settings; if (side.saveImage()){
QString fileName = side.fileNameEdit->text(); QMessageBox::information(this, tr("File Saved"), tr("The image was saved to the file %1").arg(*side.saveToFileName));
if ( !side.refreshImage()){
if (*side.source == FW) QMessageBox::critical(this, tr("Image Refresh Error"), tr("Failed to refresh image from file %1").arg(*side.saveToFileName));
{
FlashInterface flash(fileName);
if (!flash.hasSplash()) {
QMessageBox::critical(this, tr("Error"), tr("Could not store image in firmware file %1").arg(fileName));
return;
}
QImage image = side.imageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight());
if (flash.setSplash(image) && (flash.saveFlash(fileName) > 0))
settings.setValue("lastFlashDir", QFileInfo(fileName).dir().absolutePath());
else
QMessageBox::critical(this, tr("Error"), tr("Could not store image in firmware file %1").arg(fileName));
}
else if (*side.source == PICT)
{
if (!fileName.isEmpty()) {
QImage image = side.imageLabel->pixmap()->toImage().scaled(side.imageLabel->width()/2, side.imageLabel->height()/2).convertToFormat(QImage::Format_Indexed8);
if (image.save(fileName))
settings.setValue("lastImagesDir", QFileInfo(fileName).dir().absolutePath());
else
QMessageBox::critical(this, tr("Error"), tr("The image file %1 could not be stored").arg(fileName));
} }
} }
else
QMessageBox::critical(this, tr("File Save Error"), tr("Failed to write image to %1").arg(*side.saveToFileName));
} }
void customizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);} void customizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);}
+6
View File
@@ -17,6 +17,9 @@ class Side
public: public:
Side(); Side();
void copyImage( Side ); void copyImage( Side );
bool displayImage( QString fileName, Source source );
bool saveImage();
bool refreshImage();
QLabel *imageLabel; QLabel *imageLabel;
QLineEdit *fileNameEdit; QLineEdit *fileNameEdit;
@@ -24,6 +27,9 @@ public:
QPushButton *invertButton; QPushButton *invertButton;
QToolButton *libraryButton; QToolButton *libraryButton;
QString *saveToFileName;
private:
Source *source; Source *source;
}; };
+25 -20
View File
@@ -254,6 +254,16 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QPushButton" name="leftLoadProfileButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Load Profile</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="leftLoadFwButton"> <widget class="QPushButton" name="leftLoadFwButton">
<property name="text"> <property name="text">
@@ -268,16 +278,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="leftLoadProfileButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Load Profile</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
@@ -550,6 +550,16 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QPushButton" name="rightLoadProfileButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Load Profile</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="rightLoadFwButton"> <widget class="QPushButton" name="rightLoadFwButton">
<property name="enabled"> <property name="enabled">
@@ -567,16 +577,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="rightLoadProfileButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Load Profile</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
@@ -625,12 +625,17 @@
<tabstops> <tabstops>
<tabstop>leftFileNameEdit</tabstop> <tabstop>leftFileNameEdit</tabstop>
<tabstop>leftInvertButton</tabstop> <tabstop>leftInvertButton</tabstop>
<tabstop>leftLibraryButton</tabstop>
<tabstop>leftLoadProfileButton</tabstop>
<tabstop>leftLoadFwButton</tabstop>
<tabstop>leftLoadPictButton</tabstop> <tabstop>leftLoadPictButton</tabstop>
<tabstop>leftSaveButton</tabstop> <tabstop>leftSaveButton</tabstop>
<tabstop>copyLeftToRightButton</tabstop> <tabstop>copyLeftToRightButton</tabstop>
<tabstop>copyRightToLeftButton</tabstop> <tabstop>copyRightToLeftButton</tabstop>
<tabstop>rightFileNameEdit</tabstop> <tabstop>rightFileNameEdit</tabstop>
<tabstop>rightInvertButton</tabstop> <tabstop>rightInvertButton</tabstop>
<tabstop>rightLibraryButton</tabstop>
<tabstop>rightLoadProfileButton</tabstop>
<tabstop>rightLoadFwButton</tabstop> <tabstop>rightLoadFwButton</tabstop>
<tabstop>rightLoadPictButton</tabstop> <tabstop>rightLoadPictButton</tabstop>
<tabstop>rightSaveButton</tabstop> <tabstop>rightSaveButton</tabstop>
+6 -1
View File
@@ -883,8 +883,12 @@ class ModelData {
SwashRingData swashRingData; SwashRingData swashRingData;
unsigned int thrTraceSrc; unsigned int thrTraceSrc;
int8_t traineron; // 0 disable trainer, 1 allow trainer int8_t traineron; // 0 disable trainer, 1 allow trainer
unsigned int modelId; unsigned int modelId;
unsigned int switchWarningStates; unsigned int switchWarningStates;
unsigned int nSwToWarn;
unsigned int nPotsToWarn;
int potPosition[C9X_NUM_POTS];
bool displayText;
// TODO structure // TODO structure
char gvars_names[C9X_MAX_GVARS][6+1]; char gvars_names[C9X_MAX_GVARS][6+1];
bool gvars_popups[C9X_MAX_GVARS]; bool gvars_popups[C9X_MAX_GVARS];
@@ -1030,6 +1034,7 @@ enum Capability {
CSFunc, CSFunc,
LCDWidth, LCDWidth,
GetThrSwitch, GetThrSwitch,
HasDisplayText,
VirtualInputs, VirtualInputs,
LuaInputs, LuaInputs,
LimitsPer1000, LimitsPer1000,
+50 -38
View File
@@ -24,13 +24,13 @@
#define MAX_CURVES(board, version) (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 32 : 16) : O9X_MAX_CURVES) #define MAX_CURVES(board, version) (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 32 : 16) : O9X_MAX_CURVES)
#define MAX_GVARS(board, version) ((IS_ARM(board) && version >= 216) ? 9 : 5) #define MAX_GVARS(board, version) ((IS_ARM(board) && version >= 216) ? 9 : 5)
#define IS_RELEASE_21_MARCH_2013(board, version) (version >= 214 || (!IS_ARM(board) && version >= 213)) #define IS_AFTER_RELEASE_21_MARCH_2013(board, version) (version >= 214 || (!IS_ARM(board) && version >= 213))
#define IS_RELEASE_23_MARCH_2013(board, version) (version >= 214 || (board==BOARD_STOCK && version >= 213)) #define IS_AFTER_RELEASE_23_MARCH_2013(board, version) (version >= 214 || (board==BOARD_STOCK && version >= 213))
inline int switchIndex(int i, BoardEnum board, unsigned int version) inline int switchIndex(int i, BoardEnum board, unsigned int version)
{ {
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
if (!IS_TARANIS(board) && release21March2013) if (!IS_TARANIS(board) && afterrelease21March2013)
return (i<=3 ? i+3 : (i<=6 ? i-3 : i)); return (i<=3 ? i+3 : (i<=6 ? i-3 : i));
else else
return i; return i;
@@ -153,7 +153,7 @@ class SourcesConversionTable: public ConversionTable {
public: public:
SourcesConversionTable(BoardEnum board, unsigned int version, unsigned int variant, unsigned long flags=0) SourcesConversionTable(BoardEnum board, unsigned int version, unsigned int variant, unsigned long flags=0)
{ {
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
int val=0; int val=0;
@@ -177,19 +177,19 @@ class SourcesConversionTable: public ConversionTable {
for (int i=0; i<MAX_ROTARY_ENCODERS(board); i++) for (int i=0; i<MAX_ROTARY_ENCODERS(board); i++)
addConversion(RawSource(SOURCE_TYPE_ROTARY_ENCODER, 0), val++); addConversion(RawSource(SOURCE_TYPE_ROTARY_ENCODER, 0), val++);
if (!release21March2013) { if (!afterrelease21March2013) {
for (int i=0; i<NUM_STICKS; i++) for (int i=0; i<NUM_STICKS; i++)
addConversion(RawSource(SOURCE_TYPE_TRIM, i), val++); addConversion(RawSource(SOURCE_TYPE_TRIM, i), val++);
} }
addConversion(RawSource(SOURCE_TYPE_MAX), val++); addConversion(RawSource(SOURCE_TYPE_MAX), val++);
if (release21March2013) { if (afterrelease21March2013) {
for (int i=0; i<3; i++) for (int i=0; i<3; i++)
addConversion(RawSource(SOURCE_TYPE_CYC, i), val++); addConversion(RawSource(SOURCE_TYPE_CYC, i), val++);
} }
if (release21March2013) { if (afterrelease21March2013) {
for (int i=0; i<NUM_STICKS; i++) for (int i=0; i<NUM_STICKS; i++)
addConversion(RawSource(SOURCE_TYPE_TRIM, i), val++); addConversion(RawSource(SOURCE_TYPE_TRIM, i), val++);
} }
@@ -197,7 +197,7 @@ class SourcesConversionTable: public ConversionTable {
addConversion(RawSource(SOURCE_TYPE_SWITCH, 0), val++); addConversion(RawSource(SOURCE_TYPE_SWITCH, 0), val++);
if (!(flags & FLAG_NOSWITCHES)) { if (!(flags & FLAG_NOSWITCHES)) {
if (release21March2013) { if (afterrelease21March2013) {
for (int i=1; i<MAX_SWITCHES(board); i++) for (int i=1; i<MAX_SWITCHES(board); i++)
addConversion(RawSource(SOURCE_TYPE_SWITCH, i), val++); addConversion(RawSource(SOURCE_TYPE_SWITCH, i), val++);
} }
@@ -213,7 +213,7 @@ class SourcesConversionTable: public ConversionTable {
addConversion(RawSource(SOURCE_TYPE_CUSTOM_SWITCH, i), val++); addConversion(RawSource(SOURCE_TYPE_CUSTOM_SWITCH, i), val++);
} }
if (!release21March2013) { if (!afterrelease21March2013) {
for (int i=0; i<3; i++) for (int i=0; i<3; i++)
addConversion(RawSource(SOURCE_TYPE_CYC, i), val++); addConversion(RawSource(SOURCE_TYPE_CYC, i), val++);
} }
@@ -225,14 +225,14 @@ class SourcesConversionTable: public ConversionTable {
addConversion(RawSource(SOURCE_TYPE_CH, i), val++); addConversion(RawSource(SOURCE_TYPE_CH, i), val++);
if (!(flags & FLAG_NOTELEMETRY)) { if (!(flags & FLAG_NOTELEMETRY)) {
if (release21March2013) { if (afterrelease21March2013) {
if ((board != BOARD_STOCK && (board!=BOARD_M128 || version<215)) || (variant & GVARS_VARIANT)) { if ((board != BOARD_STOCK && (board!=BOARD_M128 || version<215)) || (variant & GVARS_VARIANT)) {
for (int i=0; i<MAX_GVARS(board, version); i++) for (int i=0; i<MAX_GVARS(board, version); i++)
addConversion(RawSource(SOURCE_TYPE_GVAR, i), val++); addConversion(RawSource(SOURCE_TYPE_GVAR, i), val++);
} }
} }
if (release21March2013) if (afterrelease21March2013)
addConversion(RawSource(SOURCE_TYPE_TELEMETRY, 0), val++); addConversion(RawSource(SOURCE_TYPE_TELEMETRY, 0), val++);
for (int i=1; i<TELEMETRY_SOURCE_ACC; i++) for (int i=1; i<TELEMETRY_SOURCE_ACC; i++)
@@ -690,7 +690,7 @@ class MixField: public TransformedField {
internalField.Append(new ZCharField<6>(mix.name)); internalField.Append(new ZCharField<6>(mix.name));
} }
} }
else if (IS_DBLRAM(board, version) && IS_RELEASE_23_MARCH_2013(board, version)) { else if (IS_DBLRAM(board, version) && IS_AFTER_RELEASE_23_MARCH_2013(board, version)) {
internalField.Append(new UnsignedField<4>(_destCh)); internalField.Append(new UnsignedField<4>(_destCh));
internalField.Append(new BoolField<1>(_curveMode)); internalField.Append(new BoolField<1>(_curveMode));
internalField.Append(new BoolField<1>(mix.noExpo)); internalField.Append(new BoolField<1>(mix.noExpo));
@@ -849,7 +849,7 @@ class ExpoField: public TransformedField {
} }
internalField.Append(new SignedField<8>(_curveParam)); internalField.Append(new SignedField<8>(_curveParam));
} }
else if (IS_DBLRAM(board, version) && IS_RELEASE_23_MARCH_2013(board, version)) { else if (IS_DBLRAM(board, version) && IS_AFTER_RELEASE_23_MARCH_2013(board, version)) {
internalField.Append(new UnsignedField<2>(expo.mode)); internalField.Append(new UnsignedField<2>(expo.mode));
internalField.Append(new UnsignedField<2>(expo.chn)); internalField.Append(new UnsignedField<2>(expo.chn));
internalField.Append(new BoolField<1>(_curveMode)); internalField.Append(new BoolField<1>(_curveMode));
@@ -1051,9 +1051,9 @@ class LogicalSwitchesFunctionsTable: public ConversionTable {
LogicalSwitchesFunctionsTable(BoardEnum board, unsigned int version) LogicalSwitchesFunctionsTable(BoardEnum board, unsigned int version)
{ {
int val=0; int val=0;
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
addConversion(LS_FN_OFF, val++); addConversion(LS_FN_OFF, val++);
if (release21March2013) if (afterrelease21March2013)
addConversion(LS_FN_VEQUAL, val++); addConversion(LS_FN_VEQUAL, val++);
addConversion(LS_FN_VPOS, val++); addConversion(LS_FN_VPOS, val++);
addConversion(LS_FN_VNEG, val++); addConversion(LS_FN_VNEG, val++);
@@ -1065,11 +1065,11 @@ class LogicalSwitchesFunctionsTable: public ConversionTable {
addConversion(LS_FN_XOR, val++); addConversion(LS_FN_XOR, val++);
if (IS_ARM(board) && version >= 216) addConversion(LS_FN_STAY, val++); if (IS_ARM(board) && version >= 216) addConversion(LS_FN_STAY, val++);
addConversion(LS_FN_EQUAL, val++); addConversion(LS_FN_EQUAL, val++);
if (!release21March2013) if (!afterrelease21March2013)
addConversion(LS_FN_NEQUAL, val++); addConversion(LS_FN_NEQUAL, val++);
addConversion(LS_FN_GREATER, val++); addConversion(LS_FN_GREATER, val++);
addConversion(LS_FN_LESS, val++); addConversion(LS_FN_LESS, val++);
if (!release21March2013) { if (!afterrelease21March2013) {
addConversion(LS_FN_EGREATER, val++); addConversion(LS_FN_EGREATER, val++);
addConversion(LS_FN_ELESS, val++); addConversion(LS_FN_ELESS, val++);
} }
@@ -1371,20 +1371,17 @@ class SwitchesWarningField: public TransformedField {
virtual void beforeExport() virtual void beforeExport()
{ {
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version);
if (release21March2013) {
_sw = (sw & 0xC1) + ((sw & 0x30) >> 3) + ((sw & 0x0E) << 2);
}
else {
_sw = sw; _sw = sw;
}
} }
virtual void afterImport() virtual void afterImport()
{ {
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
if (release21March2013) { if (afterrelease21March2013 && version < 216) {
sw = (_sw & 0xC1) + ((_sw & 0x38) >> 2) + ((_sw & 0x06) << 3); sw = _sw >> 1;
}
else if (!afterrelease21March2013) {
sw = ((_sw & 0x30) >> 4) + ((_sw & 0x0E) << 1) + ((_sw & 0xC0) >> 1);
} }
else { else {
sw = _sw; sw = _sw;
@@ -1784,8 +1781,8 @@ class FrskyScreenField: public DataField {
{ {
_screen = screen; _screen = screen;
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
if (!release21March2013) { if (!afterrelease21March2013) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
if (_screen.body.bars[i].source > 0) if (_screen.body.bars[i].source > 0)
_screen.body.bars[i].source--; _screen.body.bars[i].source--;
@@ -1809,12 +1806,12 @@ class FrskyScreenField: public DataField {
{ {
_screen = screen; _screen = screen;
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
// NOTA: screen.type should have been imported first! // NOTA: screen.type should have been imported first!
if (screen.type == 0) { if (screen.type == 0) {
numbers.ImportBits(input); numbers.ImportBits(input);
if (!release21March2013) { if (!afterrelease21March2013) {
int columns=(IS_TARANIS(board) ? 3:2); int columns=(IS_TARANIS(board) ? 3:2);
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
for (int j=0; j<columns;j++) { for (int j=0; j<columns;j++) {
@@ -1826,7 +1823,7 @@ class FrskyScreenField: public DataField {
} }
else { else {
bars.ImportBits(input); bars.ImportBits(input);
if (!release21March2013) { if (!afterrelease21March2013) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
if (_screen.body.bars[i].source > 0) if (_screen.body.bars[i].source > 0)
_screen.body.bars[i].source++; _screen.body.bars[i].source++;
@@ -2016,9 +2013,9 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
else else
internalField.Append(new ZCharField<10>(modelData.name)); internalField.Append(new ZCharField<10>(modelData.name));
bool release21March2013 = IS_RELEASE_21_MARCH_2013(board, version); bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version);
if (release21March2013) if (afterrelease21March2013)
internalField.Append(new UnsignedField<8>(modelData.modelId)); internalField.Append(new UnsignedField<8>(modelData.modelId));
if (IS_TARANIS(board) && version >= 215) { if (IS_TARANIS(board) && version >= 215) {
@@ -2035,7 +2032,7 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
internalField.Append(new SpareBitsField<4>()); internalField.Append(new SpareBitsField<4>());
internalField.Append(new SignedField<16>(modelData.timers[i].pvalue)); internalField.Append(new SignedField<16>(modelData.timers[i].pvalue));
} }
else if (release21March2013) { else if (afterrelease21March2013) {
internalField.Append(new UnsignedField<12>(modelData.timers[i].val)); internalField.Append(new UnsignedField<12>(modelData.timers[i].val));
internalField.Append(new BoolField<1>((bool &)modelData.timers[i].countdownBeep)); internalField.Append(new BoolField<1>((bool &)modelData.timers[i].countdownBeep));
internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep)); internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
@@ -2077,7 +2074,7 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
internalField.Append(new BoolField<1>(modelData.disableThrottleWarning)); internalField.Append(new BoolField<1>(modelData.disableThrottleWarning));
if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216)) if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216))
internalField.Append(new SpareBitsField<1>()); internalField.Append(new BoolField<1>(modelData.displayText));
else else
internalField.Append(new BoolField<1>(modelData.moduleData[0].ppmPulsePol)); internalField.Append(new BoolField<1>(modelData.moduleData[0].ppmPulsePol));
@@ -2119,15 +2116,19 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
internalField.Append(new UnsignedField<8>(modelData.thrTraceSrc)); internalField.Append(new UnsignedField<8>(modelData.thrTraceSrc));
if (!release21March2013) { if (!afterrelease21March2013) {
internalField.Append(new UnsignedField<8>(modelData.modelId)); internalField.Append(new UnsignedField<8>(modelData.modelId));
} }
if (IS_TARANIS(board)) if (IS_TARANIS(board))
internalField.Append(new UnsignedField<16>(modelData.switchWarningStates)); internalField.Append(new SwitchesWarningField<16>(modelData.switchWarningStates, board, version));
else else
internalField.Append(new SwitchesWarningField<8>(modelData.switchWarningStates, board, version)); internalField.Append(new SwitchesWarningField<8>(modelData.switchWarningStates, board, version));
if (version >= 216) {
internalField.Append(new UnsignedField<8>(modelData.nSwToWarn));
}
if ((board == BOARD_STOCK || (board == BOARD_M128 && version >= 215)) && (variant & GVARS_VARIANT)) { if ((board == BOARD_STOCK || (board == BOARD_M128 && version >= 215)) && (variant & GVARS_VARIANT)) {
for (int i=0; i<MAX_GVARS(board, version); i++) { for (int i=0; i<MAX_GVARS(board, version); i++) {
// on M64 GVARS are common to all phases, and there is no name // on M64 GVARS are common to all phases, and there is no name
@@ -2178,6 +2179,13 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
} }
} }
if (board==BOARD_SKY9X && version >= 216) {
internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn));
for (int i=0; i < GetEepromInterface()->getCapability(Pots); i++) {
internalField.Append(new SignedField<8>(modelData.potPosition[i]));
}
}
if (IS_TARANIS(board)) { if (IS_TARANIS(board)) {
for (int i=0; i<MAX_CURVES(board, version); i++) { for (int i=0; i<MAX_CURVES(board, version); i++) {
internalField.Append(new ZCharField<6>(modelData.curves[i].name)); internalField.Append(new ZCharField<6>(modelData.curves[i].name));
@@ -2189,6 +2197,10 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
internalField.Append(new SpareBitsField<720>()); internalField.Append(new SpareBitsField<720>());
for (int i=0; i<32; i++) for (int i=0; i<32; i++)
internalField.Append(new ZCharField<4>(modelData.inputNames[i])); internalField.Append(new ZCharField<4>(modelData.inputNames[i]));
internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn));
for (int i=0; i < GetEepromInterface()->getCapability(Pots); i++) {
internalField.Append(new SignedField<8>(modelData.potPosition[i]));
}
} }
} }
@@ -671,6 +671,7 @@ int Open9xInterface::getCapability(const Capability capability)
return (IS_TARANIS(board) ? 212 : 128) ; return (IS_TARANIS(board) ? 212 : 128) ;
case GetThrSwitch: case GetThrSwitch:
return (IS_TARANIS(board) ? DSW_SF1 : DSW_THR) ; return (IS_TARANIS(board) ? DSW_SF1 : DSW_THR) ;
case HasDisplayText:
case VirtualInputs: case VirtualInputs:
return IS_TARANIS(board) ? 32 : 0; return IS_TARANIS(board) ? 32 : 0;
case LuaInputs: case LuaInputs:
+10 -8
View File
@@ -1829,6 +1829,9 @@ void MainWindow::createActions()
connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile())); connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile()));
} }
updateProfilesActions(); updateProfilesActions();
createProfileAct = new QAction(tr("New Profile"), this);
createProfileAct->setStatusTip(tr("Create a new Radio Setting Profile"));
connect(createProfileAct, SIGNAL(triggered()), this, SLOT(createProfile()));
classicThemeAct = new QAction(tr("Classic"), this); classicThemeAct = new QAction(tr("Classic"), this);
classicThemeAct->setStatusTip(tr("The multicolor classical Companion icon theme")); classicThemeAct->setStatusTip(tr("The multicolor classical Companion icon theme"));
@@ -1913,7 +1916,6 @@ void MainWindow::createMenus()
{ {
QMenu *recentFileMenu=new QMenu(tr("Recent Files")); QMenu *recentFileMenu=new QMenu(tr("Recent Files"));
QMenu *profilesMenu=new QMenu(tr("Firmware Profiles"));
QMenu *languageMenu=new QMenu(tr("Set Menu Language")); QMenu *languageMenu=new QMenu(tr("Set Menu Language"));
QMenu *themeMenu=new QMenu(tr("Set Icon Theme")); QMenu *themeMenu=new QMenu(tr("Set Icon Theme"));
QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size")); QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"));
@@ -1935,11 +1937,7 @@ void MainWindow::createMenus()
fileMenu->addAction(compareAct); fileMenu->addAction(compareAct);
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(fwPreferencesAct); fileMenu->addAction(fwPreferencesAct);
fileMenu->addMenu(profilesMenu); fileMenu->addMenu(createProfilesMenu());
profilesMenu->setIcon(CompanionIcon("profiles.png"));
for (int i=0; i<MAX_PROFILES; ++i)
profilesMenu->addAction(profileActs[i]);
fileMenu->addAction(exitAct); fileMenu->addAction(exitAct);
editMenu = menuBar()->addMenu(tr("&Edit")); editMenu = menuBar()->addMenu(tr("&Edit"));
@@ -2016,9 +2014,11 @@ QMenu *MainWindow::createRecentFileMenu()
QMenu *MainWindow::createProfilesMenu() QMenu *MainWindow::createProfilesMenu()
{ {
QMenu *profilesMenu = new QMenu(this); QMenu *profilesMenu=new QMenu(tr("Radio Settings Profiles"));
for ( int i = 0; i < MAX_PROFILES; ++i) for ( int i = 0; i < MAX_PROFILES; ++i)
profilesMenu->addAction(profileActs[i]); profilesMenu->addAction(profileActs[i]);
profilesMenu->addAction(createProfileAct);
profilesMenu->setIcon(CompanionIcon("profiles.png"));
return profilesMenu; return profilesMenu;
} }
@@ -2199,9 +2199,11 @@ void MainWindow::updateProfilesActions()
} }
settings.endGroup(); settings.endGroup();
} }
// separatorAct->setVisible(numRecentFiles > 0);
} }
void MainWindow::createProfile()
{
}
QString MainWindow::strippedName(const QString &fullFileName) QString MainWindow::strippedName(const QString &fullFileName)
{ {
+2
View File
@@ -150,6 +150,7 @@ private slots:
void appPreferences(); void appPreferences();
void fwPreferences(); void fwPreferences();
void updateMenus(); void updateMenus();
void createProfile();
MdiChild *createMdiChild(); MdiChild *createMdiChild();
void setActiveSubWindow(QWidget *window); void setActiveSubWindow(QWidget *window);
QMenu * createRecentFileMenu(); QMenu * createRecentFileMenu();
@@ -252,6 +253,7 @@ private:
QAction *logsAct; QAction *logsAct;
QAction *recentFileActs[MAX_RECENT]; QAction *recentFileActs[MAX_RECENT];
QAction *profileActs[MAX_PROFILES]; QAction *profileActs[MAX_PROFILES];
QAction *createProfileAct;
QAction *classicThemeAct; QAction *classicThemeAct;
QAction *monoThemeAct; QAction *monoThemeAct;
QAction *monoBlueThemeAct; QAction *monoBlueThemeAct;
+114 -24
View File
@@ -392,6 +392,10 @@ Setup::Setup(QWidget *parent, ModelData & model):
ui->modelImage_label->hide(); ui->modelImage_label->hide();
ui->imagePreview->hide(); ui->imagePreview->hide();
} }
if (!GetEepromInterface()->getCapability(HasDisplayText)) {
ui->displayText->hide();
}
// Beep Center checkboxes // Beep Center checkboxes
int analogs = 4 + GetEepromInterface()->getCapability(Pots); int analogs = 4 + GetEepromInterface()->getCapability(Pots);
@@ -403,14 +407,12 @@ Setup::Setup(QWidget *parent, ModelData & model):
connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onBeepCenterToggled(bool))); connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onBeepCenterToggled(bool)));
centerBeepCheckboxes << checkbox; centerBeepCheckboxes << checkbox;
} }
ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, analogs+GetEepromInterface()->getCapability(RotaryEncoders));
// Startup switches warnings // Startup switches warnings
ui->switchesStartupWarning->setProperty("index", 0);
connect(ui->switchesStartupWarning, SIGNAL(currentIndexChanged(int)), this, SLOT(startupSwitchEdited(int)));
for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) { for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) {
QLabel * label = new QLabel(); QLabel * label = new QLabel(this);
QSlider * slider = new QSlider(); QSlider * slider = new QSlider(this);
QCheckBox * cb = new QCheckBox(this);
slider->setProperty("index", i+1); slider->setProperty("index", i+1);
slider->setOrientation(Qt::Vertical); slider->setOrientation(Qt::Vertical);
slider->setMinimum(0); slider->setMinimum(0);
@@ -429,13 +431,35 @@ Setup::Setup(QWidget *parent, ModelData & model):
label->setText(switches9X[i]); label->setText(switches9X[i]);
slider->setMaximum(i==0 ? 2 : 1); slider->setMaximum(i==0 ? 2 : 1);
} }
cb->setProperty("index", i+1);
ui->switchesStartupLayout->addWidget(label, 0, i+1); ui->switchesStartupLayout->addWidget(label, 0, i+1);
ui->switchesStartupLayout->setAlignment(label, Qt::AlignCenter);
ui->switchesStartupLayout->addWidget(slider, 1, i+1); ui->switchesStartupLayout->addWidget(slider, 1, i+1);
ui->switchesStartupLayout->setAlignment(slider, Qt::AlignCenter);
ui->switchesStartupLayout->addWidget(cb, 2, i+1);
ui->switchesStartupLayout->setAlignment(cb, Qt::AlignCenter);
connect(slider, SIGNAL(valueChanged(int)), this, SLOT(startupSwitchEdited(int))); connect(slider, SIGNAL(valueChanged(int)), this, SLOT(startupSwitchEdited(int)));
connect(cb, SIGNAL(toggled(bool)), this, SLOT(startupSwitchToggled(bool)));
startupSwitchesSliders << slider; startupSwitchesSliders << slider;
startupSwitchesCheckboxes << cb;
} }
ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, GetEepromInterface()->getCapability(Switches)); ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, GetEepromInterface()->getCapability(Switches));
// Pot warnings
if(IS_TARANIS(GetEepromInterface()->getBoard())) {
for (int i=0; i<GetEepromInterface()->getCapability(Pots); i++) {
QCheckBox * cb = new QCheckBox(this);
cb->setProperty("index", i+1);
cb->setText(AnalogString(i+4));
ui->potWarningLayout->addWidget(cb, 0, i+1);
connect(cb, SIGNAL(toggled(bool)), this, SLOT(potWarningToggled(bool)));
potWarningCheckboxes << cb;
}
}
else {
ui->label_potWarning->hide();
ui->potWarningMode->hide();
}
lock = false; lock = false;
} }
@@ -533,9 +557,14 @@ void Setup::update()
ui->throttleTrim->setChecked(model.thrTrim); ui->throttleTrim->setChecked(model.thrTrim);
ui->extendedLimits->setChecked(model.extendedLimits); ui->extendedLimits->setChecked(model.extendedLimits);
ui->extendedTrims->setChecked(model.extendedTrims); ui->extendedTrims->setChecked(model.extendedTrims);
ui->displayText->setChecked(model.displayText);
updateBeepCenter(); updateBeepCenter();
updateStartupSwitches(); updateStartupSwitches();
if(IS_TARANIS(GetEepromInterface()->getBoard())) {
updatePotWarnings();
}
for (int i=0; i<C9X_MAX_TIMERS; i++) for (int i=0; i<C9X_MAX_TIMERS; i++)
timers[i]->update(); timers[i]->update();
@@ -557,13 +586,13 @@ void Setup::updateStartupSwitches()
lock = true; lock = true;
unsigned int switchStates = model.switchWarningStates; unsigned int switchStates = model.switchWarningStates;
bool enabled = !(switchStates & 0x01);
ui->switchesStartupWarning->setCurrentIndex(switchStates & 0x01);
switchStates >>= 1;
for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) { for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) {
QSlider * slider = startupSwitchesSliders[i]; QSlider * slider = startupSwitchesSliders[i];
QCheckBox * cb = startupSwitchesCheckboxes[i];
bool enabled = !(model.nSwToWarn & (1 << i));
slider->setEnabled(enabled); slider->setEnabled(enabled);
cb->setChecked(enabled);
if (IS_TARANIS(GetEepromInterface()->getBoard())) { if (IS_TARANIS(GetEepromInterface()->getBoard())) {
slider->setValue(i==5 ? (switchStates & 0x3)/2 : switchStates & 0x3); slider->setValue(i==5 ? (switchStates & 0x3)/2 : switchStates & 0x3);
switchStates >>= 2; switchStates >>= 2;
@@ -584,36 +613,31 @@ void Setup::startupSwitchEdited(int value)
unsigned int mask; unsigned int mask;
int index = sender()->property("index").toInt(); int index = sender()->property("index").toInt();
if (index == 0) { if (IS_TARANIS(GetEepromInterface()->getBoard())) {
mask = 0x01; if (index == 6) {
} shift = (index - 1) * 2;
else if (IS_TARANIS(GetEepromInterface()->getBoard())) { mask = 0x02 << shift;
if (index == 6) shift++;
mask = 0x02 << (index*2 - 1); }
else { else {
shift = index*2 - 1; shift = (index - 1) * 2;
mask = 0x03 << shift; mask = 0x03 << shift;
} }
} }
else { else {
if (index == 1) { if (index == 1) {
shift = 1; mask = 0x03;
mask = 0x03 << shift;
} }
else { else {
mask = 0x01 << (index+1); shift = index;
mask = 0x01 << shift;
} }
} }
model.switchWarningStates &= ~mask; model.switchWarningStates &= ~mask;
if (value) { if (value) {
if (shift == 0) { model.switchWarningStates |= (value << shift);
model.switchWarningStates |= mask;
}
else {
model.switchWarningStates |= (value << shift);
}
} }
updateStartupSwitches(); updateStartupSwitches();
@@ -621,6 +645,72 @@ void Setup::startupSwitchEdited(int value)
} }
} }
void Setup::startupSwitchToggled(bool checked)
{
if (!lock) {
int index = sender()->property("index").toInt()-1;
if (checked)
model.nSwToWarn &= ~(1 << index);
else
model.nSwToWarn |= (1 << index);
updateStartupSwitches();
emit modified();
}
}
void Setup::updatePotWarnings()
{
lock = true;
int mode = model.nPotsToWarn >> 6;
ui->potWarningMode->setCurrentIndex(mode);
if (mode == 0)
model.nPotsToWarn = 0x3F;
for (int i=0; i<potWarningCheckboxes.size(); i++) {
bool enabled = !(model.nPotsToWarn & (1 << i));
potWarningCheckboxes[i]->setChecked(enabled);
potWarningCheckboxes[i]->setDisabled(mode == 0);
}
lock = false;
}
void Setup::potWarningToggled(bool checked)
{
if (!lock) {
int index = sender()->property("index").toInt()-1;
if(checked)
model.nPotsToWarn &= ~(1 << index);
else
model.nPotsToWarn |= (1 << index);
updatePotWarnings();
emit modified();
}
}
void Setup::on_potWarningMode_currentIndexChanged(int index)
{
if (!lock) {
int mask = 0xC0;
model.nPotsToWarn = model.nPotsToWarn & ~mask;
model.nPotsToWarn = model.nPotsToWarn | ((index << 6) & mask);
updatePotWarnings();
emit modified();
}
}
void Setup::on_displayText_toggled(bool checked)
{
model.displayText = checked;
emit modified();
}
void Setup::on_throttleTrim_toggled(bool checked) void Setup::on_throttleTrim_toggled(bool checked)
{ {
model.thrTrim = checked; model.thrTrim = checked;
+8
View File
@@ -6,6 +6,7 @@
#include <QCheckBox> #include <QCheckBox>
#include <QSlider> #include <QSlider>
#include <QSpinBox> #include <QSpinBox>
#include <QLabel>
namespace Ui { namespace Ui {
class Setup; class Setup;
@@ -82,19 +83,26 @@ class Setup : public ModelPanel
void on_extendedTrims_toggled(bool checked); void on_extendedTrims_toggled(bool checked);
void on_throttleWarning_toggled(bool checked); void on_throttleWarning_toggled(bool checked);
void on_throttleReverse_toggled(bool checked); void on_throttleReverse_toggled(bool checked);
void on_displayText_toggled(bool checked);
void on_image_currentIndexChanged(int index); void on_image_currentIndexChanged(int index);
void on_trimIncrement_currentIndexChanged(int index); void on_trimIncrement_currentIndexChanged(int index);
void onBeepCenterToggled(bool checked); void onBeepCenterToggled(bool checked);
void startupSwitchEdited(int value); void startupSwitchEdited(int value);
void startupSwitchToggled(bool checked);
void potWarningToggled(bool checked);
void on_potWarningMode_currentIndexChanged(int index);
void onChildModified(); void onChildModified();
private: private:
Ui::Setup *ui; Ui::Setup *ui;
QVector<QSlider *> startupSwitchesSliders; QVector<QSlider *> startupSwitchesSliders;
QVector<QCheckBox *> startupSwitchesCheckboxes;
QVector<QCheckBox *> potWarningCheckboxes;
QVector<QCheckBox *> centerBeepCheckboxes; QVector<QCheckBox *> centerBeepCheckboxes;
ModulePanel * modules[C9X_NUM_MODULES+1]; ModulePanel * modules[C9X_NUM_MODULES+1];
TimerPanel * timers[C9X_MAX_TIMERS]; TimerPanel * timers[C9X_MAX_TIMERS];
void updateStartupSwitches(); void updateStartupSwitches();
void updatePotWarnings();
void updateBeepCenter(); void updateBeepCenter();
}; };
+156 -130
View File
@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>782</width> <width>787</width>
<height>334</height> <height>727</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -16,134 +16,6 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Model Name</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_timer2">
<property name="text">
<string>Timer2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Timer1</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_ttrace">
<property name="text">
<string>Throttle Source</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="swwarn_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Switch startup Warning</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Center beep</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="1">
<layout class="QGridLayout" name="centerBeepLayout"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Trim Increment</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1">
<layout class="QGridLayout" name="switchesStartupLayout" rowstretch="0,0" columnstretch="0">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item row="1" column="0">
<widget class="QComboBox" name="switchesStartupWarning">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>ON</string>
</property>
</item>
<item>
<property name="text">
<string>OFF</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="switchesStartupWarning_Label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Check</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_37" columnstretch="0,0,0,0,0,0"> <layout class="QGridLayout" name="gridLayout_37" columnstretch="0,0,0,0,0,0">
<item row="0" column="3"> <item row="0" column="3">
@@ -231,6 +103,85 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Model Name</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_timer2">
<property name="text">
<string>Timer2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Timer1</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_ttrace">
<property name="text">
<string>Throttle Source</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="swwarn_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Switch Warnings</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Center beep</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="7" column="1">
<layout class="QGridLayout" name="centerBeepLayout"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Trim Increment</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1"> <item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
@@ -288,6 +239,29 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="displayText">
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Display Checklist</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
@@ -353,6 +327,58 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="1">
<layout class="QGridLayout" name="switchesStartupLayout" rowstretch="0" columnstretch="0">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
</layout>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_potWarning">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Pot Warnings</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="1">
<layout class="QGridLayout" name="potWarningLayout">
<item row="0" column="0">
<widget class="QComboBox" name="potWarningMode">
<item>
<property name="text">
<string>OFF</string>
</property>
</item>
<item>
<property name="text">
<string>Manual</string>
</property>
</item>
<item>
<property name="text">
<string>Auto</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
<item> <item>
+4 -1
View File
@@ -111,6 +111,8 @@ PACK(typedef struct {
}) MixData_v215; }) MixData_v215;
#endif #endif
PACK(typedef struct { PACK(typedef struct {
int8_t mode; // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw int8_t mode; // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
uint16_t start:12; uint16_t start:12;
@@ -474,7 +476,8 @@ void ConvertModel_215_to_216(ModelData &model)
#endif #endif
} }
g_model.thrTraceSrc = oldModel.thrTraceSrc; g_model.thrTraceSrc = oldModel.thrTraceSrc;
g_model.switchWarningStates = oldModel.switchWarningStates; g_model.switchWarningStates = oldModel.switchWarningStates >> 1;
g_model.nSwToWarn = (oldModel.switchWarningStates & 0x01) ? 0xFF : 0;
for (uint8_t i=0; i<5; i++) { for (uint8_t i=0; i<5; i++) {
memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME); memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
} }
+122 -45
View File
@@ -669,7 +669,8 @@ void menuModelFailsafe(uint8_t event)
bool newLongNames = false; bool newLongNames = false;
uint8_t ch; uint8_t ch;
if (event == EVT_KEY_BREAK(KEY_ENTER) && s_editMode) { if (event == EVT_KEY_LONG(KEY_ENTER) && s_editMode) {
s_noHi = NO_HI_LEN;
g_model.moduleData[g_moduleIdx].failsafeChannels[m_posVert] = channelOutputs[m_posVert]; g_model.moduleData[g_moduleIdx].failsafeChannels[m_posVert] = channelOutputs[m_posVert];
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
AUDIO_WARNING1(); AUDIO_WARNING1();
@@ -721,7 +722,7 @@ void menuModelFailsafe(uint8_t event)
// Value // Value
LcdFlags flags = TINSIZE; LcdFlags flags = TINSIZE;
if (m_posVert == ch) { if (m_posVert == ch && !s_noHi) {
flags |= INVERS; flags |= INVERS;
if (s_editMode) if (s_editMode)
flags |= BLINK; flags |= BLINK;
@@ -873,7 +874,11 @@ enum menuModelSetupItems {
ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRACE,
ITEM_MODEL_THROTTLE_TRIM, ITEM_MODEL_THROTTLE_TRIM,
ITEM_MODEL_THROTTLE_WARNING, ITEM_MODEL_THROTTLE_WARNING,
#if defined(PCBTARANIS)
ITEM_MODEL_CHECKLIST_DISPLAY,
#endif
ITEM_MODEL_SWITCHES_WARNING, ITEM_MODEL_SWITCHES_WARNING,
CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING)
ITEM_MODEL_BEEP_CENTER, ITEM_MODEL_BEEP_CENTER,
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
ITEM_MODEL_INTERNAL_MODULE_LABEL, ITEM_MODEL_INTERNAL_MODULE_LABEL,
@@ -956,21 +961,22 @@ void menuModelSetup(uint8_t event)
#define PORT_CHANNELS_ROWS(x) (x==0 ? PORT1_CHANNELS_ROWS() : (x==1 ? PORT2_CHANNELS_ROWS() : TRAINER_CHANNELS_ROWS())) #define PORT_CHANNELS_ROWS(x) (x==0 ? PORT1_CHANNELS_ROWS() : (x==1 ? PORT2_CHANNELS_ROWS() : TRAINER_CHANNELS_ROWS()))
#define FAILSAFE_ROWS(x) ((g_model.moduleData[x].rfProtocol==RF_PROTO_X16 || g_model.moduleData[x].rfProtocol==RF_PROTO_LR12) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW) #define FAILSAFE_ROWS(x) ((g_model.moduleData[x].rfProtocol==RF_PROTO_X16 || g_model.moduleData[x].rfProtocol==RF_PROTO_LR12) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW)
#define MODEL_SETUP_MAX_LINES (1+ITEM_MODEL_SETUP_MAX) #define MODEL_SETUP_MAX_LINES (1+ITEM_MODEL_SETUP_MAX)
#define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0)
bool CURSOR_ON_CELL = (m_posHorz >= 0); bool CURSOR_ON_CELL = (m_posHorz >= 0);
MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, CASE_PCBTARANIS(0) 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
#elif defined(CPUM64) #elif defined(CPUM64)
#define CURSOR_ON_CELL (true) #define CURSOR_ON_CELL (true)
#define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX)
uint8_t protocol = g_model.protocol; uint8_t protocol = g_model.protocol;
MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 });
#else #else
#define CURSOR_ON_CELL (true) #define CURSOR_ON_CELL (true)
#define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX)
uint8_t protocol = g_model.protocol; uint8_t protocol = g_model.protocol;
MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, IF_PCBSKY9X(1) IF_PCBSKY9X(2) }); MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, IF_PCBSKY9X(1) IF_PCBSKY9X(2) });
#endif #endif
if (!MENU_CHECK(menuTabModel, e_ModelSetup, MODEL_SETUP_MAX_LINES)) { if (!MENU_CHECK(menuTabModel, e_ModelSetup, MODEL_SETUP_MAX_LINES)) {
@@ -1096,10 +1102,11 @@ void menuModelSetup(uint8_t event)
g_model.extendedTrims = onoffMenuItem(g_model.extendedTrims, MODEL_SETUP_2ND_COLUMN, y, STR_ETRIMS, attr, event); g_model.extendedTrims = onoffMenuItem(g_model.extendedTrims, MODEL_SETUP_2ND_COLUMN, y, STR_ETRIMS, attr, event);
#else #else
g_model.extendedTrims = onoffMenuItem(g_model.extendedTrims, MODEL_SETUP_2ND_COLUMN, y, STR_ETRIMS, m_posHorz<=0 ? attr : 0, event==EVT_KEY_BREAK(KEY_ENTER) ? event : 0); g_model.extendedTrims = onoffMenuItem(g_model.extendedTrims, MODEL_SETUP_2ND_COLUMN, y, STR_ETRIMS, m_posHorz<=0 ? attr : 0, event==EVT_KEY_BREAK(KEY_ENTER) ? event : 0);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_RESET_BTN, m_posHorz>0 ? attr : 0); lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_RESET_BTN, m_posHorz>0 && !s_noHi ? attr : 0);
if (attr && m_posHorz>0) { if (attr && m_posHorz>0) {
s_editMode = 0; s_editMode = 0;
if (event==EVT_KEY_LONG(KEY_ENTER)) { if (event==EVT_KEY_LONG(KEY_ENTER)) {
s_noHi = NO_HI_LEN;
for (uint8_t i=0; i<MAX_PHASES; i++) { for (uint8_t i=0; i<MAX_PHASES; i++) {
memclear(&g_model.phaseData[i], TRIMS_ARRAY_SIZE); memclear(&g_model.phaseData[i], TRIMS_ARRAY_SIZE);
} }
@@ -1138,62 +1145,132 @@ void menuModelSetup(uint8_t event)
case ITEM_MODEL_THROTTLE_WARNING: case ITEM_MODEL_THROTTLE_WARNING:
g_model.disableThrottleWarning = !onoffMenuItem(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event); g_model.disableThrottleWarning = !onoffMenuItem(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event);
break; break;
#if defined(PCBTARANIS)
case ITEM_MODEL_CHECKLIST_DISPLAY:
g_model.displayText = onoffMenuItem(g_model.displayText, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event);
break;
#endif
case ITEM_MODEL_SWITCHES_WARNING: case ITEM_MODEL_SWITCHES_WARNING:
{ {
lcd_putsLeft(y, STR_SWITCHWARNING); lcd_putsLeft(y, STR_SWITCHWARNING);
swstate_t states = g_model.switchWarningStates; swstate_t states = g_model.switchWarningStates;
char c = !(states & 1); char c;
menu_lcd_onoff(MODEL_SETUP_2ND_COLUMN, y, c, attr);
if (attr) { if (attr) {
s_editMode = 0; s_editMode = 0;
switch(event) { if (!READ_ONLY()) {
case EVT_KEY_LONG(KEY_ENTER): switch(event) {
if (!READ_ONLY()) { CASE_EVT_ROTARY_BREAK
case EVT_KEY_BREAK(KEY_ENTER):
killEvents(event); killEvents(event);
getMovedSwitch(); #if defined(CPUM64)
g_model.switchWarningStates = 0x01 + (switches_states << 1); g_model.nSwToWarn ^= (1 << m_posHorz);
}
// no break
CASE_EVT_ROTARY_BREAK
case EVT_KEY_BREAK(KEY_ENTER):
#if !defined(PCBTARANIS)
case EVT_KEY_BREAK(KEY_LEFT):
case EVT_KEY_BREAK(KEY_RIGHT):
#endif
if (!READ_ONLY()) {
g_model.switchWarningStates ^= 0x01;
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
} #else
break; if (m_posHorz < NUM_SWITCHES-1) {
g_model.nSwToWarn ^= (1 << m_posHorz);
eeDirty(EE_MODEL);
}
#endif
break;
case EVT_KEY_LONG(KEY_ENTER):
#if defined(CPUM64)
getMovedSwitch();
g_model.switchWarningStates = switches_states;
AUDIO_WARNING1();
eeDirty(EE_MODEL);
#else
if (m_posHorz == NUM_SWITCHES-1) {
s_noHi = NO_HI_LEN;
getMovedSwitch();
g_model.switchWarningStates = switches_states;
AUDIO_WARNING1();
eeDirty(EE_MODEL);
}
#endif
break;
}
} }
} }
if (c) { LcdFlags line = attr;
states >>= 1;
for (uint8_t i=1; i<NUM_SWITCHES; i++) { for (uint8_t i=0; i<NUM_SWITCHES-1; i++) {
uint8_t swactive = !(g_model.nSwToWarn & 1 << i);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
c = "\300-\301"[states & 0x03]; c = "\300-\301"[states & 0x03];
lcd_putc(MODEL_SETUP_2ND_COLUMN+3+i*(2*FW), y, 'A'+i-1); lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*(2*FW), y, 'A'+i, line && (m_posHorz == i) ? INVERS : 0);
lcd_putc(MODEL_SETUP_2ND_COLUMN+3+i*(2*FW)+FWNUM, y, c); if (swactive) lcd_putc(MODEL_SETUP_2ND_COLUMN+i*(2*FW)+FWNUM, y, c);
states >>= 2; lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+2), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
states >>= 2;
#else #else
attr = 0; attr = 0;
if (IS_3POS(i-1)) {
c = '0'+(states & 0x03); if (IS_3POS(i)) {
states >>= 2; c = '0'+(states & 0x03);
} states >>= 2;
else {
if (states & 0x01)
attr = INVERS;
c = pgm_read_byte(STR_VSWITCHES - 2 + 6 + (3*i));
states >>= 1;
}
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+2*FW+i*FW, y, c, attr);
#endif
} }
else {
if ((states & 0x01) && swactive)
attr = INVERS;
c = pgm_read_byte(STR_VSWITCHES - 2 + 9 + (3*i));
states >>= 1;
}
if (line && (m_posHorz == i)) {
attr = BLINK;
if (swactive)
attr |= INVERS;
}
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive || (attr & BLINK)) ? c : '-', attr);
#if !defined(CPUM64)
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
#endif
#endif
} }
break; break;
} }
#if defined(PCBTARANIS)
case ITEM_MODEL_POT_WARNING:
{
lcd_putsLeft(y, STR_POTWARNING);
uint8_t potMode = g_model.nPotsToWarn >> 6;
if(attr) {
if (m_posHorz) s_editMode = 0;
if (!READ_ONLY() && m_posHorz) {
switch(event) {
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if(potMode == 1) {
g_model.potPosition[m_posHorz-1] = getValue(MIXSRC_FIRST_POT+m_posHorz-1) >> 3;
AUDIO_WARNING1();
eeDirty(EE_MODEL);
}
break;
case EVT_KEY_BREAK(KEY_ENTER):
g_model.nPotsToWarn ^= (1 << (m_posHorz-1));
eeDirty(EE_MODEL);
break;
}
}
}
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, PSTR("\004""Off\0""Man\0""Auto"), potMode, attr & ((m_posHorz == 0) ? attr : !INVERS));
if (potMode)
for (uint8_t i=0; i<NUM_POTS ; i++) {
LcdFlags flags = ((m_posHorz==i+1) && attr) ? BLINK : 0;
flags |= (!(g_model.nPotsToWarn & (1 << i))) ? INVERS : 0;
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW+i*3*FW, y, STR_VSRCRAW, NUM_STICKS+1+i, flags);
}
if (attr && (m_posHorz == 0)) {
CHECK_INCDEC_MODELVAR(event, potMode, 0, 2);
g_model.nPotsToWarn = (g_model.nPotsToWarn & 0x3F) | ((potMode << 6) & 0xC0);
eeDirty(EE_MODEL);
}
break;
}
#endif
case ITEM_MODEL_BEEP_CENTER: case ITEM_MODEL_BEEP_CENTER:
lcd_putsLeft(y, STR_BEEPCTR); lcd_putsLeft(y, STR_BEEPCTR);
+1
View File
@@ -372,6 +372,7 @@ void displayWarning(uint8_t event);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
void menuChannelsView(uint8_t event); void menuChannelsView(uint8_t event);
void pushMenuTextView(const char *filename); void pushMenuTextView(const char *filename);
bool modelHasNotes();
#endif #endif
#define LABEL(...) (uint8_t)-1 #define LABEL(...) (uint8_t)-1
+4 -3
View File
@@ -294,17 +294,17 @@ PACK(typedef struct t_ScriptData {
TRAINER_MODULE TRAINER_MODULE
}; };
#define MODELDATA_BITMAP char bitmap[LEN_BITMAP_NAME]; #define MODELDATA_BITMAP char bitmap[LEN_BITMAP_NAME];
#define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; #define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS];
#define LIMITDATA_EXTRA char name[LEN_CHANNEL_NAME]; int8_t curve; #define LIMITDATA_EXTRA char name[LEN_CHANNEL_NAME]; int8_t curve;
#define swstate_t uint16_t #define swstate_t uint16_t
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
#define MODELDATA_BITMAP #define MODELDATA_BITMAP
#define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; #define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS];
#define LIMITDATA_EXTRA #define LIMITDATA_EXTRA
#define swstate_t uint8_t #define swstate_t uint8_t
#else #else
#define MODELDATA_BITMAP #define MODELDATA_BITMAP
#define MODELDATA_EXTRA #define MODELDATA_EXTRA
#define LIMITDATA_EXTRA #define LIMITDATA_EXTRA
#define swstate_t uint8_t #define swstate_t uint8_t
#endif #endif
@@ -1550,6 +1550,7 @@ PACK(typedef struct t_ModelData {
uint8_t thrTraceSrc; uint8_t thrTraceSrc;
swstate_t switchWarningStates; swstate_t switchWarningStates;
uint8_t nSwToWarn;
MODEL_GVARS_DATA MODEL_GVARS_DATA
+111 -28
View File
@@ -585,7 +585,7 @@ void modelDefault(uint8_t id)
#if defined(MAVLINK) #if defined(MAVLINK)
g_model.mavlink.rc_rssi_scale = 15; g_model.mavlink.rc_rssi_scale = 15;
g_model.mavlink.pc_rssi_en = 1; g_model.mavlink.pc_rssi_en = 1;
#endif #endif
} }
@@ -2236,6 +2236,16 @@ void checkAll()
checkTHR(); checkTHR();
checkSwitches(); checkSwitches();
#if defined(PCBTARANIS)
if (modelHasNotes() && g_model.displayText) {
char filename[sizeof(MODELS_PATH)+1+sizeof(g_model.header.name)+sizeof(TEXT_EXT)] = MODELS_PATH "/";
char *buf = strcat_modelname(&filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
strcpy(buf, TEXT_EXT);
pushMenuTextView(filename);
}
#endif
clearKeyEvents(); clearKeyEvents();
} }
@@ -2298,39 +2308,100 @@ void checkSwitches()
{ {
swstate_t last_bad_switches = 0xff; swstate_t last_bad_switches = 0xff;
swstate_t states = g_model.switchWarningStates; swstate_t states = g_model.switchWarningStates;
#if defined(PCBTARANIS)
uint8_t bad_pots = 0, last_bad_pots = 0xff;
#endif
while (1) { while (1) {
#if defined(TELEMETRY_MOD_14051) #if defined(TELEMETRY_MOD_14051) || defined(PCBTARANIS)
getADC(); getADC();
#endif #endif
getMovedSwitch(); getMovedSwitch();
switches_states <<= 1; uint8_t warn = false;
#if defined(PCBTARANIS)
if ((states & 0x01) || (states == switches_states)) { for (uint8_t i=0; i<NUM_SWITCHES-1; i++) {
return; if (!(g_model.nSwToWarn & (1<<i))) {
swstate_t mask = (0x03 << (i*2));
if(!((states & mask) == (switches_states & mask)))
warn = true;
}
} }
uint8_t potMode = g_model.nPotsToWarn >> 6;
if(potMode) {
perOut(e_perout_mode_normal, 0);
bad_pots = 0;
for (uint8_t i=0; i<NUM_POTS; i++)
if(!(g_model.nPotsToWarn & (1 << i)) && (abs(g_model.potPosition[i] - (getValue(MIXSRC_FIRST_POT+i) >> 3)) > 2)) {
warn = true;
bad_pots |= (1<<i);
}
}
#else
for (uint8_t i=0; i<NUM_SWITCHES-1; i++) {
if (!(g_model.nSwToWarn & (1<<i))) {
if (i == 0) {
if((states & 0x03) != (switches_states & 0x03))
warn = true;
}
else if((states & (1<<(i+1))) != (switches_states & (1<<(i+1))))
warn = true;
}
}
#endif
if(!warn) return;
// first - display warning // first - display warning
#if defined(PCBTARANIS)
if ((last_bad_switches != switches_states) || (last_bad_pots != bad_pots)) {
MESSAGE(STR_SWITCHWARN, NULL, STR_PRESSANYKEYTOSKIP, ((last_bad_switches == 0xff) || (last_bad_pots == 0xff)) ? AU_SWITCH_ALERT : AU_NONE);
for (uint8_t i=0; i<NUM_SWITCHES-1; i++) {
if(!(g_model.nSwToWarn & (1<<i))) {
swstate_t mask = (0x03 << (i*2));
uint8_t attr = ((states & mask) == (switches_states & mask)) ? 0 : INVERS;
char c = "\300-\301"[(states & mask) >> (i*2)];
lcd_putcAtt(60+i*(2*FW+FW/2), 4*FH+3, 'A'+i, attr);
lcd_putcAtt(60+i*(2*FW+FW/2)+FW, 4*FH+3, c, attr);
}
}
if(potMode) {
for (uint8_t i=0; i<NUM_POTS; i++) {
if (!(g_model.nPotsToWarn & (1 << i))) {
uint8_t flags = 0;
if (abs(g_model.potPosition[i] - (calibratedStick[NUM_STICKS+i] >> 3)) > 2) {
switch (i) {
case 0:
case 1:
lcd_putc(60+i*(5*FW)+2*FW+2, 6*FH-2, g_model.potPosition[i] > (getValue(MIXSRC_FIRST_POT+i) >> 3) ? 126 : 127);
break;
case 2:
case 3:
lcd_putc(60+i*(5*FW)+2*FW+2, 6*FH-2, g_model.potPosition[i] > (getValue(MIXSRC_FIRST_POT+i) >> 3) ? '\300' : '\301');
break;
}
flags = INVERS;
}
lcd_putsiAtt(60+i*(5*FW), 6*FH-2, STR_VSRCRAW, NUM_STICKS+1+i, flags);
}
}
}
last_bad_pots = bad_pots;
#else
if (last_bad_switches != switches_states) { if (last_bad_switches != switches_states) {
MESSAGE(STR_SWITCHWARN, NULL, STR_PRESSANYKEYTOSKIP, last_bad_switches == 0xff ? AU_SWITCH_ALERT : AU_NONE); MESSAGE(STR_SWITCHWARN, NULL, STR_PRESSANYKEYTOSKIP, last_bad_switches == 0xff ? AU_SWITCH_ALERT : AU_NONE);
#if defined(PCBTARANIS)
for (uint8_t i=0; i<NUM_SWITCHES-1; i++) {
swstate_t mask = (0x03 << (1+i*2));
uint8_t attr = ((states & mask) == (switches_states & mask)) ? 0 : INVERS;
char c = "\300-\301"[(states & mask) >> (1+i*2)];
lcd_putcAtt(60+i*(2*FW+FW/2), 5*FH, 'A'+i, attr);
lcd_putcAtt(60+i*(2*FW+FW/2)+FW, 5*FH, c, attr);
}
#else
uint8_t x = 2; uint8_t x = 2;
for (uint8_t i=1; i<NUM_PSWITCH-1; i++) { for (uint8_t i=0; i<NUM_SWITCHES-1; i++) {
uint8_t attr = (states & (1 << i)) == (switches_states & (1 << i)) ? 0 : INVERS; uint8_t attr;
putsSwitches(x, 5*FH, (i>2?(i+1):1+((states>>1)&0x3)), attr); if (i == 0)
if (i == 1 && attr) i++; attr = ((states & 0x03) != (switches_states & 0x03)) ? INVERS : 0;
if (i != 1) x += 3*FW+FW/2; else
attr = (states & (1 << (i+1))) == (switches_states & (1 << (i+1))) ? 0 : INVERS;
if(!(g_model.nSwToWarn & (1<<i)))
putsSwitches(x, 5*FH, (i>0?(i+3):(states&0x3)+1), attr);
x += 3*FW+FW/2;
} }
#endif #endif
lcdRefresh(); lcdRefresh();
@@ -4294,8 +4365,10 @@ void opentxClose()
hapticOff(); hapticOff();
#endif #endif
saveTimers();
#if defined(CPUARM) && defined(FRSKY) #if defined(CPUARM) && defined(FRSKY)
if((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) { if ((g_model.frsky.mAhPersistent) && (g_model.frsky.storedMah != frskyData.hub.currentConsumption)) {
g_model.frsky.storedMah = frskyData.hub.currentConsumption; g_model.frsky.storedMah = frskyData.hub.currentConsumption;
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
} }
@@ -4305,20 +4378,24 @@ void opentxClose()
} }
#endif #endif
saveTimers();
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
uint32_t mAhUsed = g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib) / 8192 / 36; uint32_t mAhUsed = g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib) / 8192 / 36;
if (g_eeGeneral.mAhUsed != mAhUsed) if (g_eeGeneral.mAhUsed != mAhUsed) {
g_eeGeneral.mAhUsed = mAhUsed; g_eeGeneral.mAhUsed = mAhUsed;
}
#endif #endif
#if defined(CPUARM) && !defined(REVA) #if defined(PCBTARANIS)
if (sessionTimer > 0) if ((g_model.nPotsToWarn >> 6) == 2) {
g_eeGeneral.globalTimer += sessionTimer; for (uint8_t i=0; i<NUM_POTS ; i++)
if (!(g_model.nPotsToWarn & (1 << i)))
g_model.potPosition[i] = getValue(MIXSRC_FIRST_POT+i) >> 3;
eeDirty(EE_MODEL);
}
#endif #endif
g_eeGeneral.unexpectedShutdown = 0; g_eeGeneral.unexpectedShutdown = 0;
eeDirty(EE_GENERAL); eeDirty(EE_GENERAL);
eeCheck(true); eeCheck(true);
} }
@@ -4909,6 +4986,12 @@ void saveTimers()
} }
} }
} }
#if defined(CPUARM) && !defined(REVA)
if (sessionTimer > 0) {
g_eeGeneral.globalTimer += sessionTimer;
}
#endif
} }
#endif #endif
+2
View File
@@ -494,6 +494,8 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
const pm_char STR_SCALE[] PROGMEM = "Scale"; const pm_char STR_SCALE[] PROGMEM = "Scale";
const pm_char STR_VIEW_CHANNELS[] PROGMEM = "View Channels"; const pm_char STR_VIEW_CHANNELS[] PROGMEM = "View Channels";
const pm_char STR_VIEW_NOTES[] PROGMEM = "View Notes"; const pm_char STR_VIEW_NOTES[] PROGMEM = "View Notes";
const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING;
const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST;
const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE; const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE;
const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE; const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE;
const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE; const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE;
+2
View File
@@ -682,6 +682,8 @@ extern const pm_char STR_VIEW_TEXT[];
extern const pm_char STR_SCALE[]; extern const pm_char STR_SCALE[];
extern const pm_char STR_VIEW_CHANNELS[]; extern const pm_char STR_VIEW_CHANNELS[];
extern const pm_char STR_VIEW_NOTES[]; extern const pm_char STR_VIEW_NOTES[];
extern const pm_char STR_POTWARNING[];
extern const pm_char STR_CHECKLIST[];
extern const pm_char STR_UART3MODE[]; extern const pm_char STR_UART3MODE[];
extern const pm_char STR_POT1TYPE[]; extern const pm_char STR_POT1TYPE[];
extern const pm_char STR_POT2TYPE[]; extern const pm_char STR_POT2TYPE[];
+2
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "úvodníLogo" #define TR_SPLASHSCREEN "úvodníLogo"
#define TR_THROTTLEWARNING "(\043)Plyn" #define TR_THROTTLEWARNING "(\043)Plyn"
#define TR_SWITCHWARNING "(\043)Spínače" #define TR_SWITCHWARNING "(\043)Spínače"
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE "časové pásmo" #define TR_TIMEZONE "časové pásmo"
#define TR_RXCHANNELORD TR("Pořadí kanálů", "Výchozí pořadí kanálů") #define TR_RXCHANNELORD TR("Pořadí kanálů", "Výchozí pořadí kanálů")
#define TR_SLAVE "Podřízený" #define TR_SLAVE "Podřízený"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Nízký Alarm" #define TR_LOWALARM INDENT "Nízký Alarm"
#define TR_CRITICALALARM INDENT "Kritický Alarm" #define TR_CRITICALALARM INDENT "Kritický Alarm"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port" #define TR_UART3MODE "Serial port"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1 Type"
+2
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Startbild" #define TR_SPLASHSCREEN "Startbild"
#define TR_THROTTLEWARNING "Gas Alarm" #define TR_THROTTLEWARNING "Gas Alarm"
#define TR_SWITCHWARNING TR("Sch. Alarm","Schalter Alarm") #define TR_SWITCHWARNING TR("Sch. Alarm","Schalter Alarm")
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone") #define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone")
#define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung") #define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung")
#define TR_SLAVE "Sch\205ler PPM1-8 als Ausgang" #define TR_SLAVE "Sch\205ler PPM1-8 als Ausgang"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Low Alarm" #define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Kritisch Alarm" #define TR_CRITICALALARM INDENT "Kritisch Alarm"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port" #define TR_UART3MODE "Serial port"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1 Type"
+3 -1
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Splash screen" #define TR_SPLASHSCREEN "Splash screen"
#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") #define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning")
#define TR_SWITCHWARNING TR("S-Warning","Switch Warning") #define TR_SWITCHWARNING TR("S-Warning","Switch Warning")
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_TIMEZONE TR("Time Zone","GPS Time zone")
#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order")
#define TR_SLAVE "Slave" #define TR_SLAVE "Slave"
@@ -611,7 +612,7 @@
#define TR_EEPROMWARN "EEPROM" #define TR_EEPROMWARN "EEPROM"
#define TR_THROTTLEWARN "THROTTLE" #define TR_THROTTLEWARN "THROTTLE"
#define TR_ALARMSWARN "ALARMS" #define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN "SWITCH" #define TR_SWITCHWARN TR("SWITCH","CONTROL")
#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?") #define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?")
#define TR_SPEAKER_VOLUME INDENT "Volume" #define TR_SPEAKER_VOLUME INDENT "Volume"
#define TR_LCD "LCD" #define TR_LCD "LCD"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Low Alarm" #define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port" #define TR_UART3MODE "Serial port"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1 Type"
+2
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Ptalla.inicio" #define TR_SPLASHSCREEN "Ptalla.inicio"
#define TR_THROTTLEWARNING TR("Aviso-A", "Aviso Acelerador") #define TR_THROTTLEWARNING TR("Aviso-A", "Aviso Acelerador")
#define TR_SWITCHWARNING TR("Aviso-I", "Aviso Intrptor") #define TR_SWITCHWARNING TR("Aviso-I", "Aviso Intrptor")
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE TR("Zona Hora", "GPS Zona Hora") #define TR_TIMEZONE TR("Zona Hora", "GPS Zona Hora")
#define TR_RXCHANNELORD TR("Rx Orden canal", "Orden habitual canales") #define TR_RXCHANNELORD TR("Rx Orden canal", "Orden habitual canales")
#define TR_SLAVE "Esclavo" #define TR_SLAVE "Esclavo"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Alarma baja" #define TR_LOWALARM INDENT "Alarma baja"
#define TR_CRITICALALARM INDENT "Alarma Critica" #define TR_CRITICALALARM INDENT "Alarma Critica"
#define TR_PERSISTENT_MAH INDENT "Valor mAh" #define TR_PERSISTENT_MAH INDENT "Valor mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port" #define TR_UART3MODE "Serial port"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1 Type"
+3 -1
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Logo d'accueil" #define TR_SPLASHSCREEN "Logo d'accueil"
#define TR_THROTTLEWARNING "Alerte gaz" #define TR_THROTTLEWARNING "Alerte gaz"
#define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.") #define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.")
#define TR_POTWARNING TR("Alerte pot","Alerte potentiom.")
#define TR_TIMEZONE "Fuseau horaire" #define TR_TIMEZONE "Fuseau horaire"
#define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré") #define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré")
#define TR_SLAVE "Elève" #define TR_SLAVE "Elève"
@@ -611,7 +612,7 @@
#define TR_EEPROMWARN "EEPROM" #define TR_EEPROMWARN "EEPROM"
#define TR_THROTTLEWARN "GAZ" #define TR_THROTTLEWARN "GAZ"
#define TR_ALARMSWARN "SON" #define TR_ALARMSWARN "SON"
#define TR_SWITCHWARN "INTERS" #define TR_SWITCHWARN TR("INTERS","CONTROLES")
#define TR_INVERT_THR "Inverser Gaz?" #define TR_INVERT_THR "Inverser Gaz?"
#define TR_SPEAKER_VOLUME INDENT "Volume" #define TR_SPEAKER_VOLUME INDENT "Volume"
#define TR_LCD "Afficheur" #define TR_LCD "Afficheur"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Alarme basse" #define TR_LOWALARM INDENT "Alarme basse"
#define TR_CRITICALALARM INDENT "Alarme critique" #define TR_CRITICALALARM INDENT "Alarme critique"
#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh") #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh")
#define TR_CHECKLIST "Afficher notes"
#define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS")
#define TR_UART3MODE "Port série" #define TR_UART3MODE "Port série"
#define TR_POT1TYPE "Type S1" #define TR_POT1TYPE "Type S1"
+3 -1
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio") #define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio")
#define TR_THROTTLEWARNING TR("All. Thr", "Allarme Throttle") #define TR_THROTTLEWARNING TR("All. Thr", "Allarme Throttle")
#define TR_SWITCHWARNING TR("Avv. Int.", "Avviso Interr.") #define TR_SWITCHWARNING TR("Avv. Int.", "Avviso Interr.")
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE "Ora locale" #define TR_TIMEZONE "Ora locale"
#define TR_RXCHANNELORD "Ordine ch RX" #define TR_RXCHANNELORD "Ordine ch RX"
#define TR_SLAVE "Allievo" #define TR_SLAVE "Allievo"
@@ -698,10 +699,11 @@
#define TR_LOWALARM INDENT "Allarme Basso" #define TR_LOWALARM INDENT "Allarme Basso"
#define TR_CRITICALALARM INDENT "Allarme Critico" #define TR_CRITICALALARM INDENT "Allarme Critico"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port" #define TR_UART3MODE "Serial port"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1 Type"
#define TR_POT2TYPE "S2 Type" #define TR_POT2TYPE "S2 Type"
#if defined(MAVLINK) #if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
+2
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Logo ekranu" #define TR_SPLASHSCREEN "Logo ekranu"
#define TR_THROTTLEWARNING "(\043)Gaz" #define TR_THROTTLEWARNING "(\043)Gaz"
#define TR_SWITCHWARNING "(\043)Przełącznik" #define TR_SWITCHWARNING "(\043)Przełącznik"
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE "Strefa czasowa" #define TR_TIMEZONE "Strefa czasowa"
#define TR_RXCHANNELORD TR("Kolejność kanałów", "Bazowa kolejność kanałów") #define TR_RXCHANNELORD TR("Kolejność kanałów", "Bazowa kolejność kanałów")
#define TR_SLAVE "Uczeń" #define TR_SLAVE "Uczeń"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Alarm niski" #define TR_LOWALARM INDENT "Alarm niski"
#define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_CRITICALALARM INDENT "Alarm krytyczny"
#define TR_PERSISTENT_MAH INDENT "Zapisz mAh" #define TR_PERSISTENT_MAH INDENT "Zapisz mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Port szreg." #define TR_UART3MODE "Port szreg."
#define TR_POT1TYPE "Typ S1" #define TR_POT1TYPE "Typ S1"
+4 -2
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Splash screen" #define TR_SPLASHSCREEN "Splash screen"
#define TR_THROTTLEWARNING "Avisa Acel" #define TR_THROTTLEWARNING "Avisa Acel"
#define TR_SWITCHWARNING "Avisa Chav" #define TR_SWITCHWARNING "Avisa Chav"
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE "Time Zone" #define TR_TIMEZONE "Time Zone"
#define TR_RXCHANNELORD "Ordem Canal RX" #define TR_RXCHANNELORD "Ordem Canal RX"
#define TR_SLAVE "Escravo" #define TR_SLAVE "Escravo"
@@ -697,11 +698,12 @@
#define TR_CHANNELRANGE INDENT "Channel Range" #define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm" #define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serial port" #define TR_UART3MODE "Serial port"
#define TR_POT1TYPE "S1 Type" #define TR_POT1TYPE "S1 Type"
#define TR_POT2TYPE "S2 Type" #define TR_POT2TYPE "S2 Type"
#if defined(MAVLINK) #if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
+2
View File
@@ -505,6 +505,7 @@
#define TR_SPLASHSCREEN "Startbild" #define TR_SPLASHSCREEN "Startbild"
#define TR_THROTTLEWARNING "Gasvarning" #define TR_THROTTLEWARNING "Gasvarning"
#define TR_SWITCHWARNING TR("Bryt.varn.","Brytarvarning") #define TR_SWITCHWARNING TR("Bryt.varn.","Brytarvarning")
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE TR("Tidszon","GPS Tidszon") #define TR_TIMEZONE TR("Tidszon","GPS Tidszon")
#define TR_RXCHANNELORD "Kanaler i RX" #define TR_RXCHANNELORD "Kanaler i RX"
#define TR_SLAVE "Elev" #define TR_SLAVE "Elev"
@@ -698,6 +699,7 @@
#define TR_LOWALARM INDENT "Låg-alarm" #define TR_LOWALARM INDENT "Låg-alarm"
#define TR_CRITICALALARM INDENT "Kritiskt alarm" #define TR_CRITICALALARM INDENT "Kritiskt alarm"
#define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_CHECKLIST "Display Checklist"
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
#define TR_UART3MODE "Serieporten" #define TR_UART3MODE "Serieporten"
#define TR_POT1TYPE "S1-ratten" #define TR_POT1TYPE "S1-ratten"