mirror of
https://github.com/opentx/opentx.git
synced 2025-07-24 00:35:18 +03:00
Remarks from Damjan in e8aaa67450 taken into account
This commit is contained in:
Bertrand Songis
parent
d85ee61cb3
commit
efb37a4419
5 changed files with 50 additions and 62 deletions
|
|
@ -57,16 +57,16 @@ PLAY_FUNCTION(playValue, source_t idx)
|
|||
if (telemetrySensor.prec > 0) {
|
||||
if (telemetrySensor.prec == 2) {
|
||||
if (val >= 5000) {
|
||||
val = div100_and_round(val);
|
||||
val = div_and_round<100>(val);
|
||||
}
|
||||
else {
|
||||
val = div10_and_round(val);
|
||||
val = div_and_round<10>(val);
|
||||
attr = PREC1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (val >= 500) {
|
||||
val = div10_and_round(val);
|
||||
val = div_and_round<10>(val);
|
||||
}
|
||||
else {
|
||||
attr = PREC1;
|
||||
|
|
@ -113,7 +113,7 @@ PLAY_FUNCTION(playValue, source_t idx)
|
|||
if (TELEMETRY_STREAMING()) {
|
||||
idx -= (MIXSRC_FIRST_TELEM+TELEM_A1-1);
|
||||
uint8_t att = 0;
|
||||
int16_t converted_value = div10_and_round(applyChannelRatio(idx, val));;
|
||||
int16_t converted_value = div_and_round<10>(applyChannelRatio(idx, val));;
|
||||
if (ANA_CHANNEL_UNIT(idx) < UNIT_RAW) {
|
||||
att = PREC1;
|
||||
}
|
||||
|
|
@ -122,7 +122,7 @@ PLAY_FUNCTION(playValue, source_t idx)
|
|||
break;
|
||||
case MIXSRC_FIRST_TELEM+TELEM_CELL-1:
|
||||
case MIXSRC_FIRST_TELEM+TELEM_MIN_CELL-1:
|
||||
PLAY_NUMBER(div10_and_round(val), 1+UNIT_VOLTS, PREC1);
|
||||
PLAY_NUMBER(div_and_round<10>(val), 1+UNIT_VOLTS, PREC1);
|
||||
break;
|
||||
|
||||
case MIXSRC_FIRST_TELEM+TELEM_VFAS-1:
|
||||
|
|
@ -140,11 +140,11 @@ PLAY_FUNCTION(playValue, source_t idx)
|
|||
case MIXSRC_FIRST_TELEM+TELEM_ACCx-1:
|
||||
case MIXSRC_FIRST_TELEM+TELEM_ACCy-1:
|
||||
case MIXSRC_FIRST_TELEM+TELEM_ACCz-1:
|
||||
PLAY_NUMBER(div10_and_round(val), 1+UNIT_G, PREC1);
|
||||
PLAY_NUMBER(div_and_round<10>(val), 1+UNIT_G, PREC1);
|
||||
break;
|
||||
|
||||
case MIXSRC_FIRST_TELEM+TELEM_VSPEED-1:
|
||||
PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1);
|
||||
PLAY_NUMBER(div_and_round<10>(val), 1+UNIT_METERS_PER_SECOND, PREC1);
|
||||
break;
|
||||
|
||||
case MIXSRC_FIRST_TELEM+TELEM_ASPEED-1:
|
||||
|
|
@ -176,9 +176,9 @@ PLAY_FUNCTION(playValue, source_t idx)
|
|||
{
|
||||
getvalue_t rpm = val;
|
||||
if (rpm > 100)
|
||||
rpm = 10 * div10_and_round(rpm);
|
||||
rpm = 10 * div_and_round<10>(rpm);
|
||||
if (rpm > 1000)
|
||||
rpm = 10 * div10_and_round(rpm);
|
||||
rpm = 10 * div_and_round<10>(rpm);
|
||||
PLAY_NUMBER(rpm, 1+UNIT_RPMS, 0);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -969,14 +969,14 @@ void putsTelemetryChannelValue(coord_t x, coord_t y, uint8_t channel, lcdint_t v
|
|||
{
|
||||
lcdint_t converted_value = applyChannelRatio(channel, val);
|
||||
if (ANA_CHANNEL_UNIT(channel) >= UNIT_RAW) {
|
||||
converted_value = div10_and_round(converted_value);
|
||||
converted_value = div_and_round<10>(converted_value);
|
||||
}
|
||||
else {
|
||||
if (abs(converted_value) < 1000) {
|
||||
att |= PREC2;
|
||||
}
|
||||
else {
|
||||
converted_value = div10_and_round(converted_value);
|
||||
converted_value = div_and_round<10>(converted_value);
|
||||
att |= PREC1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1019,7 +1019,7 @@ void putsTelemetryChannelValue(coord_t x, coord_t y, uint8_t channel, lcdint_t v
|
|||
break;
|
||||
|
||||
case TELEM_VSPEED-1:
|
||||
putsValueWithUnit(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
|
||||
putsValueWithUnit(x, y, div_and_round<10>(val), UNIT_RAW, att|PREC1);
|
||||
break;
|
||||
|
||||
case TELEM_ASPEED-1:
|
||||
|
|
@ -1041,7 +1041,7 @@ void putsTelemetryChannelValue(coord_t x, coord_t y, uint8_t channel, lcdint_t v
|
|||
|
||||
#if defined(FRSKY_SPORT)
|
||||
case TELEM_ALT-1:
|
||||
putsValueWithUnit(x, y, div10_and_round(val), UNIT_DIST, att|PREC1);
|
||||
putsValueWithUnit(x, y, div_and_round<10>(val), UNIT_DIST, att|PREC1);
|
||||
break;
|
||||
#elif defined(WS_HOW_HIGH)
|
||||
case TELEM_ALT-1:
|
||||
|
|
|
|||
|
|
@ -127,27 +127,6 @@ uint16_t isqrt32(uint32_t n)
|
|||
-205 -> -21
|
||||
-204 -> -20
|
||||
*/
|
||||
getvalue_t div10_and_round(getvalue_t value)
|
||||
{
|
||||
if (value >= 0 ) {
|
||||
value += 5;
|
||||
}
|
||||
else {
|
||||
value -= 5;
|
||||
}
|
||||
return value/10;
|
||||
}
|
||||
|
||||
getvalue_t div100_and_round(getvalue_t value)
|
||||
{
|
||||
if (value >= 0 ) {
|
||||
value += 50;
|
||||
}
|
||||
else {
|
||||
value -= 50;
|
||||
}
|
||||
return value/100;
|
||||
}
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
double gpsToDouble(bool neg, int16_t bp, int16_t ap)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ int16_t ex_chans[NUM_CHNOUT] = {0}; // Outputs (before LIMITS) of the last perMa
|
|||
int16_t cyc_anas[3] = {0};
|
||||
#endif
|
||||
|
||||
void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
||||
void applyExpos(int16_t * anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
||||
{
|
||||
#if !defined(VIRTUALINPUTS)
|
||||
int16_t anas2[NUM_INPUTS]; // values before expo, to ensure same expo base when multiple expo lines are used
|
||||
|
|
@ -70,7 +70,7 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
|||
continue;
|
||||
if (getSwitch(ed->swtch)) {
|
||||
#if defined(VIRTUALINPUTS)
|
||||
int v;
|
||||
int32_t v;
|
||||
if (ed->srcRaw == ovwrIdx) {
|
||||
v = ovwrValue;
|
||||
}
|
||||
|
|
@ -108,7 +108,7 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
|||
//========== WEIGHT ===============
|
||||
#if defined(CPUARM)
|
||||
int32_t weight = GET_GVAR_PREC1(ed->weight, MIN_EXPO_WEIGHT, 100, mixerCurrentFlightMode);
|
||||
v = ((int32_t)v * weight) / 1000;
|
||||
v = div_and_round<1000>((int32_t)v * weight);
|
||||
#else
|
||||
int16_t weight = GET_GVAR(ed->weight, MIN_EXPO_WEIGHT, 100, mixerCurrentFlightMode);
|
||||
weight = calc100to256(weight);
|
||||
|
|
@ -118,7 +118,7 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
|||
#if defined(VIRTUALINPUTS)
|
||||
//========== OFFSET ===============
|
||||
int32_t offset = GET_GVAR_PREC1(ed->offset, -100, 100, mixerCurrentFlightMode);
|
||||
if (offset) v += calc100toRESX(offset) / 10;
|
||||
if (offset) v += div_and_round<10>(calc100toRESX(offset));
|
||||
|
||||
//========== TRIMS ================
|
||||
if (ed->carryTrim < TRIM_ON)
|
||||
|
|
@ -856,14 +856,14 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
|
|||
//========== WEIGHT ===============
|
||||
int32_t dv = (int32_t)v * weight;
|
||||
#if defined(CPUARM)
|
||||
dv /= 10;
|
||||
dv = div_and_round<10>(dv);
|
||||
#endif
|
||||
|
||||
//========== OFFSET / AFTER ===============
|
||||
if (apply_offset_and_curve) {
|
||||
#if defined(CPUARM)
|
||||
int32_t offset = GET_GVAR_PREC1(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
||||
if (offset) dv += int32_t(calc100toRESX_16Bits(offset) / 10) << 8;
|
||||
if (offset) dv += div_and_round<10>(calc100toRESX_16Bits(offset)) << 8;
|
||||
#else
|
||||
int16_t offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
||||
if (offset) dv += int32_t(calc100toRESX_16Bits(offset)) << 8;
|
||||
|
|
|
|||
|
|
@ -1634,8 +1634,17 @@ lcdint_t applyChannelRatio(source_t channel, lcdint_t val);
|
|||
#define ANA_CHANNEL_UNIT(channel) g_model.frsky.channels[channel].type
|
||||
#endif
|
||||
|
||||
getvalue_t div10_and_round(getvalue_t value);
|
||||
getvalue_t div100_and_round(getvalue_t value);
|
||||
template<int I>
|
||||
getvalue_t div_and_round(getvalue_t value)
|
||||
{
|
||||
if (value >= 0 ) {
|
||||
value += I / 2;
|
||||
}
|
||||
else {
|
||||
value -= I / 2;
|
||||
}
|
||||
return value / I;
|
||||
}
|
||||
|
||||
#if defined(FRSKY)
|
||||
NOINLINE uint8_t getRssiAlarmValue(uint8_t alarm);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue