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

WARNINGS_AS_ERRORS enabled in commit tests for X7D

Browse source
This commit is contained in:
Damjan Adamic 2016-10-12 22:17:55 +02:00
parent 0d74148d70
commit 10f3d1c4b7
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/gui/128x64/radio_sdmanager.cpp
View file

@ -137,7 +137,10 @@ void menuRadioSdManager(event_t _event)
#endif
case EVT_KEY_FIRST(KEY_ENTER):
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wtype-limits"
if (menuVerticalPosition >= HEADER_LINE) {
#pragma GCC diagnostic pop
vertpos_t index = menuVerticalPosition-HEADER_LINE-menuVerticalOffset;
if (!reusableBuffer.sdmanager.lines[index][SD_SCREEN_FILE_LENGTH+1]) {
f_chdir(reusableBuffer.sdmanager.lines[index]);
@ -155,7 +158,10 @@ void menuRadioSdManager(event_t _event)
case EVT_KEY_LONG(KEY_ENTER):
killEvents(_event);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wtype-limits"
if (menuVerticalPosition < HEADER_LINE) {
#pragma GCC diagnostic pop
POPUP_MENU_ADD_ITEM(STR_SD_INFO);
POPUP_MENU_ADD_ITEM(STR_SD_FORMAT);
}

10
radio/src/gui/128x64/view_channels.cpp
View file

@ -101,11 +101,11 @@ void menuChannelsView(event_t event)
#endif
// Gauge
#ifdef MIXERS_MONITOR
uint16_t lim = mixersView ? 512*2*2 : (g_model.extendedLimits ? 640*2 : 512*2);
#else
uint16_t lim = g_model.extendedLimits ? 640*2 : 512*2;
#endif
// #ifdef MIXERS_MONITOR
// uint16_t lim = mixersView ? 512*2*2 : (g_model.extendedLimits ? 640*2 : 512*2);
// #else
// uint16_t lim = g_model.extendedLimits ? 640*2 : 512*2;
// #endif
// TODO ? drawGauge(x+LCD_W/2-3-wbar-ofs, y, wbar, 6, val, lim);
ch++;

6
tools/commit-tests.sh
View file

@ -85,21 +85,21 @@ make -j${CORES} gtests ; ./gtests
# OpenTX on X7D
rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES ${SRCDIR}
cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware
make -j${CORES} simu
make -j${CORES} gtests ; ./gtests
# OpenTX on X9D
rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware
make -j${CORES} simu
make -j${CORES} gtests ; ./gtests
# OpenTX on X9D+
rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware
make -j${CORES} simu
make -j${CORES} gtests ; ./gtests