summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>2017-02-17 00:35:32 +0700
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>2017-02-17 00:35:32 +0700
commitc18d0a83e6eb8f415b288a6f5ababe9ec12ee52b (patch)
tree9609b587ac401133cec79035b31dc81b65f8dbed
parente5bd81f0a68948a87ad5279bc2c41a4876466023 (diff)
parent1ac5dc9e524444ef98cfab1d9822151a6bfb9621 (diff)
Merge branch 'master' into promethium
-rw-r--r--quantum/audio/voices.c1
-rw-r--r--quantum/process_keycode/process_unicode_common.h1
-rw-r--r--util/travis_compiled_push.sh2
3 files changed, 3 insertions, 1 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 8326e91eaa..c2edb75f01 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -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) {
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 1f25eae7dd..864693cdd0 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -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);
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index de2481ce54..58334cb1f6 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -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" ]] ; then
+if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
increment_version ()
{