Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pi40 firmware #18207

Merged
merged 10 commits into from
Sep 15, 2022
Merged
Prev Previous commit
Next Next commit
requested changes
  • Loading branch information
ziptyze committed Aug 30, 2022
commit 4c833776cd8e3d72984db8a37a0a76b3e8937a91
16 changes: 16 additions & 0 deletions keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/* Copyright 2022 ziptyze
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
ziptyze marked this conversation as resolved.
Show resolved Hide resolved

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
1 change: 1 addition & 0 deletions keyboards/1upkeyboards/pi40/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
16 changes: 16 additions & 0 deletions keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/* Copyright 2022 ziptyze
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
ziptyze marked this conversation as resolved.
Show resolved Hide resolved

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
2 changes: 2 additions & 0 deletions keyboards/1upkeyboards/pi40/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
VIA_ENABLE = yes
LTO_ENABLE = yes

ENCODER_MAP_ENABLE = yes
2 changes: 1 addition & 1 deletion keyboards/1upkeyboards/pi40/pi40.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ void clear_screen(void) {
}
}

oled_rotation_t oled_init_user(oled_rotation_t rotation) {
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
return OLED_ROTATION_180;
}

Expand Down
20 changes: 0 additions & 20 deletions keyboards/1upkeyboards/pi40/pi40.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,6 @@

#include "quantum.h"

/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define LAYOUT_ortho_4x12( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
}

enum layer_names {
_ONE = 0,
_TWO,
Expand Down
4 changes: 2 additions & 2 deletions keyboards/1upkeyboards/pi40/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ Default oled configuration displays:

Make example for this keyboard (after setting up your build environment):

make pi40:default
make 1upkeyboards/pi40:default

Flashing example for this keyboard:

make pi40:default:flash
make 1upkeyboards/pi40:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

Expand Down