From c1e344899b5a3e5cd9f5406423aa4bfa3bca0f6d Mon Sep 17 00:00:00 2001 From: benaclejames Date: Thu, 22 Dec 2022 20:58:09 +0000 Subject: [PATCH 1/3] Add build.yml for ecosteno --- .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..3291c91 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,35 @@ +name: Setup Environment + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Update system packages + run: sudo apt-get update + + - name: Install git and python3-pip + run: sudo apt-get install -y git python3-pip + + - name: Install qmk + run: python -m pip install --user qmk + + - name: Set up qmk + run: qmk setup -y + + - name: Check-out repo + uses: "actions/checkout@v3" + + - name: Copy head to keyboard folder of qmk + run: cp -a /home/runner/work/Ecosteno-Firmware/Ecosteno-Firmware/. /home/runner/qmk_firmware/ + + - name: Build using make + run: | + cd /home/runner/qmk_firmware + make noll/ecosteno:default + + - uses: actions/upload-artifact@v3 + with: + name: Ecosteno Firmware Default + path: /home/runner/qmk_firmware/noll_ecosteno_default.bin \ No newline at end of file From ad2ea9a3ff4888b444a560a2afc2d32308d12499 Mon Sep 17 00:00:00 2001 From: benaclejames Date: Thu, 22 Dec 2022 21:02:48 +0000 Subject: [PATCH 2/3] Fixed caps --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3291c91..2f3a9fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: uses: "actions/checkout@v3" - name: Copy head to keyboard folder of qmk - run: cp -a /home/runner/work/Ecosteno-Firmware/Ecosteno-Firmware/. /home/runner/qmk_firmware/ + run: cp -a /home/runner/work/EcoSteno-Firmware/EcoSteno-Firmware/. /home/runner/qmk_firmware/ - name: Build using make run: | From 28e4869cfc03e3dd0334cb0730c908d4638173a4 Mon Sep 17 00:00:00 2001 From: benaclejames Date: Thu, 22 Dec 2022 21:31:02 +0000 Subject: [PATCH 3/3] Update config format using info.json --- keyboards/noll/ecosteno/config.h | 7 ------- keyboards/noll/ecosteno/info.json | 11 +++++++++++ keyboards/noll/ecosteno/keymaps/default/keymap.c | 6 +++--- 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 keyboards/noll/ecosteno/info.json diff --git a/keyboards/noll/ecosteno/config.h b/keyboards/noll/ecosteno/config.h index 8809948..aace229 100644 --- a/keyboards/noll/ecosteno/config.h +++ b/keyboards/noll/ecosteno/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // recommended by QMK -#define PRODUCT_ID 0x3621 -#define DEVICE_VER 0x0112 -#define MANUFACTURER Noll Electronics LLC -#define PRODUCT Ecosteno - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/noll/ecosteno/info.json b/keyboards/noll/ecosteno/info.json new file mode 100644 index 0000000..ac66f60 --- /dev/null +++ b/keyboards/noll/ecosteno/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Ecosteno", + "manufacturer": "Noll Electronics LLC", + "url": "", + "maintainer": "Noll Electronics LLC", + "usb": { + "vid": "0xFEED", + "pid": "0x3621", + "device_version": "1.1.2" + } +} \ No newline at end of file diff --git a/keyboards/noll/ecosteno/keymaps/default/keymap.c b/keyboards/noll/ecosteno/keymaps/default/keymap.c index 41746b7..2444f67 100644 --- a/keyboards/noll/ecosteno/keymaps/default/keymap.c +++ b/keyboards/noll/ecosteno/keymaps/default/keymap.c @@ -454,14 +454,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERTY_CAPS] = LAYOUT( S(KC_TAB), S(KC_ESC), S(KC_ENTER), S(KC_BSPC), TO(STENO), S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P), S(KC_QUOT), - MO(SYMBOL), S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_N), S(KC_M), S(KC_COMM), S(KC_DOT), S(KC_SLASH), KC_RSHIFT, + MO(SYMBOL), S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_N), S(KC_M), S(KC_COMM), S(KC_DOT), S(KC_SLASH), KC_RSFT, KC_LCTL, KC_SPACE, KC_SPACE, KC_RALT ), [SYMBOL] = LAYOUT( KC_HASH, KC_DOLLAR, KC_LPRN, KC_RPRN, - _______, KC_EXLM, KC_AT, KC_LT, KC_GT, KC_BSLASH, KC_DQT, KC_PLUS, KC_MINS, KC_SLASH, KC_ASTR, KC_TAB, - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRAVE, KC_MINS, KC_AMPR, KC_EQUAL, KC_COMM, KC_DOT, KC_RSHIFT, + _______, KC_EXLM, KC_AT, KC_LT, KC_GT, KC_BSLS, KC_DQT, KC_PLUS, KC_MINS, KC_SLASH, KC_ASTR, KC_TAB, + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRAVE, KC_MINS, KC_AMPR, KC_EQUAL, KC_COMM, KC_DOT, KC_RSFT, KC_SCLN, KC_SPACE, KC_SPACE, KC_SLASH ) };