diff options
author | Minze Zwerver | 2019-07-12 13:48:09 +0200 |
---|---|---|
committer | Minze Zwerver | 2019-07-12 13:48:09 +0200 |
commit | d75909cb85abe4c943f31704a3fbae10cd45c439 (patch) | |
tree | 86f3a7610a70176ff21dc5425ae63ae98eb69778 | |
parent | 883f8910af1a0f33d2c1ac18d5050ac5bc6f3c75 (diff) | |
download | aur-d75909cb85abe4c943f31704a3fbae10cd45c439.tar.gz |
version 2.2.4 with some added fixes for newer compilers.
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | ref_issue.patch | 214 |
3 files changed, 228 insertions, 5 deletions
@@ -1,6 +1,6 @@ pkgbase = opentx-companion pkgdesc = EEPROM Editor for OpenTX RC transmitter firmwares - pkgver = 2.2.3 + pkgver = 2.2.4 pkgrel = 1 url = http://www.open-tx.org/ arch = x86_64 @@ -28,10 +28,12 @@ pkgbase = opentx-companion provides = companion conflicts = companion conflicts = companion9x-svn - source = https://github.com/opentx/opentx/archive/2.2.3.tar.gz + source = https://github.com/opentx/opentx/archive/2.2.4.tar.gz source = installprefix.patch - sha256sums = 58d39b1be84af58ef2db3b4a77eecad3884269a9a1f3efe8ebcf17feaa49cf50 + source = ref_issue.patch + sha256sums = abc5bced1f04e436882d5c36abc7cf53d4e17aa67db9df2b43dc036a2656141b sha256sums = 9d669cf723e98b7be5463538b0590ae7776b3b866a423cceeb30ba9840748c64 + sha256sums = baec8d907bc468771c6c425a47bcdb2ed291bdfadedc9a14884158d28e70814a pkgname = opentx-companion @@ -1,8 +1,10 @@ # Maintainer: Ysblokje <ysblokje at gmail dot com> # Previous Maintainer: Jeff Youdontneedtoknow <jeffpublicjr at gmail dot com> # Contributer: Arnaud +# +# Use with care, I accept no responsibility what so ever. pkgname=('opentx-companion') -pkgver=2.2.3 +pkgver=2.2.4 pkgrel=1 pkgdesc="EEPROM Editor for OpenTX RC transmitter firmwares" arch=('x86_64') @@ -15,16 +17,21 @@ provides=('companion') conflicts=('companion' 'companion9x-svn') source=("https://github.com/opentx/opentx/archive/$pkgver.tar.gz" "installprefix.patch" +"ref_issue.patch" ) #"qt5_modules.patch" sha256sums=( - '58d39b1be84af58ef2db3b4a77eecad3884269a9a1f3efe8ebcf17feaa49cf50' + 'abc5bced1f04e436882d5c36abc7cf53d4e17aa67db9df2b43dc036a2656141b' '9d669cf723e98b7be5463538b0590ae7776b3b866a423cceeb30ba9840748c64' + 'baec8d907bc468771c6c425a47bcdb2ed291bdfadedc9a14884158d28e70814a' ) #'30fd1396a47bfc250780786e52447547aafcf934c6fe1775e4301fa3c7185be2' build() { patch $srcdir/opentx-$pkgver/tools/build-companion-release.sh $startdir/installprefix.patch + pushd $srcdir/opentx-$pkgver/ + patch -p1 < $startdir/ref_issue.patch + popd # cd $srcdir/opentx-$pkgver # patch -t -p 1 < $startdir/qt5_modules.patch $srcdir/opentx-$pkgver/tools/build-companion-release.sh $srcdir/opentx-$pkgver dummy diff --git a/ref_issue.patch b/ref_issue.patch new file mode 100644 index 00000000000..86eed8820ab --- /dev/null +++ b/ref_issue.patch @@ -0,0 +1,214 @@ +diff --git a/radio/src/gui/128x64/model_display.cpp b/radio/src/gui/128x64/model_display.cpp +index fe475f182..912111d75 100644 +--- a/radio/src/gui/128x64/model_display.cpp ++++ b/radio/src/gui/128x64/model_display.cpp +@@ -237,11 +237,12 @@ void menuModelDisplay(event_t event) + else { + for (int c=0; c<NUM_LINE_ITEMS; c++) { + LcdFlags cellAttr = (menuHorizontalPosition==c ? attr : 0); +- source_t & value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c]; ++ auto value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c]; + const coord_t pos[] = {DISPLAY_COL1, DISPLAY_COL2, DISPLAY_COL3}; + drawSource(pos[c], y, value, cellAttr); + if (cellAttr && s_editMode>0) { + value = checkIncDec(event, value, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable); ++ g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c] = value; + } + } + if (attr && menuHorizontalPosition == NUM_LINE_ITEMS) { +diff --git a/radio/src/gui/128x64/model_gvars.cpp b/radio/src/gui/128x64/model_gvars.cpp +index 9fc3b5fbc..ce4c8dff2 100644 +--- a/radio/src/gui/128x64/model_gvars.cpp ++++ b/radio/src/gui/128x64/model_gvars.cpp +@@ -23,7 +23,7 @@ + void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags) + { + FlightModeData * fm = &g_model.flightModeData[flightMode]; +- gvar_t & v = fm->gvars[gvar]; ++ auto v = fm->gvars[gvar]; + int16_t vmin, vmax; + if (v > GVAR_MAX) { + uint8_t fm = v - GVAR_MAX - 1; +@@ -47,6 +47,7 @@ void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t fl + v = checkIncDec(event, v, vmin, vmax, EE_MODEL); + } + } ++ fm->gvars[gvar] = v; + } + + enum GVarFields { +diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp +index 5830e8d62..25d835e6a 100644 +--- a/radio/src/gui/128x64/model_setup.cpp ++++ b/radio/src/gui/128x64/model_setup.cpp +@@ -1575,13 +1575,16 @@ void menuModelFailsafe(event_t event) + s_editMode = 0; + } + else { +- int16_t & failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; ++// auto & idunno = g_model.moduleData[g_moduleIdx]; ++ auto failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; + if (failsafe < FAILSAFE_CHANNEL_HOLD) + failsafe = FAILSAFE_CHANNEL_HOLD; + else if (failsafe == FAILSAFE_CHANNEL_HOLD) + failsafe = FAILSAFE_CHANNEL_NOPULSE; + else + failsafe = 0; ++ ++ g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition] = failsafe; + } + } + else { +diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp +index eb143dbe9..9d21d411a 100644 +--- a/radio/src/gui/128x64/model_telemetry.cpp ++++ b/radio/src/gui/128x64/model_telemetry.cpp +@@ -407,9 +407,10 @@ void menuModelSensor(event_t event) + case SENSOR_FIELD_PARAM4: + { + drawStringWithIndex(0, y, NO_INDENT(STR_SOURCE), k-SENSOR_FIELD_PARAM1+1); +- int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; ++ auto source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; + if (attr) { + source = checkIncDec(event, source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); ++ sensor->calc.sources[k-SENSOR_FIELD_PARAM1] = source; + } + if (source < 0) { + lcdDrawChar(SENSOR_2ND_COLUMN, y, '-', attr); +diff --git a/radio/src/gui/212x64/model_display.cpp b/radio/src/gui/212x64/model_display.cpp +index 323b2ed45..d4430a6ca 100644 +--- a/radio/src/gui/212x64/model_display.cpp ++++ b/radio/src/gui/212x64/model_display.cpp +@@ -239,11 +239,12 @@ void menuModelDisplay(event_t event) + else { + for (int c=0; c<NUM_LINE_ITEMS; c++) { + LcdFlags cellAttr = (menuHorizontalPosition==c ? attr : 0); +- source_t & value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c]; ++ auto value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c]; + const coord_t pos[] = {DISPLAY_COL1, DISPLAY_COL2, DISPLAY_COL3}; + drawSource(pos[c], y, value, cellAttr); + if (cellAttr && s_editMode>0) { + value = checkIncDec(event, value, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable); ++ g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c] = value; + } + } + if (attr && menuHorizontalPosition == NUM_LINE_ITEMS) { +diff --git a/radio/src/gui/212x64/model_gvars.cpp b/radio/src/gui/212x64/model_gvars.cpp +index b3d196cfb..4ae4724b4 100644 +--- a/radio/src/gui/212x64/model_gvars.cpp ++++ b/radio/src/gui/212x64/model_gvars.cpp +@@ -23,7 +23,7 @@ + void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags) + { + FlightModeData * fm = &g_model.flightModeData[flightMode]; +- gvar_t & v = fm->gvars[gvar]; ++ auto v = fm->gvars[gvar]; + int16_t vmin, vmax; + if (v > GVAR_MAX) { + uint8_t fm = v - GVAR_MAX - 1; +@@ -45,6 +45,7 @@ void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t fl + } + else if (s_editMode > 0) { + v = checkIncDec(event, v, vmin, vmax, EE_MODEL); ++ fm->gvars[gvar] = v; + } + } + } +diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp +index f574020bc..a540baa8f 100644 +--- a/radio/src/gui/212x64/model_setup.cpp ++++ b/radio/src/gui/212x64/model_setup.cpp +@@ -1249,13 +1249,14 @@ void menuModelFailsafe(event_t event) + s_editMode = 0; + } + else { +- int16_t & failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; ++ auto failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; + if (failsafe < FAILSAFE_CHANNEL_HOLD) + failsafe = FAILSAFE_CHANNEL_HOLD; + else if (failsafe == FAILSAFE_CHANNEL_HOLD) + failsafe = FAILSAFE_CHANNEL_NOPULSE; + else + failsafe = 0; ++ g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition] = failsafe; + } + } + else { +diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp +index a15d5c03c..daccaba27 100644 +--- a/radio/src/gui/212x64/model_telemetry.cpp ++++ b/radio/src/gui/212x64/model_telemetry.cpp +@@ -313,9 +313,10 @@ void menuModelSensor(event_t event) + case SENSOR_FIELD_PARAM4: + { + drawStringWithIndex(0, y, NO_INDENT(STR_SOURCE), k-SENSOR_FIELD_PARAM1+1); +- int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; ++ auto source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; + if (attr) { + source = checkIncDec(event, source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); ++ sensor->calc.sources[k-SENSOR_FIELD_PARAM1] = source; + } + if (source < 0) { + lcdDrawChar(SENSOR_2ND_COLUMN, y, '-', attr); +diff --git a/radio/src/gui/480x272/model_gvars.cpp b/radio/src/gui/480x272/model_gvars.cpp +index b2bf74752..ef97e637f 100644 +--- a/radio/src/gui/480x272/model_gvars.cpp ++++ b/radio/src/gui/480x272/model_gvars.cpp +@@ -23,7 +23,7 @@ + void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags) + { + FlightModeData * fm = &g_model.flightModeData[flightMode]; +- gvar_t & v = fm->gvars[gvar]; ++ auto v = fm->gvars[gvar]; + int16_t vmin, vmax; + if (v > GVAR_MAX) { + uint8_t fm = v - GVAR_MAX - 1; +@@ -47,6 +47,7 @@ void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t fl + v = checkIncDec(event, v, vmin, vmax, EE_MODEL); + } + } ++ fm->gvars[gvar] = v; + } + + enum GVarFields { +diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp +index bb811e43f..71dbf836f 100644 +--- a/radio/src/gui/480x272/model_setup.cpp ++++ b/radio/src/gui/480x272/model_setup.cpp +@@ -1203,13 +1203,14 @@ bool menuModelFailsafe(event_t event) + s_editMode = 0; + } + else { +- int16_t & failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; ++ auto failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; + if (failsafe < FAILSAFE_CHANNEL_HOLD) + failsafe = FAILSAFE_CHANNEL_HOLD; + else if (failsafe == FAILSAFE_CHANNEL_HOLD) + failsafe = FAILSAFE_CHANNEL_NOPULSE; + else + failsafe = 0; ++ g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition] = failsafe; + } + } + else { +diff --git a/radio/src/gui/480x272/model_telemetry.cpp b/radio/src/gui/480x272/model_telemetry.cpp +index 027aba2c9..c76879c6f 100644 +--- a/radio/src/gui/480x272/model_telemetry.cpp ++++ b/radio/src/gui/480x272/model_telemetry.cpp +@@ -318,7 +318,7 @@ bool menuModelSensor(event_t event) + case SENSOR_FIELD_PARAM4: + { + drawStringWithIndex(MENUS_MARGIN_LEFT, y, NO_INDENT(STR_SOURCE), k-SENSOR_FIELD_PARAM1+1); +- int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; ++ auto source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; + if (attr) { + source = checkIncDec(event, source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); + } +@@ -329,6 +329,7 @@ bool menuModelSensor(event_t event) + else { + drawSource(SENSOR_2ND_COLUMN, y, source ? MIXSRC_FIRST_TELEM+3*(source-1) : 0, attr); + } ++ sensor->calc.sources[k-SENSOR_FIELD_PARAM1] = source; + break; + } + |