diff --git a/.gitignore b/.gitignore index 4fba0e5..05ba813 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Hardware/TataconUSB.PcbDoc.htm *.elf Firmware/Bootloader/ *.hex +Hardware/Case/outputs/ diff --git a/Firmware/Keyboard/makefile b/Firmware/Keyboard/makefile index 682297f..11fcf15 100644 --- a/Firmware/Keyboard/makefile +++ b/Firmware/Keyboard/makefile @@ -40,6 +40,13 @@ include $(LUFA_PATH)/Build/lufa_hid.mk include $(LUFA_PATH)/Build/lufa_avrdude.mk include $(LUFA_PATH)/Build/lufa_atprogram.mk +$(TARGET)_WithBoot.hex: $(TARGET).hex DFU/BootloaderHID.hex + cat $(TARGET).hex | grep -v '^:00000001FF' > $(TARGET)_WithBoot.hex + cat DFU/BootloaderHID.hex >> $(TARGET)_WithBoot.hex + +#init: $(TARGET)_WithBoot.hex +# $(AVRDUDE) -U lfuse:w:0xde:m -U hfuse:w:0xdb:m -U efuse:w:0xf6:m -U flash:w:$(TARGET)_WithBoot.hex:i + v1: CC_FLAGS += -DV1_BUILD v1: clean all diff --git a/Hardware/Case/TataconCaseBase.scad b/Hardware/Case/TataconCaseBase.scad index 96ba40d..c707985 100644 --- a/Hardware/Case/TataconCaseBase.scad +++ b/Hardware/Case/TataconCaseBase.scad @@ -24,7 +24,7 @@ usb_ramp_width = usb_width; usb_ramp_strength = 0.6; pcb_length = 34; -board_length = pcb_length + fudge + usb_ramp_length/3; +board_length = pcb_length + fudge + usb_ramp_length/4; board_width = 16.3 + fudge + fat; board_thickness = 1.6;