diff --git a/.travis.yml b/.travis.yml index 8ebbbddd8..9f520edfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,21 @@ -language: cpp +sudo: required +dist: trusty +language: python + +virtualenv: + system_site_packages: true + +python: + - 3.4 before_install: - - sudo apt-get remove cmake cmake-data --yes - - sudo add-apt-repository ppa:george-edison55/precise-backports --yes + - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa --yes - sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes - sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes - - sudo add-apt-repository ppa:beineri/opt-qt551 --yes - - sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' --yes - - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-get update -qq install: - - sudo apt-get install -y xvfb lcov cmake cmake-data bc curl gcc-arm-none-eabi qt-latest g++-5 libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libfox-1.6-dev libgtest-dev python-clang-3.9 libclang-3.9-dev python-qt4 - - export CXX="g++-5" CC="gcc-5" + - sudo apt-get -y install qtbase5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pyqt5 curl gcc-arm-none-eabi libfox-1.6-dev libgtest-dev - wget --quiet http://firmware.ardupilot.org/Tools/Travis/gcc-avr_1%253a4.8-2.1_amd64.deb - wget --quiet http://firmware.ardupilot.org/Tools/Travis/libmpfr4_3.1.2-1_amd64.deb - wget --quiet http://firmware.ardupilot.org/Tools/Travis/avr-libc_1%253a1.8.0-4.1_all.deb diff --git a/radio/src/tests/timers.cpp b/radio/src/tests/timers.cpp index d6f5d75e8..3856c2b4a 100644 --- a/radio/src/tests/timers.cpp +++ b/radio/src/tests/timers.cpp @@ -49,10 +49,10 @@ void timerSet(int idx, int16_t val) void initModelTimer(uint32_t idx, uint8_t mode, int16_t start = 0) { - memset(&g_model.timers[0], 0, sizeof(g_model.timers[0])); - g_model.timers[0].mode = mode; - g_model.timers[0].start = start; - g_model.timers[0].countdownBeep = COUNTDOWN_SILENT; + memset(&g_model.timers[idx], 0, sizeof(TimerData)); + g_model.timers[idx].mode = mode; + g_model.timers[idx].start = start; + g_model.timers[idx].countdownBeep = COUNTDOWN_SILENT; } /* diff --git a/radio/util/bin2lbm.py b/radio/util/bin2lbm.py index b633985e1..7dddf98e5 100755 --- a/radio/util/bin2lbm.py +++ b/radio/util/bin2lbm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import division import sys @@ -9,12 +9,13 @@ fileout = sys.argv[2] # Read entire file with open(filename, "rb") as fr: sts = fr.read() + # Parse into chunks of 16 bytes sts = [sts[i:i+16] for i in range(0, len(sts), 16)] with open(fileout, "w") as fw: for st in sts: for b in st: - fw.write("0x%02x," % ord(b)) + fw.write("0x%02x," % b) fw.write("\n") fw.write("\n")