summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-11 13:31:31 -0400
committerGitHub <noreply@github.com>2016-06-11 13:31:31 -0400
commitd9e4dad0a828a8a904f44dda090a4d6d08fe2948 (patch)
treed6f002712c22e8cf4523e04a9da889c7ec379d6b /keyboard/ergodox_ez
parenta5d638ad3091e2d553eaa04d933df28eeced5a8b (diff)
Makefile redo & other features (#395)
* .build containment implemented * no destructive variable setting - builds in either folder * make from 3 places * cleans before each build * make from root with keyboard=keyboard, keymap=keymap * make from keyboard/keyboard with keymap=keymap * make from keymaps/keymap * only implemented on planck * adds color diag to avr-gcc * makefiles for all plancks, clean-up * quick build-all makefile for plancks * reformatting of make output (colors) * color toggle, tmk path corrections * correct if statement for color * move config.h to main makefile, updates preonic, atomic * format update, all keyboards targets * makefile optional for build all target, alps and arrow_pad updated * alps updated * make planck default, trying out travis recipe for all-keyboards * all-keymaps target, different travis recipe * updates alps64 * updates keyboards to new format * updates clue* projects * all projects updated, specialise EZ .hex, let .hex through * updates travis * automatically find root, keyboard, keymap * silent echo, cleaned-up mass make output * updates all keyboards' .hex files except EZ * Rename Bantam44.c to bantam44.c * Rename Bantam44.h to bantam44.h * nananana * adds six key keyboard * does same to ez as rest * updates send_string example * brings ergodox_ez up to date * updates template/new project script * adds sixkeyboard * adds readme for sixkeyboard * adds sixkeyboard to travis * filenames, gitignore mess * define clock prescaler stuff manually * make quick, size test example * documentation and dfu-no-build
Diffstat (limited to 'keyboard/ergodox_ez')
-rw-r--r--keyboard/ergodox_ez/Makefile74
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/ab.hex1146
-rw-r--r--keyboard/ergodox_ez/keymaps/ab/compiled.hex1147
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw/k_o_y/k_o_y.hex1152
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw_k_o_y/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c (renamed from keyboard/ergodox_ez/keymaps/adnw/k_o_y/keymap.c)0
-rw-r--r--keyboard/ergodox_ez/keymaps/adnw_k_o_y/readme.md (renamed from keyboard/ergodox_ez/keymaps/adnw/k_o_y/readme.md)0
-rw-r--r--keyboard/ergodox_ez/keymaps/alexjj/compiled.hex1172
-rw-r--r--keyboard/ergodox_ez/keymaps/alexjj/keymap.hex1141
-rw-r--r--keyboard/ergodox_ez/keymaps/algernon/Makefile (renamed from keyboard/ergodox_ez/keymaps/algernon/makefile.mk)0
-rw-r--r--keyboard/ergodox_ez/keymaps/algernon/algernon.hex1259
-rw-r--r--keyboard/ergodox_ez/keymaps/algernon/compiled.hex1257
-rw-r--r--keyboard/ergodox_ez/keymaps/algernon/config.h (renamed from keyboard/ergodox_ez/keymaps/algernon/config_user.h)2
-rw-r--r--keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/andrew_osx/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/bepo/bepo.hex1193
-rw-r--r--keyboard/ergodox_ez/keymaps/bepo/compiled.hex1190
-rw-r--r--keyboard/ergodox_ez/keymaps/coderkun_neo2/Makefile1
-rw-r--r--keyboard/ergodox_ez/keymaps/coderkun_neo2/coderkun_neo2.hex1143
-rw-r--r--keyboard/ergodox_ez/keymaps/coderkun_neo2/compiled.hex1195
-rw-r--r--keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c2
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak/colemak.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/colemak_osx_pc_no.hex1142
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/compiled.hex1179
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/compiled.hex1184
-rw-r--r--keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.hex1147
-rw-r--r--keyboard/ergodox_ez/keymaps/dave/compiled.hex1169
-rw-r--r--keyboard/ergodox_ez/keymaps/dave/dave.hex1172
-rw-r--r--keyboard/ergodox_ez/keymaps/default/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/default/default.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/default_osx/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/default_osx/default_osx.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/dragon788/compiled.hex1169
-rw-r--r--keyboard/ergodox_ez/keymaps/dragon788/dragon788.hex1131
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak/dvorak.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex1127
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_spanish/compiled.hex1175
-rw-r--r--keyboard/ergodox_ez/keymaps/dvorak_spanish/dvorak_spanish.hex5371
-rw-r--r--keyboard/ergodox_ez/keymaps/emacs_osx_dk/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/emacs_osx_dk/emacs_osx_dk.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/compiled.hex1167
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex1107
-rw-r--r--keyboard/ergodox_ez/keymaps/german-kinergo/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/german-kinergo/german-kinergo.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/compiled.hex1274
-rw-r--r--keyboard/ergodox_ez/keymaps/german-manuneo/german-manuneo.hex1240
-rw-r--r--keyboard/ergodox_ez/keymaps/german/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/german/german.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/j3rn/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/j3rn/j3rn.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/jack/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/jack/jack.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/jacobono/compiled.hex1179
-rw-r--r--keyboard/ergodox_ez/keymaps/jacobono/jacobono.hex1142
-rw-r--r--keyboard/ergodox_ez/keymaps/jgarr/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/jgarr/jgarr.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/kastyle/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/kastyle/kastyle.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/kines-ish/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/kines-ish/kines-ish.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/mpiechotka/compiled.hex1181
-rw-r--r--keyboard/ergodox_ez/keymaps/mpiechotka/mpiechotka.hex1144
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/msc/msc.hex1118
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/ergodox_ez.hex1474
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/keymap.c4
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/compiled.hex1209
-rw-r--r--keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex1202
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de/compiled.hex1242
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex1235
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/compiled.hex1178
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex1171
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/compiled.hex1253
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental.hex1247
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_fr/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_fr/osx_fr.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/plover/compiled.hex1169
-rw-r--r--keyboard/ergodox_ez/keymaps/plover/plover.hex1131
-rw-r--r--keyboard/ergodox_ez/keymaps/plums/compiled.hex1165
-rw-r--r--keyboard/ergodox_ez/keymaps/plums/plums.hex1159
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/compiled.hex1122
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex1092
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/compiled.hex1169
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.hex1139
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/compiled.hex1169
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.hex1132
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/compiled.hex1145
-rw-r--r--keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex1139
-rw-r--r--keyboard/ergodox_ez/keymaps/sneako/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/sneako/sneako.hex1152
-rw-r--r--keyboard/ergodox_ez/keymaps/software_neo2/compiled.hex1147
-rw-r--r--keyboard/ergodox_ez/keymaps/software_neo2/software_neo2.hex1110
-rw-r--r--keyboard/ergodox_ez/keymaps/supercoder/compiled.hex1122
-rw-r--r--keyboard/ergodox_ez/keymaps/supercoder/supercoder.hex846
-rw-r--r--keyboard/ergodox_ez/keymaps/techtomas/compiled.hex1169
-rw-r--r--keyboard/ergodox_ez/keymaps/techtomas/techtomas.hex1182
-rw-r--r--keyboard/ergodox_ez/keymaps/tm2030/compiled.hex1224
-rw-r--r--keyboard/ergodox_ez/keymaps/tm2030/tm2030.hex1187
-rw-r--r--keyboard/ergodox_ez/keymaps/tonyabra_osx/compiled.hex1158
-rw-r--r--keyboard/ergodox_ez/keymaps/tonyabra_osx/tonyabra_osx.hex1121
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/compiled.hex1196
-rw-r--r--keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex1166
-rw-r--r--keyboard/ergodox_ez/keymaps/twey/compiled.hex1178
-rw-r--r--keyboard/ergodox_ez/keymaps/twey/twey.hex1122
-rw-r--r--keyboard/ergodox_ez/keymaps/workman_osx_mdw/compiled.hex1239
-rw-r--r--keyboard/ergodox_ez/keymaps/workman_osx_mdw/workman_osx_mdw.hex1199
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/compiled.hex1173
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex1172
-rwxr-xr-xkeyboard/ergodox_ez/makeallhex.sh9
-rw-r--r--keyboard/ergodox_ez/readme.md6
115 files changed, 62248 insertions, 64022 deletions
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile
index 3a07ec254f..4a9d36ad88 100644
--- a/keyboard/ergodox_ez/Makefile
+++ b/keyboard/ergodox_ez/Makefile
@@ -14,30 +14,10 @@
#
#----------------------------------------------------------------------------
-# Target file name (without extension).
-TARGET = ergodox_ez
-
-
-# Directory common source filess exist
-TOP_DIR = ../..
-TMK_DIR = ../../tmk_core
-
-# Directory keyboard dependent files exist
-TARGET_DIR = .
-
# # project specific files
-SRC = ergodox_ez.c \
- twimaster.c \
+SRC = twimaster.c \
matrix.c
-ifdef KEYMAP
- SRC := keymaps/$(KEYMAP)/keymap.c $(SRC)
-else
- SRC := keymaps/default/keymap.c $(SRC)
-endif
-
-CONFIG_H = config.h
-
# MCU name
MCU = atmega32u4
@@ -90,41 +70,17 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-# CONSOLE_ENABLE = yes # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
-CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDox EZ
-SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# MIDI_ENABLE = yes # MIDI controls
-# UNICODE_ENABLE = yes # Unicode
-
-# If you want to have your own config_user.h, you can just put it in
-# your keymap directory. Anything you set there will take precedence
-# over the global config.h.
-ifneq ("$(wildcard keymaps/$(KEYMAP)/config_user.h)","")
-CONFIG_USER_H = keymaps/$(KEYMAP)/config_user.h
-endif
-
-ifdef KEYMAP
-
-ifeq ("$(wildcard keymaps/$(KEYMAP).c)","")
-ifneq ("$(wildca