]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
fix travis and reduce warnings
authorJack Humbert <jack.humb@gmail.com>
Thu, 16 Feb 2017 16:37:46 +0000 (11:37 -0500)
committerJack Humbert <jack.humb@gmail.com>
Thu, 16 Feb 2017 16:37:46 +0000 (11:37 -0500)
quantum/audio/voices.c
quantum/process_keycode/process_unicode_common.h
util/travis_compiled_push.sh

index 8326e91eaaa0a0cd1d512bf98dcad781fdff29c5..c2edb75f01b847f7b6c849fc2c9d4a7f73f7d1a1 100644 (file)
@@ -24,6 +24,7 @@ void voice_deiterate() {
 
 float voice_envelope(float frequency) {
     // envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz
+    __attribute__ ((unused))
     uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / frequency));
 
     switch (voice) {
index 1f25eae7dd25e62c212d462a7738718ba0179f42..864693cdd0cd9e6fe76b018358f4f225d4288343 100644 (file)
@@ -7,6 +7,7 @@
 #define UNICODE_TYPE_DELAY 10
 #endif
 
+__attribute__ ((unused))
 static uint8_t input_mode;
 
 void set_unicode_input_mode(uint8_t os_target);
index 582c45ff7db49f3c3c287295dbff4b0c86a5fa93..58334cb1f687c73b072fc07773929afbed6cb5cb 100644 (file)
@@ -7,7 +7,7 @@ rev=$(git rev-parse --short HEAD)
 git config --global user.name "Travis CI"
 git config --global user.email "jack.humb+travis.ci@gmail.com"
 
-if [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "$TRAVIS_PULL_REQUEST" == "false"]] ; then
+if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
 increment_version ()
 {