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

Compilation fixes for Arch Linux

Browse source
This commit is contained in:
Bertrand Songis 2017-01-07 18:42:56 +01:00
parent 91c00d0728
commit 54742fcad9
16 changed files with 2471 additions and 2473 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/audio_arm.cpp
View file

@ -306,7 +306,7 @@ void getSwitchAudioFile(char * filename, swsrc_t index)
strcpy(str, positions[swinfo.rem]); strcpy(str, positions[swinfo.rem]);
} }
else { else {
div_t swinfo = div(index - SWSRC_FIRST_MULTIPOS_SWITCH, XPOTS_MULTIPOS_COUNT); div_t swinfo = div(int(index - SWSRC_FIRST_MULTIPOS_SWITCH), XPOTS_MULTIPOS_COUNT);
*str++ = 'S'; *str++ = 'S';
*str++ = '1' + swinfo.quot; *str++ = '1' + swinfo.quot;
*str++ = '1' + swinfo.rem; *str++ = '1' + swinfo.rem;

2
radio/src/gui/212x64/lcd.cpp
View file

@ -532,7 +532,7 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
tme = -tme; tme = -tme;
} }
qr = div(tme, 60); qr = div((int)tme, 60);
#define separator ':' #define separator ':'
if (att & TIMEHOUR) { if (att & TIMEHOUR) {

8
radio/src/logs.cpp
View file

@ -305,9 +305,9 @@ void logsWrite()
if (sensor.logs) { if (sensor.logs) {
if (sensor.unit == UNIT_GPS) { if (sensor.unit == UNIT_GPS) {
if (telemetryItem.gps.longitude && telemetryItem.gps.latitude) { if (telemetryItem.gps.longitude && telemetryItem.gps.latitude) {
div_t qr = div(telemetryItem.gps.latitude, 1000000); div_t qr = div((int)telemetryItem.gps.latitude, 1000000);
f_printf(&g_oLogFile, "%d.%06d ", qr.quot, abs(qr.rem)); f_printf(&g_oLogFile, "%d.%06d ", qr.quot, abs(qr.rem));
qr = div(telemetryItem.gps.longitude, 1000000); qr = div((int)telemetryItem.gps.longitude, 1000000);
f_printf(&g_oLogFile, "%d.%06d,", qr.quot, abs(qr.rem)); f_printf(&g_oLogFile, "%d.%06d,", qr.quot, abs(qr.rem));
} }
else { else {
@ -318,12 +318,12 @@ void logsWrite()
f_printf(&g_oLogFile, "%4d-%02d-%02d %02d:%02d:%02d,", telemetryItem.datetime.year, telemetryItem.datetime.month, telemetryItem.datetime.day, telemetryItem.datetime.hour, telemetryItem.datetime.min, telemetryItem.datetime.sec); f_printf(&g_oLogFile, "%4d-%02d-%02d %02d:%02d:%02d,", telemetryItem.datetime.year, telemetryItem.datetime.month, telemetryItem.datetime.day, telemetryItem.datetime.hour, telemetryItem.datetime.min, telemetryItem.datetime.sec);
} }
else if (sensor.prec == 2) { else if (sensor.prec == 2) {
div_t qr = div(telemetryItem.value, 100); div_t qr = div((int)telemetryItem.value, 100);
if (telemetryItem.value < 0) f_printf(&g_oLogFile, "-"); if (telemetryItem.value < 0) f_printf(&g_oLogFile, "-");
f_printf(&g_oLogFile, "%d.%02d,", abs(qr.quot), abs(qr.rem)); f_printf(&g_oLogFile, "%d.%02d,", abs(qr.quot), abs(qr.rem));
} }
else if (sensor.prec == 1) { else if (sensor.prec == 1) {
div_t qr = div(telemetryItem.value, 10); div_t qr = div((int)telemetryItem.value, 10);
if (telemetryItem.value < 0) f_printf(&g_oLogFile, "-"); if (telemetryItem.value < 0) f_printf(&g_oLogFile, "-");
f_printf(&g_oLogFile, "%d.%d,", abs(qr.quot), abs(qr.rem)); f_printf(&g_oLogFile, "%d.%d,", abs(qr.quot), abs(qr.rem));
} }

4
radio/src/strhelpers.cpp
View file

@ -169,7 +169,7 @@ char * getTimerString(char * dest, putstime_t tme, uint8_t hours)
*s++ = '-'; *s++ = '-';
} }
qr = div(tme, 60); qr = div((int)tme, 60);
if (hours) { if (hours) {
div_t qr2 = div(qr.quot, 60); div_t qr2 = div(qr.quot, 60);
@ -254,7 +254,7 @@ char * getSwitchString(char * dest, swsrc_t idx)
#endif #endif
#if NUM_XPOTS > 0 #if NUM_XPOTS > 0
else if (idx <= SWSRC_LAST_MULTIPOS_SWITCH) { else if (idx <= SWSRC_LAST_MULTIPOS_SWITCH) {
div_t swinfo = div(idx - SWSRC_FIRST_MULTIPOS_SWITCH, XPOTS_MULTIPOS_COUNT); div_t swinfo = div(int(idx - SWSRC_FIRST_MULTIPOS_SWITCH), XPOTS_MULTIPOS_COUNT);
char temp[LEN_ANA_NAME+1]; char temp[LEN_ANA_NAME+1];
getSourceString(temp, MIXSRC_FIRST_POT+swinfo.quot); getSourceString(temp, MIXSRC_FIRST_POT+swinfo.quot);
temp[LEN_ANA_NAME]= '\0'; temp[LEN_ANA_NAME]= '\0';

2
radio/src/targets/common/arm/stm32/f2/system_stm32f2xx.c
View file

@ -305,8 +305,6 @@ static void SetSysClock(void)
/* Wait till the main PLL is used as system clock source */ /* Wait till the main PLL is used as system clock source */
while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS ) != RCC_CFGR_SWS_PLL); while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS ) != RCC_CFGR_SWS_PLL);
{
}
} }
else else
{ /* If HSE fails to start-up, the application will have wrong clock { /* If HSE fails to start-up, the application will have wrong clock

2
radio/src/translations/tts_cz.cpp
View file

@ -105,7 +105,7 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, ZENSKY); PLAY_NUMBER(qr.quot, 0, ZENSKY);
if (qr.quot == 0) if (qr.quot == 0)

2
radio/src/translations/tts_de.cpp
View file

@ -129,7 +129,7 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem > 0) {
PUSH_NUMBER_PROMPT(qr.quot); PUSH_NUMBER_PROMPT(qr.quot);
PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA); PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA);

2
radio/src/translations/tts_en.cpp
View file

@ -104,7 +104,7 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(EN_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(EN_PROMPT_POINT_BASE + qr.rem);

2
radio/src/translations/tts_es.cpp
View file

@ -148,7 +148,7 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem > 0) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(ES_PROMPT_VIRGOLA); PUSH_NUMBER_PROMPT(ES_PROMPT_VIRGOLA);

2
radio/src/translations/tts_fr.cpp
View file

@ -114,7 +114,7 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem); PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem);

2
radio/src/translations/tts_hu.cpp
View file

@ -104,7 +104,7 @@ I18N_PLAY_FUNCTION(hu, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(HU_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(HU_PROMPT_POINT_BASE + qr.rem);

2
radio/src/translations/tts_it.cpp
View file

@ -127,7 +127,7 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem > 0) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(IT_PROMPT_VIRGOLA); PUSH_NUMBER_PROMPT(IT_PROMPT_VIRGOLA);

2
radio/src/translations/tts_pl.cpp
View file

@ -146,7 +146,7 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, ZENSKI); PLAY_NUMBER(qr.quot, 0, ZENSKI);
if (qr.quot == 0) if (qr.quot == 0)

2
radio/src/translations/tts_pt.cpp
View file

@ -133,7 +133,7 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem > 0) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(PT_PROMPT_VIRGULA); PUSH_NUMBER_PROMPT(PT_PROMPT_VIRGULA);

2
radio/src/translations/tts_se.cpp
View file

@ -105,7 +105,7 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(SE_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(SE_PROMPT_POINT_BASE + qr.rem);

2
radio/src/translations/tts_sk.cpp
View file

@ -120,7 +120,7 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
#else #else
// we assume that we are PREC1 // we assume that we are PREC1
#endif #endif
div_t qr = div(number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem) {
PLAY_NUMBER(qr.quot, 0, ZENSKY); PLAY_NUMBER(qr.quot, 0, ZENSKY);
if (qr.quot == 0) if (qr.quot == 0)