Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Change default controller for Atreus from Teensy2 to A-Star

Browse source
This commit is contained in:
Chris Gerber 2016-02-17 18:55:17 -05:00
parent 47dcec2945
commit 1db3558a92
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
keyboard/atreus/Makefile
View file

@ -58,8 +58,13 @@ else
SRC := keymaps/keymap_default.c $(SRC) SRC := keymaps/keymap_default.c $(SRC)
endif endif
ifdef ASTAR ifdef TEENSY2
OPT_DEFS += -DATREUS_TEENSY2
ATRUES_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
else
OPT_DEFS += -DATREUS_ASTAR OPT_DEFS += -DATREUS_ASTAR
ATRUES_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
endif endif
CONFIG_H = config.h CONFIG_H = config.h
@ -144,9 +149,4 @@ include $(TOP_DIR)/quantum/quantum.mk
USB ?= /dev/cu.usbmodem1411 USB ?= /dev/cu.usbmodem1411
upload: build upload: build
ifdef ASTAR $(ATRUES_UPLOAD_COMMAND)
while [ ! -r $(USB) ]; do sleep 1; done; \
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
else
teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
endif

2
keyboard/atreus/README.md
View file

@ -12,7 +12,7 @@ You have access to a bunch of goodies! Check out the Makefile to enable/disable
## Atreus specific information ## Atreus specific information
These configuration files are specifically for the Atreus keyboards created by Phil Hagelberg (@technomancy). This keyboard is available in two variants: one powered by a Teensy 2, one powered by an A-Star. This repository currently assumes that you have a Teensy 2 powered Atreus. If you are using an A-Star, specify that by adding `ASTAR=yes` to your `make` commands. These configuration files are specifically for the Atreus keyboards created by Phil Hagelberg (@technomancy). This keyboard is available in two variants: one powered by a Teensy 2, one powered by an A-Star. This repository currently assumes that you have an A-Star powered Atreus. If you are using a Teensy2, specify that by adding `TEENSY2=yes` to your `make` commands.
If you are coming from the [atreus-firmware](https://github.com/technomancy/atreus-firmware), we've also brought forward the `make upload` command for you to use. If you are coming from the [atreus-firmware](https://github.com/technomancy/atreus-firmware), we've also brought forward the `make upload` command for you to use.

4
keyboard/atreus/config.h
View file

@ -35,10 +35,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Change this to how you wired your keyboard // Change this to how you wired your keyboard
// COLS: Left to right, ROWS: Top to bottom // COLS: Left to right, ROWS: Top to bottom
#ifdef ATREUS_ASTAR #if defined(ATREUS_ASTAR)
#define COLS (int []){ B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 } #define COLS (int []){ B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 }
#define ROWS (int []){ D0, D1, D3, D2 } #define ROWS (int []){ D0, D1, D3, D2 }
#else #elif defined(ATREUS_TEENSY2)
#define COLS (int []){ F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0} #define COLS (int []){ F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0}
#define ROWS (int []){ D0, D1, D2, D3 } #define ROWS (int []){ D0, D1, D2, D3 }
#endif #endif