Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

RxBatt alarms added to EEPROM export in companion. Still missing the UI.

Browse source 
Someone will have time for it? Otherwise it will wait next week.
This commit is contained in:
bsongis 2014-05-25 09:58:11 +02:00
parent 2fd1f575ba
commit 59d121e5d4
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/eeprominterface.h
View file

@ -896,6 +896,7 @@ class FrSkyData {
bool mAhPersistent; bool mAhPersistent;
unsigned int storedMah; unsigned int storedMah;
int fasOffset; int fasOffset;
unsigned int rxBattAlarms[2];
void clear(); void clear();
}; };
@ -1016,10 +1017,7 @@ class ModelData {
uint8_t bt_telemetry; uint8_t bt_telemetry;
uint8_t numVoice; uint8_t numVoice;
MavlinkData mavlink; MavlinkData mavlink;
/* FrSky */
FrSkyData frsky; FrSkyData frsky;
FrSkyErAlarmData frskyalarms[8];
uint8_t customdisplay[6];
char bitmap[10+1]; char bitmap[10+1];

16
companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
View file

@ -722,14 +722,14 @@ t_Ersky9xModelData_v11::operator ModelData ()
c9x.frsky.usrProto=FrSkyUsrProto; c9x.frsky.usrProto=FrSkyUsrProto;
c9x.frsky.imperial=FrSkyImperial; c9x.frsky.imperial=FrSkyImperial;
c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt; c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
for (int i=0; i<8; i++) { // for (int i=0; i<8; i++) {
c9x.frskyalarms[i].frskyAlarmLimit=frskyAlarms.alarmData[i].frskyAlarmLimit; // c9x.frskyalarms[i].frskyAlarmLimit=frskyAlarms.alarmData[i].frskyAlarmLimit;
c9x.frskyalarms[i].frskyAlarmSound=frskyAlarms.alarmData[i].frskyAlarmSound; // c9x.frskyalarms[i].frskyAlarmSound=frskyAlarms.alarmData[i].frskyAlarmSound;
c9x.frskyalarms[i].frskyAlarmType=frskyAlarms.alarmData[i].frskyAlarmType; // c9x.frskyalarms[i].frskyAlarmType=frskyAlarms.alarmData[i].frskyAlarmType;
} // }
for (int i=0; i<8; i++) { // for (int i=0; i<8; i++) {
c9x.customdisplay[i]=customDisplayIndex[i]; // c9x.customdisplay[i]=customDisplayIndex[i];
} // }
for (int i=0; i<5;i++) { for (int i=0; i<5;i++) {
c9x.phaseData[0].gvars[i]=gvars[i].gvar; c9x.phaseData[0].gvars[i]=gvars[i].gvar;
c9x.gvsource[i]=gvars[i].gvsource; c9x.gvsource[i]=gvars[i].gvsource;

5
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -2560,6 +2560,11 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
internalField.Append(new SignedField<8>(modelData.potPosition[i])); internalField.Append(new SignedField<8>(modelData.potPosition[i]));
} }
} }
if (IS_ARM(board) && version >= 216) {
internalField.Append(new UnsignedField<8>(modelData.frsky.rxBattAlarms[0]));
internalField.Append(new UnsignedField<8>(modelData.frsky.rxBattAlarms[1]));
}
} }
void OpenTxModelData::beforeExport() void OpenTxModelData::beforeExport()