Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into promethium

Browse source
This commit is contained in:
Priyadi Iman Nurcahyo 2017-02-17 00:35:32 +07:00
commit c18d0a83e6
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quantum/audio/voices.c
View file

@ -24,6 +24,7 @@ void voice_deiterate() {
float voice_envelope(float frequency) { float voice_envelope(float frequency) {
// envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz // 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)); uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / frequency));
switch (voice) { switch (voice) {

1
quantum/process_keycode/process_unicode_common.h
View file

@ -7,6 +7,7 @@
#define UNICODE_TYPE_DELAY 10 #define UNICODE_TYPE_DELAY 10
#endif #endif
__attribute__ ((unused))
static uint8_t input_mode; static uint8_t input_mode;
void set_unicode_input_mode(uint8_t os_target); void set_unicode_input_mode(uint8_t os_target);

2
util/travis_compiled_push.sh
View file

@ -7,7 +7,7 @@ rev=$(git rev-parse --short HEAD)
git config --global user.name "Travis CI" git config --global user.name "Travis CI"
git config --global user.email "jack.humb+travis.ci@gmail.com" 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 () increment_version ()
{ {