ergodox-firmware/src/makefile

# -----------------------------------------------------------------------------
# This is mostly a stub at the moment, but I'm keeping it separate so I can
# mess with it later without changing the original
# -----------------------------------------------------------------------------
# Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
# Released under The MIT License (MIT) (see "license.md")
# Project located at <https://github.com/benblazak/ergodox-firmware>
# -----------------------------------------------------------------------------


TARGET = firmware

SRC = $(wildcard *.c) \
      $(wildcard keyboard/*.c) \
      $(wildcard keyboard/*/*.c) \
      $(wildcard lib/*.c) \
      $(wildcard lib/*/*.c) \
      './lib-other/pjrc/usb_keyboard/usb_keyboard.c'


EXTRAINCDIRS = .

TEENSY_MAKE = $(MAKE) -f 'lib-other/pjrc/usb_keyboard/Makefile' \
	      TARGET='$(TARGET)' \
	      SRC='$(SRC)' \
	      EXTRAINCDIRS='$(EXTRAINCDIRS)'


.PHONY: all clean debug

all:
	$(TEENSY_MAKE) all

clean:
	$(TEENSY_MAKE) clean
	git clean -X

debug:
	$(TEENSY_MAKE) debug
added src files - not much there yet though 2012-03-12 02:52:31 +01:00			`# -----------------------------------------------------------------------------`
split the firmware into general/controller/keyboard files 2012-03-14 22:46:52 +01:00			`# This is mostly a stub at the moment, but I'm keeping it separate so I can`
			`# mess with it later without changing the original`
added src files - not much there yet though 2012-03-12 02:52:31 +01:00			`# -----------------------------------------------------------------------------`
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress 2012-03-27 12:06:52 +02:00			`# Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>`
			`# Released under The MIT License (MIT) (see "license.md")`
			`# Project located at <https://github.com/benblazak/ergodox-firmware>`
added src files - not much there yet though 2012-03-12 02:52:31 +01:00			`# -----------------------------------------------------------------------------`

split the firmware into general/controller/keyboard files 2012-03-14 22:46:52 +01:00
checkin before deleting the debug code; almost ready for first beta! - simple bug fix in kbfun_press() and kbfun_release() - no longer check for previous init() in the mcp23018 functions; something would happen when i tried to read from it, sometimes, when it'd been unplugged or stoped some other way, and it would hang - and the only thing that would make it better was running the test_twi_2 function (a series of writes, with stops after each). so now mcp23018_init() is a series of writes, with stops after each. it doesn't take appreciably longer to run... maybe it should be looked into later though. - changed the main() loop a little 2012-04-11 03:58:26 +02:00			`TARGET = firmware`
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress 2012-03-27 12:06:52 +02:00
removed makefile dependency on the unix shell (hopefully) 2012-04-14 04:05:06 +02:00			`SRC = $(wildcard *.c) \`
			`$(wildcard keyboard/*.c) \`
			`$(wildcard keyboard//.c) \`
			`$(wildcard lib/*.c) \`
			`$(wildcard lib//.c) \`
lots and lots; now writing/debugging keyboard logic also, mcp23018_init() needs fixing: `twi_stop()` needs to be at the end of transmission blocks. i wouldn't think that would be necessary, but it seems to be the only thing that'll make it work, and it also seems consistent with the protocol diagram in the datasheet (lol, imagine that), so i think that's what i'll have to do. not as though it matters much i guess, since it's a single master / single slave system anyway, i was just hoping not to release the bus till i was finished.. 2012-04-10 10:44:27 +02:00			`'./lib-other/pjrc/usb_keyboard/usb_keyboard.c'`

intermitent checkin; lots of stuff; i2c on hold; kb logic in progress 2012-03-27 12:06:52 +02:00
lots of stuff .. :) - got PWM working! also, i didn't make a note of it in the .md file, but Waveform Generation Mode 15 for fast PWM wasn't working right (well.. wasn't working how i expected it to). i misinterpreted what the modes were doing, partially (haha, or all-ly?) because i didn't read the description of fast pwm thoroughly enough... in any case, all the information's in the datasheet, and it's actually not terribly long. i'm not sure how to correctly use Mode 15 yet, but i think i'll leave it alone for now, since Mode 5 works as expected, and i think what the datasheet says about that* makes enough sense to me for me to be content for the moment. 2012-03-19 08:01:41 +01:00			`EXTRAINCDIRS = .`
split the firmware into general/controller/keyboard files 2012-03-14 22:46:52 +01:00
added ergodox circuit diagram; and a few misc things; time to clean up 2012-04-12 03:52:31 +02:00			`TEENSY_MAKE = $(MAKE) -f 'lib-other/pjrc/usb_keyboard/Makefile' \`
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress 2012-03-27 12:06:52 +02:00			`TARGET='$(TARGET)' \`
lots of stuff .. :) - got PWM working! also, i didn't make a note of it in the .md file, but Waveform Generation Mode 15 for fast PWM wasn't working right (well.. wasn't working how i expected it to). i misinterpreted what the modes were doing, partially (haha, or all-ly?) because i didn't read the description of fast pwm thoroughly enough... in any case, all the information's in the datasheet, and it's actually not terribly long. i'm not sure how to correctly use Mode 15 yet, but i think i'll leave it alone for now, since Mode 5 works as expected, and i think what the datasheet says about that* makes enough sense to me for me to be content for the moment. 2012-03-19 08:01:41 +01:00			`SRC='$(SRC)' \`
			`EXTRAINCDIRS='$(EXTRAINCDIRS)'`
split the firmware into general/controller/keyboard files 2012-03-14 22:46:52 +01:00

lots and lots; now writing/debugging keyboard logic also, mcp23018_init() needs fixing: `twi_stop()` needs to be at the end of transmission blocks. i wouldn't think that would be necessary, but it seems to be the only thing that'll make it work, and it also seems consistent with the protocol diagram in the datasheet (lol, imagine that), so i think that's what i'll have to do. not as though it matters much i guess, since it's a single master / single slave system anyway, i was just hoping not to release the bus till i was finished.. 2012-04-10 10:44:27 +02:00			`.PHONY: all clean debug`
added src files - not much there yet though 2012-03-12 02:52:31 +01:00
			`all:`
split the firmware into general/controller/keyboard files 2012-03-14 22:46:52 +01:00			`$(TEENSY_MAKE) all`
added src files - not much there yet though 2012-03-12 02:52:31 +01:00
			`clean:`
split the firmware into general/controller/keyboard files 2012-03-14 22:46:52 +01:00			`$(TEENSY_MAKE) clean`
lots - fixed some includes (`uint8_t` comes from a header, not the language) - put code from some of the .h files into .c files - now using open drain logic (hi-Z or GND) on both chips instead of driving the row pins high on the teensy, or using a pull-up resistor on the row pins with the mcp23018 - put `return 0;` at the end of some functions that weren't void - fixed/updated some documentation; esp. the row assignments for the mcp23018 - generalized the unused/row/column pin assignment and init code using macros, so they'll be much easier to move around if necessary - fixed a redefinition error in "lib/usb/keyboard-usage-page.h" 2012-04-05 12:08:20 +02:00			`git clean -X`
added src files - not much there yet though 2012-03-12 02:52:31 +01:00
lots and lots; now writing/debugging keyboard logic also, mcp23018_init() needs fixing: `twi_stop()` needs to be at the end of transmission blocks. i wouldn't think that would be necessary, but it seems to be the only thing that'll make it work, and it also seems consistent with the protocol diagram in the datasheet (lol, imagine that), so i think that's what i'll have to do. not as though it matters much i guess, since it's a single master / single slave system anyway, i was just hoping not to release the bus till i was finished.. 2012-04-10 10:44:27 +02:00			`debug:`
			`$(TEENSY_MAKE) debug`