Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 00:05:17 +03:00
Code Issues Wiki Activity

One TODO less ...

Browse source
This commit is contained in:
Bertrand Songis 2014-02-20 13:01:22 +01:00
parent e0a03f6728
commit a14848fc7f
5 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/CMakeLists.txt
View file

@ -314,7 +314,7 @@ set(simu_SRCS
${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
file.cpp # TODO not needed
helpers.cpp # TODO not needed
# helpers.cpp # TODO not needed
modeledit/node.cpp
modeledit/edge.cpp # TODO not needed
simulation/main.cpp
@ -322,7 +322,7 @@ set(simu_SRCS
set(simu_HDRS
modeledit/node.h
helpers.h # TODO not needed
# helpers.h # TODO not needed
myslider.h # TODO not needed
)

41
companion/src/eeprominterface.cpp
View file

@ -37,6 +37,47 @@ void getEEPROMString(char *dst, const char *src, int size)
}
}
float ValToTim(int value)
{
return ((value < -109 ? 129+value : (value < 7 ? (113+value)*5 : (53+value)*10))/10.0);
}
int TimToVal(float value)
{
int temp;
if (value>60) {
temp=136+round((value-60));
}
else if (value>2) {
temp=20+round((value-2.0)*2.0);
}
else {
temp=round(value*10.0);
}
return (temp-129);
}
QString getSignedStr(int value)
{
return value > 0 ? QString("+%1").arg(value) : QString("%1").arg(value);
}
QString getGVarString(int16_t val, bool sign)
{
if (val >= -10000 && val <= 10000) {
if (sign)
return QString("%1%").arg(getSignedStr(val));
else
return QString("%1%").arg(val);
}
else {
if (val<0)
return QObject::tr("-GV%1").arg(-val-10000);
else
return QObject::tr("GV%1").arg(val-10000);
}
}
RawSourceRange RawSource::getRange(bool singleprec)
{
RawSourceRange result;

6
companion/src/eeprominterface.h
View file

@ -1116,6 +1116,12 @@ extern QString EEPROMWarnings;
void setEEPROMString(char *dst, const char *src, int size);
void getEEPROMString(char *dst, const char *src, int size);
float ValToTim(int value);
int TimToVal(float value);
QString getSignedStr(int value);
QString getGVarString(int16_t val, bool sign=false);
inline int applyStickMode(int stick, unsigned int mode)
{
if (mode == 0 || mode > 4) {

39
companion/src/helpers.cpp
View file

@ -636,24 +636,6 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
b->setMaxVisibleItems(10);
}
float ValToTim(int value)
{
return ((value < -109 ? 129+value : (value < 7 ? (113+value)*5 : (53+value)*10))/10.0);
}
int TimToVal(float value)
{
int temp;
if (value>60) {
temp=136+round((value-60));
} else if (value>2) {
temp=20+round((value-2.0)*2.0);
} else {
temp=round(value*10.0);
}
return (temp-129);
}
void populateCSWCB(QComboBox *b, int value)
{
int order[] = {
@ -695,27 +677,6 @@ void populateCSWCB(QComboBox *b, int value)
b->setMaxVisibleItems(10);
}
QString getSignedStr(int value)
{
return value > 0 ? QString("+%1").arg(value) : QString("%1").arg(value);
}
QString getGVarString(int16_t val, bool sign)
{
if (val >= -10000 && val <= 10000) {
if (sign)
return QString("%1%").arg(getSignedStr(val));
else
return QString("%1%").arg(val);
}
else {
if (val<0)
return QObject::tr("-GV%1").arg(-val-10000);
else
return QObject::tr("GV%1").arg(val-10000);
}
}
QString image2qstring(QImage image)
{
if (image.isNull())

5
companion/src/helpers.h
View file

@ -109,8 +109,6 @@ void populateSourceCB(QComboBox *b, const RawSource &source, const ModelData & m
void populateCSWCB(QComboBox *b, int value);
QString getPhaseName(int val, char * phasename=NULL);
QString getInputStr(ModelData & model, int index);
QString getSignedStr(int value);
QString getGVarString(int16_t val, bool sign=false);
QString image2qstring(QImage image);
QImage qstring2image(QString imagestr);
int findmult(float value, float base);
@ -128,9 +126,6 @@ QString getFrSkyProtocol(int protocol);
QString getFrSkyMeasure(int units);
QString getFrSkySrc(int index);
float ValToTim(int value);
int TimToVal(float value);
void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx);
#endif // HELPERS_H