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

Re-attempt to add Equinox with newer Via changes #8224

Merged
merged 28 commits into from
Feb 24, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
97254c8
Add nox
Nov 15, 2019
9183866
Merge remote-tracking branch 'origin' into equinox
Nov 25, 2019
60b946b
Tweak based on previous pullrequests
Nov 25, 2019
51a1bd7
Add necessary descriptions
Nov 25, 2019
6fe34df
Merge branch 'master' into equinox
ai03-2725 Feb 21, 2020
bf07222
Modernize Via config
Feb 21, 2020
6254389
Modernize old files with massive blocks of unneeded options
Feb 21, 2020
2d78c60
Fix missing bootmagic
Feb 22, 2020
eef016d
Update keyboards/ai03/equinox/equinox.h
Feb 23, 2020
0bd0754
Update keyboards/ai03/equinox/keymaps/default/keymap.c
Feb 23, 2020
f674d37
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
a959350
Update keyboards/ai03/equinox/keymaps/via/readme.md
Feb 23, 2020
27c19f2
Update keyboards/ai03/equinox/readme.md
Feb 23, 2020
6b3fec1
Update keyboards/ai03/equinox/readme.md
Feb 23, 2020
a9ee5ab
Update keyboards/ai03/equinox/readme.md
Feb 23, 2020
53d0b07
Update keyboards/ai03/equinox/info.json
Feb 23, 2020
bfb44df
Update keyboards/ai03/equinox/keymaps/default/keymap.c
Feb 23, 2020
85858d4
Update keyboards/ai03/equinox/keymaps/default/keymap.c
Feb 23, 2020
a96665a
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
b200be2
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
32babb6
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
1ec9b4e
Update keyboards/ai03/equinox/keymaps/proto_via/keymap.c
Feb 23, 2020
4d8e907
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
29e4164
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
33a83b8
Update keyboards/ai03/equinox/keymaps/via/keymap.c
Feb 23, 2020
867655f
Fix indents
Feb 23, 2020
d06d03b
Update keyboards/ai03/equinox/keymaps/proto_via/rules.mk
Feb 24, 2020
8285914
Update keyboards/ai03/equinox/rules.mk
Feb 24, 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
Modernize Via config
  • Loading branch information
ai03 committed Feb 21, 2020
commit bf07222dde2119c1b7e6328933a5c3f93ca82c17
20 changes: 0 additions & 20 deletions keyboards/ai03/equinox/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,23 +243,3 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
// #define BOOTMAGIC_LITE_COLUMN 0

#define DYNAMIC_KEYMAP_LAYER_COUNT 4

// EEPROM usage

// TODO: refactor with new user EEPROM code (coming soon)
#define EEPROM_MAGIC 0x451F
#define EEPROM_MAGIC_ADDR 32
// Bump this every time we change what we store
// This will automatically reset the EEPROM with defaults
// and avoid loading invalid data from the EEPROM
#define EEPROM_VERSION 0x08
#define EEPROM_VERSION_ADDR 34

// Dynamic keymap starts after EEPROM version
#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384)
#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419
#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605
#define DYNAMIC_KEYMAP_MACRO_COUNT 16
19 changes: 0 additions & 19 deletions keyboards/ai03/equinox/keymaps/proto_via/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,3 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
#undef MATRIX_COL_PINS
#define MATRIX_COL_PINS { C4, B7, C6, C7, B6, B5, B4, B3, B2, B1, B0, D6 }

#define DYNAMIC_KEYMAP_LAYER_COUNT 4

// EEPROM usage

// TODO: refactor with new user EEPROM code (coming soon)
#define EEPROM_MAGIC 0x451F
#define EEPROM_MAGIC_ADDR 32
// Bump this every time we change what we store
// This will automatically reset the EEPROM with defaults
// and avoid loading invalid data from the EEPROM
#define EEPROM_VERSION 0x08
#define EEPROM_VERSION_ADDR 34

// Dynamic keymap starts after EEPROM version
#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
// Dynamic macro starts after dynamic keymaps (35+(4*4*12*2)) = (35+384)
#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 419
#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 605
#define DYNAMIC_KEYMAP_MACRO_COUNT 16
7 changes: 1 addition & 6 deletions keyboards/ai03/equinox/keymaps/proto_via/rules.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
# project specific files
SRC = keyboards/wilba_tech/wt_main.c

# Build Options
RAW_ENABLE = yes
DYNAMIC_KEYMAP_ENABLE = yes
VIA_ENABLE = yes

# Fix for prototype missing COL0, COL1, using backlight and RGB underglow I/O pins
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
ai03-2725 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
38 changes: 0 additions & 38 deletions keyboards/ai03/equinox/keymaps/via/config.h

This file was deleted.

7 changes: 1 addition & 6 deletions keyboards/ai03/equinox/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
# project specific files
SRC = keyboards/wilba_tech/wt_main.c

# Build Options
RAW_ENABLE = yes
DYNAMIC_KEYMAP_ENABLE = yes
VIA_ENABLE = yes