Changeset 87ab18e in avrstuff for kbd/xtk/code/Makefile

Timestamp:

Jul 31, 2014, 11:00:37 PM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

0010058

Parents:

ea32107

Message:

Drop hacked "shift" handling from libps2.

• It's up to clients to do that if they wish so (useful if you're converting

to ASCII, for example, but not for a regular keyboard adapter)

Improve callback system to handle release events.

• The callback would only be called for pressed keys, not for releases, leading

to weird results. Things work much better now in XTK.

• Also ignore the E0 byte for extended keys in XTK. This avoids apps going

crazy as the Turbo XT BIOS doesn't handle it right.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@114 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

File:

• kbd/xtk/code/Makefile (modified) (1 diff)

kbd/xtk/code/Makefile

@@ -1 @@
-MCU=atmega48p
+# Board settings
+
+# K4KUSB
+MCU=attiny2313
+F_CPU=12000000
+
+# Generic settings
+BAUD=9600
+
 
 include ../../common.mk
 
-all: keyboard.hex
-
-keyboard.bin: keyboard.o main.o
+$(MCU).bin: $(MCU)/keyboard.o $(MCU)/main.o
         $(CC) $^ -o $@ -mmcu=$(MCU) -Os
 
-main.o: main.c $(LIBS)/ps2_keyboard/ps2_keyboard.h
-        $(CC) -std=c99 -c $< -mmcu=$(MCU) -Os -o $@ -Os
+$(MCU)/main.o: main.c $(LIBS)/ps2_keyboard/ps2_keyboard.h $(MCU)
+        $(CC) $(CFLAGS) -std=c99 -c $< -o $@
 
-keyboard.o: $(LIBS)/ps2_keyboard/ps2_keyboard.c $(LIBS)/ps2_keyboard/ps2_keyboard.h $(LIBS)/ps2_keyboard/keymap.h
-        $(CC) -DCALLBACK="callback();" -c $< -mmcu=$(MCU) -Os -o $@
-
-clean:
-        rm *.o *.bin *.hex
-
-flash: keyboard.hex
-        $(AVRDUDE) -c usbasp -p $(MCU) -Uflash:w:$^
+$(MCU)/keyboard.o: $(LIBS)/ps2_keyboard/ps2_keyboard.c $(LIBS)/ps2_keyboard/ps2_keyboard.h $(LIBS)/ps2_keyboard/keymap.h $(MCU)
+        $(CC) $(CFLAGS) -DCALLBACK="callback();" -c $< -o $@