Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2016-07-22 18:16:50 +02:00
parent 352de89838
commit 43d618a1de
5 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/Bitmaps.cmake
View file

@ -20,5 +20,5 @@ macro(add_truetype_font_target radio name font size bold)
COMMAND ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target} COMMAND ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
) )
set(ttf_horus_fonts_targets ${ttf_horus_fonts_targets} ttf_${radio}_${name}) set(ttf_${radio}_fonts_targets ${ttf_${radio}_fonts_targets} ttf_${radio}_${name})
endmacro(add_truetype_font_target) endmacro(add_truetype_font_target)

5
companion/src/logsdialog.cpp
View file

@ -1070,7 +1070,9 @@ void LogsDialog::addMaxAltitudeMarker(const coords & c, QCPGraph * graph) {
tracerMaxAlt->updatePosition(); tracerMaxAlt->updatePosition();
} }
void LogsDialog::countNumberOfThrows(const coords & c, QCPGraph * graph) { void LogsDialog::countNumberOfThrows(const coords & c, QCPGraph * graph)
{
#if 0
// find all launches // find all launches
// TODO // TODO
double startTime = c.x.at(0); double startTime = c.x.at(0);
@ -1079,6 +1081,7 @@ void LogsDialog::countNumberOfThrows(const coords & c, QCPGraph * graph) {
double alt = c.y.at(i); double alt = c.y.at(i);
double time = c.x.at(i); double time = c.x.at(i);
} }
#endif
} }
void LogsDialog::addCursor(QCPItemTracer ** cursor, QCPGraph * graph, const QColor & color) { void LogsDialog::addCursor(QCPItemTracer ** cursor, QCPGraph * graph, const QColor & color) {

1
radio/src/fonts/horus/CMakeLists.txt
View file

@ -7,4 +7,5 @@ add_truetype_font_target(horus stdsizebold ${FONT} 16 True)
add_truetype_font_target(horus midsize ${FONT} 24 False) add_truetype_font_target(horus midsize ${FONT} 24 False)
add_truetype_font_target(horus dblsize ${FONT} 32 True) add_truetype_font_target(horus dblsize ${FONT} 32 True)
add_truetype_font_target(horus xxlsize ${FONT} 48 False) add_truetype_font_target(horus xxlsize ${FONT} 48 False)
add_custom_target(ttf_horus_fonts DEPENDS ${ttf_horus_fonts_targets}) add_custom_target(ttf_horus_fonts DEPENDS ${ttf_horus_fonts_targets})

9
radio/src/gui/gui_helpers.cpp
View file

@ -230,7 +230,7 @@ bool isInputSourceAvailable(int source)
if (source>=MIXSRC_FIRST_CH && source<=MIXSRC_LAST_CH) if (source>=MIXSRC_FIRST_CH && source<=MIXSRC_LAST_CH)
return true; return true;
if (source>=MIXSRC_FIRST_LOGICAL_SWITCH && source<=MIXSRC_LAST_LOGICAL_SWITCH) { if (source>=MIXSRC_FIRST_LOGICAL_SWITCH && source<=MIXSRC_LAST_LOGICAL_SWITCH) {
LogicalSwitchData * cs = lswAddress(source-MIXSRC_SW1); LogicalSwitchData * cs = lswAddress(source-MIXSRC_SW1);
return (cs->func != LS_FUNC_NONE); return (cs->func != LS_FUNC_NONE);
@ -467,6 +467,12 @@ bool isSourceAvailableInResetSpecialFunction(int index)
} }
} }
#if defined(PCBFLAMENCO)
bool isModuleAvailable(int module)
{
return true;
}
#else
bool isModuleAvailable(int module) bool isModuleAvailable(int module)
{ {
#if defined(CROSSFIRE) #if defined(CROSSFIRE)
@ -476,6 +482,7 @@ bool isModuleAvailable(int module)
#endif #endif
return true; return true;
} }
#endif
bool isRfProtocolAvailable(int protocol) bool isRfProtocolAvailable(int protocol)
{ {

2
radio/src/gui/horus/radio_calibration.cpp
View file

@ -170,7 +170,7 @@ bool menuCommonCalib(evt_t event)
// MOVE STICKS/POTS // MOVE STICKS/POTS
lcdDrawText(50, 3, STR_MENUCALIBRATION, MENU_TITLE_COLOR); lcdDrawText(50, 3, STR_MENUCALIBRATION, MENU_TITLE_COLOR);
lcdDrawText(50, 3+FH, STR_MOVESTICKSPOTS, MENU_TITLE_COLOR); lcdDrawText(50, 3+FH, STR_MOVESTICKSPOTS, MENU_TITLE_COLOR);
for (int i=0; i<NUM_STICKS+NUM_POTS+NUM_MOUSE_ANALOGS; i++) { for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_MOUSE_ANALOGS; i++) {
if (abs(reusableBuffer.calib.loVals[i]-reusableBuffer.calib.hiVals[i]) > 50) { if (abs(reusableBuffer.calib.loVals[i]-reusableBuffer.calib.hiVals[i]) > 50) {
g_eeGeneral.calib[i].mid = reusableBuffer.calib.midVals[i]; g_eeGeneral.calib[i].mid = reusableBuffer.calib.midVals[i];
int16_t v = reusableBuffer.calib.midVals[i] - reusableBuffer.calib.loVals[i]; int16_t v = reusableBuffer.calib.midVals[i] - reusableBuffer.calib.loVals[i];