update build script to not delete files

diff --git a/keyboards/dz60/keymaps/n0velty/keymap.c b/keyboards/dz60/keymaps/n0velty/keymap.c
index 6ca4b1e34b4dc0f2c22b5b569c8a24e80a8f9452..044075f59758f1859b57726d8d544f28c38f52d4 100644 (file)
--- a/keyboards/dz60/keymaps/n0velty/keymap.c
+++ b/keyboards/dz60/keymaps/n0velty/keymap.c
@@ -1,53 +1,53 @@
-#include "dz60.h"\r
-#include "action_layer.h"\r
-\r
-#define _______ KC_TRNS //readability\r
-\r
-#define _DL 0 //default\r
-#define _F1 1 //function 1\r
-#define _F2 2 //function 2\r
-\r
-#define KC_NOPE LALT(KC_F4) //alt+f4\r
-\r
-#define RGB_STA RGB_M_P //rgb static\r
-#define RGB_BRE RGB_M_B //rgb breathe\r
-#define RGB_RAI RGB_M_R //rgb rainbow\r
-#define RGB_SWI RGB_M_SW //rgb swirl\r
-#define RGB_SNA RGB_M_SN //rgb snake\r
-#define RGB_KNI RGB_M_K //rgb knight\r
-#define RGB_GRA RGB_M_G //rgb gradient\r
-\r
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\r
-\r
-[_DL] = KEYMAP_TRUE_HHKB( //default Layer\r
-       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,  \\r
-       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, \\r
-       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,           \\r
-       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), \\r
-                MO(_F1),          KC_LALT,                   KC_SPC,                                      MO(_F2),          KC_RGUI),\r
-\r
-[_F1] = KEYMAP_TRUE_HHKB( //function Layer 1\r
-       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,  \\r
-       KC_BSPC,          KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_UP,   KC_HOME, KC_END,  \\r
-       KC_CAPS,          KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLU, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT, _______,          \\r
-       _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, _______, _______, _______, _______, KC_PGDN, KC_DOWN,          _______, _______, \\r
-                    _______,          KC_MSEL,                   KC_MUTE,                                     _______,          _______),\r
-\r
-[_F2] = KEYMAP_TRUE_HHKB( //function Layer 2\r
-       RESET,   RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR,  \\r
-       RGB_TOG,          RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, _______, \\r
-       RGB_MOD,          RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_ACL1, KC_MS_L, KC_MS_R, _______,          \\r
-       BL_TOGG, XXXXXXX, BL_STEP, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, KC_ACL0, KC_MS_D,          _______, _______, \\r
-                    _______,          _______,                   _______,                                     _______,          M(0)),\r
-\r
-};\r
-\r
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {\r
-    if (record->event.pressed) {\r
-        switch(id) {\r
-            case 0:\r
-                SEND_STRING("https://www.reddit.com/r/MechanicalKeyboards/");\r
-        }\r
-    }\r
-    return MACRO_NONE;\r
+#include "dz60.h"
+#include "action_layer.h"
+
+#define _______ KC_TRNS //readability
+
+#define _DL 0 //default
+#define _F1 1 //function 1
+#define _F2 2 //function 2
+
+#define KC_NOPE LALT(KC_F4) //alt+f4
+
+#define RGB_STA RGB_M_P //rgb static
+#define RGB_BRE RGB_M_B //rgb breathe
+#define RGB_RAI RGB_M_R //rgb rainbow
+#define RGB_SWI RGB_M_SW //rgb swirl
+#define RGB_SNA RGB_M_SN //rgb snake
+#define RGB_KNI RGB_M_K //rgb knight
+#define RGB_GRA RGB_M_G //rgb gradient
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_DL] = KEYMAP_TRUE_HHKB( //default Layer
+       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,  \
+       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, \
+       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,           \
+       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), \
+                MO(_F1),          KC_LALT,                   KC_SPC,                                      MO(_F2),          KC_RGUI),
+
+[_F1] = KEYMAP_TRUE_HHKB( //function Layer 1
+       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,  \
+       KC_BSPC,          KC_HOME, KC_UP,   KC_END,  _______, _______, _______, _______, _______, KC_PAUS, KC_PSCR, KC_UP,   KC_HOME, KC_END,  \
+       KC_CAPS,          KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLU, _______, _______, _______, _______, KC_PGUP, KC_LEFT, KC_RGHT, _______,          \
+       _______, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, _______, _______, _______, _______, KC_PGDN, KC_DOWN,          _______, _______, \
+                    _______,          KC_MSEL,                   KC_MUTE,                                     _______,          _______),
+
+[_F2] = KEYMAP_TRUE_HHKB( //function Layer 2
+       RESET,   RGB_STA, RGB_BRE, RGB_RAI, RGB_SWI, RGB_SNA, RGB_KNI, RGB_GRA, _______, _______, _______, _______, _______, KC_SLEP, KC_PWR,  \
+       RGB_TOG,          RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, KC_ACL2, KC_BTN1, KC_MS_U, KC_BTN2, _______, \
+       RGB_MOD,          RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_ACL1, KC_MS_L, KC_MS_R, _______,          \
+       BL_TOGG, XXXXXXX, BL_STEP, BL_INC,  BL_DEC,  _______, _______, _______, _______, _______, KC_ACL0, KC_MS_D,          _______, _______, \
+                    _______,          _______,                   _______,                                     _______,          M(0)),
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+    if (record->event.pressed) {
+        switch(id) {
+            case 0:
+                SEND_STRING("https://www.reddit.com/r/MechanicalKeyboards/");
+        }
+    }
+    return MACRO_NONE;
 };
\ No newline at end of file

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 856ee71bc4467c4503a61063fbdf1bed8ae2aa55..b3554b50797c5da95fc26a39f08394378147d253 100644 (file)
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -64,12 +64,14 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
        eval `ssh-agent -s`
        ssh-add id_rsa_qmk.fm
        
-       # not sure this is needed now
-       rm -f compiled/*.hex
+       # don't delete files in case not all keyboards are built
+       # rm -f compiled/*.hex
 
        # ignore errors here
-       for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
-       for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+       for file in ../qmk_firmware/keyboards/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+       for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+       for file in ../qmk_firmware/keyboards/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+       for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
        bash _util/generate_keyboard_page.sh
        git add -A
        git commit -m "generated from qmk/qmk_firmware@${rev}"