diff options
| author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
| commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/handwired/frenchdev/rules.mk | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) | |
resolved conflicts
Diffstat (limited to 'keyboards/handwired/frenchdev/rules.mk')
| -rw-r--r-- | keyboards/handwired/frenchdev/rules.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk index c82bf4a389..69a12b68d7 100644 --- a/keyboards/handwired/frenchdev/rules.mk +++ b/keyboards/handwired/frenchdev/rules.mk @@ -15,7 +15,7 @@ #---------------------------------------------------------------------------- # # project specific files -SRC = twimaster.c \ +SRC = i2c_master.c \ matrix.c # MCU name @@ -64,8 +64,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=512 - +BOOTLOADER = halfKay # Build Options # comment out to disable the options. @@ -86,4 +85,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 RGBLIGHT_ENABLE = no API_SYSEX_ENABLE = no - |