[Companion] Show custom control names throughout the UI (& internal refactoring) (#4693)
* [Companion] Introduce new Boards class to further consolidate hardware metadata and remove some globals.
* [Companion] * RawSource::toString() and RawSwitch::toString() can now return custom hardware names (if given a GeneralSettings object) for the following types (respectively):
SOURCE_TYPE_STICK, SOURCE_TYPE_SWITCH, SWITCH_TYPE_SWITCH, & SWITCH_TYPE_MULTIPOS_POT;
* RawSource::isPot() and isSlider() can now return their own index position in potConfig[]/sliderConfig[];
* Switch indicator strings can be localized if necessary.
* [Companion] Refactor model printers to use new RawSource/RawSwitch capabilities; Simplify model-to-printer mapping scheme in multimodelprinter; Use const ModelData pointer.
* [Companion] Refactor how RawSource and RawSwitch selection combo boxes are populated, using cache-able data models instead of direct manipulation; Refactor some other Helpers function into their own namespace.
* Cosmetics & forgotten qualifier.
This commit is contained in:
committed by
Bertrand Songis
parent
627347a48c
commit
f5ab145d2f
@@ -84,17 +84,13 @@ QStringList getDfuArgs(const QString & cmd, const QString & filename)
|
||||
{
|
||||
QStringList args;
|
||||
burnConfigDialog bcd;
|
||||
QString memory = "0x08000000";
|
||||
if (cmd == "-U") {
|
||||
memory.append(QString(":%1").arg(getCurrentFirmware()->getFlashSize()));
|
||||
}
|
||||
args << bcd.getDFUArgs();
|
||||
if (!filename.endsWith(".dfu")) {
|
||||
args << "--dfuse-address" << memory;
|
||||
}
|
||||
args << "-d" << "0483:df11";
|
||||
QString fullcmd = cmd + filename;
|
||||
args << "" << fullcmd;
|
||||
if (!filename.endsWith(".dfu"))
|
||||
args << "--dfuse-address" << "0x08000000";
|
||||
if (cmd == "-U")
|
||||
args.last().append(":" % QString::number(Boards::getFlashSize(getCurrentBoard())));
|
||||
args << "--device" << "0483:df11";
|
||||
args << "" << cmd % filename;
|
||||
return args;
|
||||
}
|
||||
|
||||
@@ -467,7 +463,7 @@ QString findMassstoragePath(const QString & filename, bool onlyPath)
|
||||
#if !defined __APPLE__
|
||||
QString fstype = entry->me_type;
|
||||
// qDebug() << eepromfile;
|
||||
|
||||
|
||||
if (fstype.contains("fat") && QFile::exists(eepromfile)) {
|
||||
#else
|
||||
if (QFile::exists(eepromfile)) {
|
||||
|
||||
Reference in New Issue
Block a user