Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 00:35:14 +03:00
Code Activity

Changed every single QSetting in Companion.

Browse source 
Next step: Function renaming
This commit is contained in:
Kjell Kernen 2014-02-18 23:48:57 +01:00
parent f617ae1362
commit da68c593cf
28 changed files with 1048 additions and 924 deletions
Download patch file Download diff file Expand all files Collapse all files

44
companion/src/eeprominterface.cpp
View file

@ -6,7 +6,6 @@
#include "firmwares/gruvin9x/gruvin9xinterface.h"
#include "firmwares/opentx/opentxinterface.h"
#include "firmwares/ersky9x/ersky9xinterface.h"
#include "qsettings.h"
#include "appdata.h"
#include "helpers.h"
@ -732,34 +731,25 @@ GeneralSettings::GeneralSettings()
calibSpanNeg[i] = 0x180;
calibSpanPos[i] = 0x180;
}
QSettings settings;
templateSetup = settings.value("default_channel_order", 0).toInt();
stickMode = settings.value("default_mode", 1).toInt();
int profile_id = glob.profileId();
if (profile_id>-1) {
settings.beginGroup("Profiles");
QString profile=QString("profile%1").arg(profile_id);
settings.beginGroup(profile);
QString t_calib=settings.value("StickPotCalib","").toString();
templateSetup = g.profile[g.id()].default_channel_order();
stickMode = g.profile[g.id()].default_mode();
QString t_calib=g.profile[g.id()].StickPotCalib();
int potsnum=GetEepromInterface()->getCapability(Pots);
if (t_calib.isEmpty()) {
settings.endGroup();
settings.endGroup();
return;
} else {
QString t_trainercalib=settings.value("TrainerCalib","").toString();
int8_t t_vBatCalib=(int8_t)settings.value("VbatCalib", vBatCalib).toInt();
int8_t t_currentCalib=(int8_t)settings.value("currentCalib", currentCalib).toInt();
int8_t t_PPM_Multiplier=(int8_t)settings.value("PPM_Multiplier", PPM_Multiplier).toInt();
uint8_t t_stickMode=(uint8_t)settings.value("GSStickMode", stickMode).toUInt();
uint8_t t_vBatWarn=(uint8_t)settings.value("vBatWarn",vBatWarn).toUInt();
QString t_DisplaySet=settings.value("Display","").toString();
QString t_BeeperSet=settings.value("Beeper","").toString();
QString t_HapticSet=settings.value("Haptic","").toString();
QString t_SpeakerSet=settings.value("Speaker","").toString();
QString t_CountrySet=settings.value("countryCode","").toString();
settings.endGroup();
settings.endGroup();
QString t_trainercalib=g.profile[g.id()].TrainerCalib();
int8_t t_vBatCalib=(int8_t)g.profile[g.id()].VbatCalib();
int8_t t_currentCalib=(int8_t)g.profile[g.id()].currentCalib();
int8_t t_PPM_Multiplier=(int8_t)g.profile[g.id()].PPM_Multiplier();
uint8_t t_stickMode=(uint8_t)g.profile[g.id()].GSStickMode();
uint8_t t_vBatWarn=(uint8_t)g.profile[g.id()].vBatWarn();
QString t_DisplaySet=g.profile[g.id()].Display();
QString t_BeeperSet=g.profile[g.id()].Beeper();
QString t_HapticSet=g.profile[g.id()].Haptic();
QString t_SpeakerSet=g.profile[g.id()].Speaker();
QString t_CountrySet=g.profile[g.id()].countryCode();
if ((t_calib.length()==(NUM_STICKS+potsnum)*12) && (t_trainercalib.length()==16)) {
QString Byte;
@ -841,7 +831,7 @@ GeneralSettings::GeneralSettings()
}
}
}
}
}
ModelData::ModelData()
@ -996,7 +986,7 @@ void RegisterEepromInterfaces()
eepromInterfaces.push_back(new Open9xInterface(BOARD_GRUVIN9X));
eepromInterfaces.push_back(new Open9xInterface(BOARD_SKY9X));
eepromInterfaces.push_back(new Open9xInterface(BOARD_TARANIS));
if (glob.rev4asupport())
if (g.rev4asupport())
eepromInterfaces.push_back(new Open9xInterface(BOARD_TARANIS_REV4a));
eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK));
eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X));