diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 1db9309bf..73d21daff 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -83,6 +83,13 @@ add_custom_command( WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} ) +add_custom_command( + OUTPUT ${RADIO_SRC_DIRECTORY}/translations/en.h + COMMAND make tra + DEPENDS ${RADIO_SRC_DIRECTORY}/translations/en.h.txt + WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} +) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../.. @@ -122,6 +129,7 @@ set(companion_SRCS firmwares/ersky9x/ersky9xeeprom.cpp firmwares/ersky9x/ersky9xinterface.cpp ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm + ${RADIO_SRC_DIRECTORY}/translations/en.h appdata.cpp helpers.cpp mdichild.cpp @@ -313,6 +321,7 @@ set(simu_SRCS firmwares/ersky9x/ersky9xinterface.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm + ${RADIO_SRC_DIRECTORY}/translations/en.h file.cpp # TODO not needed modeledit/node.cpp modeledit/edge.cpp # TODO not needed diff --git a/companion/src/avroutputdialog.cpp b/companion/src/avroutputdialog.cpp index 8680d39a7..1c8140709 100644 --- a/companion/src/avroutputdialog.cpp +++ b/companion/src/avroutputdialog.cpp @@ -38,7 +38,8 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg, if (arg.count()<2) { closeOpt = AVR_DIALOG_FORCE_CLOSE; QTimer::singleShot(0, this, SLOT(forceClose())); - } else { + } + else { sourceFile=arg.at(0); destFile=arg.at(1); if (!displayDetails) { @@ -68,7 +69,6 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg, efuse = 0; phase=0; currLine.clear(); - prevLine.clear(); if (!displayDetails) { ui->plainTextEdit->hide(); QTimer::singleShot(0, this, SLOT(shrink())); @@ -132,11 +132,12 @@ void avrOutputDialog::doCopy() char * pointer=buf; QFile source(sourceFile); int blocks=(source.size()/BLKSIZE); - ui->progressBar->setMaximum(blocks-1); + ui->progressBar->setMaximum(blocks-1); if (!source.open(QIODevice::ReadOnly)) { QMessageBox::warning(this, tr("Error"),tr("Cannot open source file")); hasErrors=true; - } else { + } + else { source.read(buf,READBUF); source.close(); QFile dest(destFile); @@ -183,7 +184,6 @@ void avrOutputDialog::runAgain(QString prog, QStringList arg, int closeBehaviour foreach(QString str, arg) cmdLine.append(" " + str); closeOpt = closeBehaviour; currLine.clear(); - prevLine.clear(); process->start(prog,arg); } @@ -194,12 +194,18 @@ void avrOutputDialog::waitForFinish() void avrOutputDialog::addText(const QString &text) { - int val = ui->plainTextEdit->verticalScrollBar()->maximum(); - ui->plainTextEdit->insertPlainText(text); - if(val!=ui->plainTextEdit->verticalScrollBar()->maximum()) - ui->plainTextEdit->verticalScrollBar()->setValue(ui->plainTextEdit->verticalScrollBar()->maximum()); -} + QTextCursor cursor(ui->plainTextEdit->textCursor()); + // is the scrollbar at the end? + bool atEnd = (ui->plainTextEdit->verticalScrollBar()->value() == ui->plainTextEdit->verticalScrollBar()->maximum()); + + cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor, 1); + cursor.insertText(text); + + if (atEnd) { + ui->plainTextEdit->verticalScrollBar()->triggerAction(QAbstractSlider::SliderToMaximum); + } +} void avrOutputDialog::doAddTextStdOut() { @@ -209,31 +215,30 @@ void avrOutputDialog::doAddTextStdOut() int nlPos, pos, size; addText(text); + currStdLine.append(text); if (currStdLine.contains("size = ")) { - pos=currStdLine.lastIndexOf("size = "); - temp=currStdLine.mid(pos+7); - pos=temp.lastIndexOf("\n"); - size=temp.left(pos).toInt(); + pos = currStdLine.lastIndexOf("size = "); + temp = currStdLine.mid(pos+7); + pos = temp.lastIndexOf("\n"); + size = temp.left(pos).toInt(); ui->progressBar->setMaximum(size/2048); } if (currStdLine.contains("\n")) { - nlPos=currStdLine.lastIndexOf("\n"); - prevStdLine=currStdLine.left(nlPos).trimmed(); - currStdLine=currStdLine.mid(nlPos+1); + nlPos = currStdLine.lastIndexOf("\n"); + currStdLine = currStdLine.mid(nlPos+1); } if (!currStdLine.isEmpty()) { - if (currStdLine.at(0)==QChar('.')) { - pos=currStdLine.lastIndexOf("."); + if (currStdLine.at(0) == QChar('.')) { + pos = currStdLine.lastIndexOf("."); ui->progressBar->setValue(pos); } - } - if (!currStdLine.isEmpty()) { - if (currStdLine.startsWith("Starting upload: [")) { - pos=(currStdLine.lastIndexOf("#")-19)/(MAX_FSIZE/204800.0); + else if (currStdLine.startsWith("Starting upload: [")) { + pos = (currStdLine.lastIndexOf("#")-19)/(MAX_FSIZE/204800.0); ui->progressBar->setValue(pos); } } + if (text.contains("Complete ")) { #if !__GNUC__ if (kill_timer) { @@ -250,19 +255,15 @@ void avrOutputDialog::doAddTextStdOut() } } - //addText("\n=====\n" + text + "\n=====\n"); - - if(text.contains(":010000")) //contains fuse info - { - QStringList stl = text.split(":01000000"); - - foreach (QString t, stl) - { - bool ok = false; - if(!lfuse) lfuse = t.left(2).toInt(&ok,16); - if(!hfuse && !ok) hfuse = t.left(2).toInt(&ok,16); - if(!efuse && !ok) efuse = t.left(2).toInt(&ok,16); - } + if (text.contains(":010000")) { + //contains fuse info + QStringList stl = text.split(":01000000"); + foreach (QString t, stl) { + bool ok = false; + if (!lfuse) lfuse = t.left(2).toInt(&ok,16); + if (!hfuse && !ok) hfuse = t.left(2).toInt(&ok,16); + if (!efuse && !ok) efuse = t.left(2).toInt(&ok,16); + } } if (text.contains("-E-")) { @@ -276,9 +277,11 @@ QString avrOutputDialog::getProgrammer() EEPROMInterface *eepromInterface = GetEepromInterface(); if (IS_TARANIS(eepromInterface->getBoard())) { return "DFU Util"; - } else if (eepromInterface->getBoard()==BOARD_SKY9X) { + } + else if (eepromInterface->getBoard()==BOARD_SKY9X) { return "SAM-BA"; - } else { + } + else { return "AVRDUDE"; } } @@ -298,25 +301,31 @@ void avrOutputDialog::errorWizard() DeviceStr="Atmega 64"; FwStr="\n"+tr("ie: OpenTX for 9X board or OpenTX for 9XR board"); fwexist=true; - } else if (DeviceId=="0x1e9702") { + } + else if (DeviceId=="0x1e9702") { DeviceStr="Atmega 128"; FwStr="\n"+tr("ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip"); fwexist=true; - } else if (DeviceId=="0x1e9703") { + } + else if (DeviceId=="0x1e9703") { DeviceStr="Atmega 1280"; - } else if (DeviceId=="0x1e9704") { + } + else if (DeviceId=="0x1e9704") { DeviceStr="Atmega 1281"; - } else if (DeviceId=="0x1e9801") { + } + else if (DeviceId=="0x1e9801") { DeviceStr="Atmega 2560"; FwStr="\n"+tr("ie: OpenTX for Gruvin9X board"); fwexist=true; - } else if (DeviceId=="0x1e9802") { + } + else if (DeviceId=="0x1e9802") { DeviceStr="Atmega 2561"; } } if (fwexist==false) { QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr)); - } else { + } + else { FirmwareInfo *firmware = GetCurrentFirmware(); QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name)); } @@ -333,7 +342,7 @@ void avrOutputDialog::doAddTextStdErr() currLine.append(text); if (currLine.contains("#")) { - avrphase=currLine.left(1).toLower(); + avrphase = currLine.left(1).toLower(); if (avrphase=="w") { ui->progressBar->setStyleSheet("QProgressBar {text-align: center;} QProgressBar::chunk { background-color: #ff0000; text-align:center;}:"); phase=1; @@ -344,14 +353,15 @@ void avrOutputDialog::doAddTextStdErr() pbvalue=currLine.count("#")*2; ui->progressBar->setValue(pbvalue); } - if (avrphase=="r") { + else if (avrphase=="r") { if (phase==0) { ui->progressBar->setStyleSheet("QProgressBar {text-align: center;} QProgressBar::chunk { background-color: #00ff00; text-align:center;}:"); if(winTitle.isEmpty()) setWindowTitle(getProgrammer() + " - " + tr("Reading")); else setWindowTitle(getProgrammer() + " - " + winTitle + " - " + tr("Reading")); - } else { + } + else { ui->progressBar->setStyleSheet("QProgressBar {text-align: center;} QProgressBar::chunk { background-color: #0000ff; text-align:center;}:"); phase=2; if(winTitle.isEmpty()) @@ -363,11 +373,12 @@ void avrOutputDialog::doAddTextStdErr() ui->progressBar->setValue(pbvalue); } } + if (currLine.contains("\n")) { - nlPos=currLine.lastIndexOf("\n"); - prevLine=currLine.left(nlPos).trimmed(); - currLine=currLine.mid(nlPos+1); + nlPos = currLine.lastIndexOf("\n"); + currLine = currLine.mid(nlPos+1); } + if (text.contains("-E-") && !text.contains("-E- No receive file name")) { hasErrors = true; } @@ -376,6 +387,7 @@ void avrOutputDialog::doAddTextStdErr() } #define HLINE_SEPARATOR "=================================================================================" + void avrOutputDialog::doFinished(int code=0) { addText("\n" HLINE_SEPARATOR); @@ -385,17 +397,22 @@ void avrOutputDialog::doFinished(int code=0) if (code) { ui->checkBox->setChecked(true); addText("\n" + getProgrammer() + " " + tr("done - exit code %1").arg(code)); - } else if (hasErrors) { + } + else if (hasErrors) { ui->checkBox->setChecked(true); addText("\n" + getProgrammer() + " " + tr("done with errors")); - } else if (!cmdLine.isEmpty()) { + } + else if (!cmdLine.isEmpty()) { addText("\n" + getProgrammer() + " " + tr("done - SUCCESSFUL")); - } else { + } + else { addText(tr("done - SUCCESSFUL")); } addText("\n" HLINE_SEPARATOR "\n"); - if(lfuse || hfuse || efuse) addReadFuses(); + if(lfuse || hfuse || efuse) { + addReadFuses(); + } switch(closeOpt) { @@ -417,7 +434,8 @@ void avrOutputDialog::doFinished(int code=0) if (!cmdLine.isEmpty()) { if (getProgrammer()!="AVRDUDE") { QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly")); - } else { + } + else { int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No); if (res != QMessageBox::No) { errorWizard(); @@ -427,12 +445,14 @@ void avrOutputDialog::doFinished(int code=0) QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly")); } // reject(); - } else { + } + else { if (!cmdLine.isEmpty()) { - ui->progressBar->setValue(100); + ui->progressBar->setValue(ui->progressBar->maximum()); QMessageBox::information(this, "Companion", getProgrammer() + " " + tr("finished correctly")); accept(); - } else { + } + else { QMessageBox::information(this, "Companion", tr("Copy finished correctly")); accept(); } @@ -454,8 +474,6 @@ void avrOutputDialog::doProcessStarted() addText("\n" HLINE_SEPARATOR "\n"); } - - void avrOutputDialog::addReadFuses() { addText(HLINE_SEPARATOR "\n"); @@ -463,19 +481,23 @@ void avrOutputDialog::addReadFuses() addText("\n" HLINE_SEPARATOR "\n"); } -void avrOutputDialog::on_checkBox_toggled(bool checked) { +void avrOutputDialog::on_checkBox_toggled(bool checked) +{ if (checked) { - ui->plainTextEdit->show(); - } else { - ui->plainTextEdit->hide(); - QTimer::singleShot(0, this, SLOT(shrink())); + ui->plainTextEdit->show(); + } + else { + ui->plainTextEdit->hide(); + QTimer::singleShot(0, this, SLOT(shrink())); } } -void avrOutputDialog::shrink() { +void avrOutputDialog::shrink() +{ resize(0,0); } -void avrOutputDialog::forceClose() { - accept();; +void avrOutputDialog::forceClose() +{ + accept(); } diff --git a/companion/src/avroutputdialog.h b/companion/src/avroutputdialog.h index 0eedabcc2..b62a69cef 100644 --- a/companion/src/avroutputdialog.h +++ b/companion/src/avroutputdialog.h @@ -52,9 +52,7 @@ private: quint8 lfuse; quint8 hfuse; quint8 efuse; - QString prevLine; QString currLine; - QString prevStdLine; QString currStdLine; int phase; QString winTitle; diff --git a/companion/src/images/library/00009.png b/companion/src/images/library/00009.png index bf74ff7b5..99fbf404d 100644 Binary files a/companion/src/images/library/00009.png and b/companion/src/images/library/00009.png differ diff --git a/companion/src/images/library/00010.png b/companion/src/images/library/00010.png index 1cab16ab2..410af7418 100644 Binary files a/companion/src/images/library/00010.png and b/companion/src/images/library/00010.png differ diff --git a/companion/src/images/library/00011.png b/companion/src/images/library/00011.png index da65dbcb3..410af7418 100644 Binary files a/companion/src/images/library/00011.png and b/companion/src/images/library/00011.png differ diff --git a/companion/src/images/library/00012.png b/companion/src/images/library/00012.png index 6d1c00fe3..410af7418 100644 Binary files a/companion/src/images/library/00012.png and b/companion/src/images/library/00012.png differ diff --git a/companion/src/images/library/00013.png b/companion/src/images/library/00013.png index 802e9885a..161f1fc04 100644 Binary files a/companion/src/images/library/00013.png and b/companion/src/images/library/00013.png differ diff --git a/companion/src/images/library/00014.png b/companion/src/images/library/00014.png index 802e9885a..7c516b800 100644 Binary files a/companion/src/images/library/00014.png and b/companion/src/images/library/00014.png differ diff --git a/companion/src/images/library/00015.png b/companion/src/images/library/00015.png index 802e9885a..da65dbcb3 100644 Binary files a/companion/src/images/library/00015.png and b/companion/src/images/library/00015.png differ diff --git a/companion/src/images/library/00016.png b/companion/src/images/library/00016.png index 802e9885a..1cab16ab2 100644 Binary files a/companion/src/images/library/00016.png and b/companion/src/images/library/00016.png differ diff --git a/companion/src/images/library/00017.png b/companion/src/images/library/00017.png index 802e9885a..131f2e2a4 100644 Binary files a/companion/src/images/library/00017.png and b/companion/src/images/library/00017.png differ diff --git a/companion/src/images/library/00018.png b/companion/src/images/library/00018.png index 802e9885a..22ffa2b1f 100644 Binary files a/companion/src/images/library/00018.png and b/companion/src/images/library/00018.png differ diff --git a/companion/src/images/library/00019.png b/companion/src/images/library/00019.png index 802e9885a..6dc10e2e2 100644 Binary files a/companion/src/images/library/00019.png and b/companion/src/images/library/00019.png differ diff --git a/companion/src/images/library/00020.png b/companion/src/images/library/00020.png index 802e9885a..bf74ff7b5 100644 Binary files a/companion/src/images/library/00020.png and b/companion/src/images/library/00020.png differ diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index ce66bb4bc..0f8d36389 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1790,6 +1790,7 @@ void MainWindow::createToolBars() QToolButton * recentToolButton = new QToolButton; recentToolButton->setPopupMode(QToolButton::InstantPopup); + recentToolButton->setFocusPolicy(Qt::NoFocus); recentToolButton->setMenu(createRecentFileMenu()); recentToolButton->setIcon(CompanionIcon("recentdocument.png")); recentToolButton->setToolTip(tr("Recent Models+Settings")); @@ -1805,6 +1806,7 @@ void MainWindow::createToolBars() QToolButton * profileButton = new QToolButton; profileButton->setPopupMode(QToolButton::InstantPopup); + profileButton->setFocusPolicy(Qt::NoFocus); profileButton->setMenu(createProfilesMenu()); profileButton->setIcon(CompanionIcon("profiles.png")); profileButton->setToolTip(tr("Radio Settings Profile")); diff --git a/companion/src/modeledit/CMakeLists.txt b/companion/src/modeledit/CMakeLists.txt index 827ecf656..da739efc7 100644 --- a/companion/src/modeledit/CMakeLists.txt +++ b/companion/src/modeledit/CMakeLists.txt @@ -16,7 +16,7 @@ set(modeledit_SRCS inputs.cpp mixes.cpp channels.cpp - customswitches.cpp + logicalswitches.cpp customfunctions.cpp # templates.cpp mixerslist.cpp @@ -30,7 +30,7 @@ set(modeledit_HDRS inputs.h mixes.h channels.h - customswitches.h + logicalswitches.h customfunctions.h # templates.h mixerslist.h diff --git a/companion/src/modeledit/customswitches.cpp b/companion/src/modeledit/logicalswitches.cpp similarity index 99% rename from companion/src/modeledit/customswitches.cpp rename to companion/src/modeledit/logicalswitches.cpp index d965c772c..1902a76ae 100644 --- a/companion/src/modeledit/customswitches.cpp +++ b/companion/src/modeledit/logicalswitches.cpp @@ -1,4 +1,4 @@ -#include "customswitches.h" +#include "logicalswitches.h" #include #include #include diff --git a/companion/src/modeledit/customswitches.h b/companion/src/modeledit/logicalswitches.h similarity index 100% rename from companion/src/modeledit/customswitches.h rename to companion/src/modeledit/logicalswitches.h diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp index c3c24b14b..efc953736 100644 --- a/companion/src/modeledit/modeledit.cpp +++ b/companion/src/modeledit/modeledit.cpp @@ -8,7 +8,7 @@ #include "channels.h" #include "curves.h" #include "../helpers.h" -#include "customswitches.h" +#include "logicalswitches.h" #include "customfunctions.h" #include "telemetry.h" #include "appdata.h" diff --git a/radio/src/Makefile b/radio/src/Makefile index 8380a747e..e373abd7c 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -1086,7 +1086,7 @@ else build: stamp_header tra lbm allsrc.cpp elf remallsrc bin endif -tra: translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h +tra: translations/en.h translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h lbm: fonts bitmaps/sticks.lbm elf: $(TARGET).elf @@ -1140,6 +1140,11 @@ taranis-stamp: @echo "#define VERS_STR \"$(VERSION)\"" >> stamp-opentx-taranis.txt @cat stamp-opentx-taranis.txt +translations/en.h: translations/en.h.txt + @echo + @echo "Create English language specific header files" + $(TRANSLATE) translations/en.h.txt translations/en.h en + translations/cz.h: translations/cz.h.txt @echo @echo "Create Czech language specific header files" diff --git a/radio/src/fonts/sqt5/font_05x07_avr.png b/radio/src/fonts/sqt5/font_05x07_avr.png new file mode 100644 index 000000000..4843d8f6c Binary files /dev/null and b/radio/src/fonts/sqt5/font_05x07_avr.png differ diff --git a/radio/src/fonts/std/font_05x07_avr.png b/radio/src/fonts/std/font_05x07_avr.png new file mode 100644 index 000000000..c95126af5 Binary files /dev/null and b/radio/src/fonts/std/font_05x07_avr.png differ diff --git a/radio/src/fonts/std/font_05x07_extra.png b/radio/src/fonts/std/font_05x07_extra.png index 4d939852c..79d190243 100644 Binary files a/radio/src/fonts/std/font_05x07_extra.png and b/radio/src/fonts/std/font_05x07_extra.png differ diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 0ac5af663..bea52b0ce 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -4254,7 +4254,7 @@ enum LogicalSwitchFields { void menuModelLogicalSwitchOne(uint8_t event) { - TITLE(STR_MENUCUSTOMSWITCH); + TITLE(STR_MENULOGICALSWITCH); LogicalSwitchData * cs = cswAddress(s_currIdx); uint8_t sw = SWSRC_SW1+s_currIdx; @@ -4398,7 +4398,7 @@ void menuModelLogicalSwitchOne(uint8_t event) void menuModelLogicalSwitches(uint8_t event) { - SIMPLE_MENU(STR_MENUCUSTOMSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1); + SIMPLE_MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1); uint8_t y = 0; uint8_t k = 0; @@ -4516,7 +4516,7 @@ void menuModelLogicalSwitches(uint8_t event) { INCDEC_DECLARE_VARS(); - MENU(STR_MENUCUSTOMSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1, {0, NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/}); + MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1, {0, NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/}); uint8_t y = 0; uint8_t k = 0; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ef7c278b0..f85c49c49 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -296,8 +296,8 @@ const pm_char STR_MENUINPUTS[] PROGMEM = TR_MENUINPUTS; const pm_char STR_MENULIMITS[] PROGMEM = TR_MENULIMITS; const pm_char STR_MENUCURVES[] PROGMEM = TR_MENUCURVES; const pm_char STR_MENUCURVE[] PROGMEM = TR_MENUCURVE; -const pm_char STR_MENUCUSTOMSWITCH[] PROGMEM = TR_MENUCUSTOMSWITCH; -const pm_char STR_MENUCUSTOMSWITCHES[] PROGMEM = TR_MENUCUSTOMSWITCHES; +const pm_char STR_MENULOGICALSWITCH[] PROGMEM = TR_MENULOGICALSWITCH; +const pm_char STR_MENULOGICALSWITCHES[] PROGMEM = TR_MENULOGICALSWITCHES; const pm_char STR_MENUCUSTOMFUNC[] PROGMEM = TR_MENUCUSTOMFUNC; #if defined(LUA) @@ -449,7 +449,7 @@ const pm_char STR_SD_SECTORS[] PROGMEM = TR_SD_SECTORS; const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE; const pm_char STR_TYPE[] PROGMEM = TR_TYPE; const pm_char STR_GLOBAL_VARS[] PROGMEM = TR_GLOBAL_VARS; -const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V; +const pm_char STR_GLOBAL_V[] PROGMEM = TR_GLOBAL_V; const pm_char STR_GLOBAL_VAR[] PROGMEM = TR_GLOBAL_VAR; const pm_char STR_OWN[] PROGMEM = TR_OWN; const pm_char STR_ROTARY_ENCODER[] PROGMEM = TR_ROTARY_ENCODER; @@ -579,7 +579,11 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; #endif const pm_uchar font_5x7[] PROGMEM = { +#if defined (CPUARM) #include "font_05x07.lbm" +#else +#include "font_05x07_avr.lbm" +#endif #if defined(TRANSLATIONS_DE) #include "font_de_05x07.lbm" #elif defined(TRANSLATIONS_CZ) diff --git a/radio/src/translations.h b/radio/src/translations.h index 2a0343314..18c39df1a 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -443,8 +443,8 @@ extern const pm_char STR_MENUINPUTS[]; extern const pm_char STR_MENULIMITS[]; extern const pm_char STR_MENUCURVES[]; extern const pm_char STR_MENUCURVE[]; -extern const pm_char STR_MENUCUSTOMSWITCH[]; -extern const pm_char STR_MENUCUSTOMSWITCHES[]; +extern const pm_char STR_MENULOGICALSWITCH[]; +extern const pm_char STR_MENULOGICALSWITCHES[]; extern const pm_char STR_MENUCUSTOMFUNC[]; extern const pm_char STR_MENUCUSTOMSCRIPTS[]; extern const pm_char STR_MENUCUSTOMSCRIPT[]; diff --git a/radio/src/translations/.gitignore b/radio/src/translations/.gitignore index c87e4f22e..f1029c186 100644 --- a/radio/src/translations/.gitignore +++ b/radio/src/translations/.gitignore @@ -1,3 +1,4 @@ +/en.h /cz.h /de.h /es.h diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index ba6ce43cb..4a6fba404 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -174,7 +174,11 @@ #endif #define LEN_VCSWFUNC "\005" -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a