aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-11-17 14:09:27 -0500
committerJack Humbert <jack.humb@gmail.com>2017-11-17 14:09:27 -0500
commit1d703a476aa2cea2302c3d672b05b7e252e62c44 (patch)
treec99b7336fa0d474bdb1fff53a230baf25ef3dff8
parentf5a9758cea0cf65e4c4270aa55738e423213b82c (diff)
downloadqmk_firmware-1d703a476aa2cea2302c3d672b05b7e252e62c44.tar.gz
qmk_firmware-1d703a476aa2cea2302c3d672b05b7e252e62c44.zip
update build script to not delete files
-rw-r--r--keyboards/dz60/keymaps/n0velty/keymap.c104
-rw-r--r--util/travis_compiled_push.sh10
2 files changed, 58 insertions, 56 deletions
diff --git a/keyboards/dz60/keymaps/n0velty/keymap.c b/keyboards/dz60/keymaps/n0velty/keymap.c
index 6ca4b1e34..044075f59 100644
--- a/keyboards/dz60/keymaps/n0velty/keymap.c
+++ b/keyboards/dz60/keymaps/n0velty/keymap.c
@@ -1,53 +1,53 @@
1#include "dz60.h" 1#include "dz60.h"
2#include "action_layer.h" 2#include "action_layer.h"
3 3
4#define _______ KC_TRNS //readability 4#define _______ KC_TRNS //readability
5 5
6#define _DL 0 //default 6#define _DL 0 //default
7#define _F1 1 //function 1 7#define _F1 1 //function 1
8#define _F2 2 //function 2 8#define _F2 2 //function 2
9 9
10#define KC_NOPE LALT(KC_F4) //alt+f4 10#define KC_NOPE LALT(KC_F4) //alt+f4
11 11
12#define RGB_STA RGB_M_P //rgb static 12#define RGB_STA RGB_M_P //rgb static
13#define RGB_BRE RGB_M_B //rgb breathe 13#define RGB_BRE RGB_M_B //rgb breathe
14#define RGB_RAI RGB_M_R //rgb rainbow 14#define RGB_RAI RGB_M_R //rgb rainbow
15#define RGB_SWI RGB_M_SW //rgb swirl 15#define RGB_SWI RGB_M_SW //rgb swirl
16#define RGB_SNA RGB_M_SN //rgb snake 16#define RGB_SNA RGB_M_SN //rgb snake
17#define RGB_KNI RGB_M_K //rgb knight 17#define RGB_KNI RGB_M_K //rgb knight
18#define RGB_GRA RGB_M_G //rgb gradient 18#define RGB_GRA RGB_M_G //rgb gradient
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 21
22[_DL] = KEYMAP_TRUE_HHKB( //default Layer 22[_DL] = KEYMAP_TRUE_HHKB( //default Layer
23 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, \ 23 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, \
24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ 24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \
25 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 25 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
26 KC_LSPO, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_F1), \ 26 KC_LSPO, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_F1), \
27 MO(_F1), KC_LALT, KC_SPC, MO(_F2), KC_RGUI), 27 MO(_F1), KC_LALT, KC_SPC, MO(_F2), KC_RGUI),
28 28
29[_F1] = KEYMAP_TRUE_HHKB( //function Layer 1 29[_F1] = KEYMAP_TRUE_HHKB( //function Layer 1
30 KC_NOPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_GRV, \ 30 KC_NOPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_GRV, \
31 KC_BSPC, KC_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_UP, KC_HOME, KC_END, \ 31 KC_BSPC, KC_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_UP, KC_HOME, KC_END, \
32 KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLU, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT, _______, \ 32 KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLU, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT, _______, \
33 _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, _______, _______, _______, _______, KC_PGDN, KC_DOWN, _______, _______, \ 33 _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, _______, _______, _______, _______, KC_PGDN, KC_DOWN, _______, _______, \
34 _______, KC_MSEL, KC_MUTE, _______, _______), 34 _______, KC_MSEL, KC_MUTE, _______, _______),
35 35
36[_F2] = KEYMAP_TRUE_HHKB( //function Layer 2 36[_F2] = KEYMAP_TRUE_HHKB( //function Layer 2
37 RESET, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR, \ 37 RESET, RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR, \
38 RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, _______, \ 38 RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, _______, \
39 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_ACL1, KC_MS_L, KC_MS_R, _______, \ 39 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_ACL1, KC_MS_L, KC_MS_R, _______, \
40 BL_TOGG, XXXXXXX, BL_STEP, BL_INC, BL_DEC, _______, _______, _______, _______, _______, KC_ACL0, KC_MS_D, _______, _______, \ 40 BL_TOGG, XXXXXXX, BL_STEP, BL_INC, BL_DEC, _______, _______, _______, _______, _______, KC_ACL0, KC_MS_D, _______, _______, \
41 _______, _______, _______, _______, M(0)), 41 _______, _______, _______, _______, M(0)),
42 42
43}; 43};
44 44
45const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 45const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
46 if (record->event.pressed) { 46 if (record->event.pressed) {
47 switch(id) { 47 switch(id) {
48 case 0: 48 case 0:
49 SEND_STRING("https://www.reddit.com/r/MechanicalKeyboards/"); 49 SEND_STRING("https://www.reddit.com/r/MechanicalKeyboards/");
50 } 50 }
51 } 51 }
52 return MACRO_NONE; 52 return MACRO_NONE;
53}; \ No newline at end of file 53}; \ No newline at end of file
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 856ee71bc..b3554b507 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -64,12 +64,14 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
64 eval `ssh-agent -s` 64 eval `ssh-agent -s`
65 ssh-add id_rsa_qmk.fm 65 ssh-add id_rsa_qmk.fm
66 66
67 # not sure this is needed now 67 # don't delete files in case not all keyboards are built
68 rm -f compiled/*.hex 68 # rm -f compiled/*.hex
69 69
70 # ignore errors here 70 # ignore errors here
71 for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done 71 for file in ../qmk_firmware/keyboards/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
72 for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done 72 for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
73 for file in ../qmk_firmware/keyboards/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
74 for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
73 bash _util/generate_keyboard_page.sh 75 bash _util/generate_keyboard_page.sh
74 git add -A 76 git add -A
75 git commit -m "generated from qmk/qmk_firmware@${rev}" 77 git commit -m "generated from qmk/qmk_firmware@${rev}"