drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Makefile redo & other features (#395)

Browse source 
* .build containment implemented

* no destructive variable setting - builds in either folder

* make from 3 places

* cleans before each build
* make from root with keyboard=keyboard, keymap=keymap
* make from keyboard/keyboard with keymap=keymap
* make from keymaps/keymap
* only implemented on planck

* adds color diag to avr-gcc

* makefiles for all plancks, clean-up

* quick build-all makefile for plancks

* reformatting of make output (colors)

* color toggle, tmk path corrections

* correct if statement for color

* move config.h to main makefile, updates preonic, atomic

* format update, all keyboards targets

* makefile optional for build all target, alps and arrow_pad updated

* alps updated

* make planck default, trying out travis recipe for all-keyboards

* all-keymaps target, different travis recipe

* updates alps64

* updates keyboards to new format

* updates clue* projects

* all projects updated, specialise EZ .hex, let .hex through

* updates travis

* automatically find root, keyboard, keymap

* silent echo, cleaned-up mass make output

* updates all keyboards' .hex files except EZ

* Rename Bantam44.c to bantam44.c

* Rename Bantam44.h to bantam44.h

* nananana

* adds six key keyboard

* does same to ez as rest

* updates send_string example

* brings ergodox_ez up to date

* updates template/new project script

* adds sixkeyboard

* adds readme for sixkeyboard

* adds sixkeyboard to travis

* filenames, gitignore mess

* define clock prescaler stuff manually

* make quick, size test example

* documentation and dfu-no-build
This commit is contained in:
Jack Humbert 2016-06-11 13:31:31 -04:00 • committed by GitHub
parent a5d638ad30
commit d9e4dad0a8
317 changed files with 135651 additions and 67504 deletions
Download patch file Download diff file Expand all files Collapse all files

6
keyboard/planck/keymaps/pete/keymap.c
View file

@ -21,6 +21,7 @@ extern keymap_config_t keymap_config;
#define _RAISE 4
#define _FCT 5
#define _SETUP 6
#define _MUSIC 7
#define _MICMUTE 16
// Macro name shortcuts
@ -209,7 +210,7 @@ void play_goodbye_tone()
uint8_t starting_note = 0x0C;
int offset = 0;
void process_action_user(keyrecord_t *record) {
bool process_action_user(keyrecord_t *record) {
if (IS_LAYER_ON(_MUSIC)) {
if (record->event.pressed) {
@ -217,7 +218,8 @@ void process_action_user(keyrecord_t *record) {
} else {
stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
}
return false;
}
return true;
}
#endif