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.

Sign up for GitHub

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

Jump to bottom

New Keyboard: Palette1202 #7736

Merged
merged 16 commits into from
Mar 10, 2020
Merged

New Keyboard: Palette1202 #7736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a3d850e
added Palette1202
niltea Dec 29, 2019
70ed1f2
removed currently unused cords
niltea Dec 29, 2019
da11d5d
Update keyboards/palette1202/config.h
niltea Dec 30, 2019
c3fc1fd
Apply suggestions from code review
niltea Jan 14, 2020
d4d40d8
Update readme.md
niltea Jan 14, 2020
0091e64
Update readme.md
niltea Jan 14, 2020
a9df98d
Removed spaces
niltea Jan 14, 2020
ab02948
removed unused config.h
niltea Jan 14, 2020
515d993
fixed defines
niltea Jan 14, 2020
8d6c0ec
fixed send string on rotate encoder
niltea Jan 14, 2020
389eae3
fixed layer numbers for OLED Display
niltea Jan 14, 2020
83cb27f
fixed to use existing function to set default layer
niltea Jan 26, 2020
e3b9022
flipped rotary encoder directions
niltea Jan 26, 2020
eee8ec8
Added layer for Clip studio on iOS
niltea Jan 27, 2020
16df46f
Update keyboards/palette1202/rules.mk
niltea Mar 3, 2020
e5b81cd
Update keyboards/palette1202/lib/oled_helper.h
niltea Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
  • Loading branch information
@niltea @drashna @noroadsleft
3 people committed Jan 14, 2020
commit c3fc1fd6348d32e993c521c3c9826305eec9faec
2 changes: 1 addition & 1 deletion keyboards/palette1202/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* Register custom font file */
#ifdef OLED_DRIVER_ENABLE
#define OLED_FONT_H "./lib/glcdfont.c"
#define OLED_FONT_H "lib/glcdfont.c"
#endif

/* Feature disable options */
Expand Down
2 changes: 1 addition & 1 deletion keyboards/palette1202/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"height": 3.5,
"layouts": {
"LAYOUT": {
"key_count": 12,
"key_count": 14,
"layout": [
{ "label":"Tab", "x": 0, "y": 0.75 },
{ "label":"GUI + A", "x": 1, "y": 0.25 },
Expand Down
4 changes: 2 additions & 2 deletions keyboards/palette1202/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};

void encoder_update_user(uint8_t index, bool clockwise) {
int currentDefault = eeconfig_read_default_layer();
int currentLayer = get_highest_layer(layer_state);
uint8_t currentDefault = get_highest_layer(default_layer_state);
uint8_t currentLayer = get_highest_layer(layer_state);
if (index == 0) { /* the upper encoder */
switch (biton32(currentDefault)) {
niltea marked this conversation as resolved.
Show resolved Hide resolved
case MAC_CS_1:
Expand Down
13 changes: 12 additions & 1 deletion keyboards/palette1202/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
# MCU name
MCU = atmega32u4
drashna marked this conversation as resolved.
Show resolved Hide resolved
# Bootloader selection
niltea marked this conversation as resolved.
Show resolved Hide resolved
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = atmel-dfu
niltea marked this conversation as resolved.
Show resolved Hide resolved

# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
niltea marked this conversation as resolved.
Show resolved Hide resolved
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
Expand All @@ -22,4 +33,4 @@ ENCODER_ENABLE = yes # Enable support for rotary encoders
OLED_DRIVER_ENABLE = yes # Enable support for OLED display

# Additional code
SRC += ./lib/oled_helper.c # Adding OLED
SRC += lib/oled_helper.c # Adding OLED