diff options
| author | yiancar <yiangosyiangou@cytanet.com.cy> | 2018-06-06 23:24:26 +0100 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-06-06 18:24:26 -0400 |
| commit | b5d6c049e6caec89f04707663efd37d46be3e9c5 (patch) | |
| tree | 6a5fe6dd28e42bf0495e57084d2ef45f3db2f4d7 /tmk_core | |
| parent | afa0a8d6f7822e1c0544aed1475ae528262987d8 (diff) | |
| download | qmk_firmware-b5d6c049e6caec89f04707663efd37d46be3e9c5.tar.gz qmk_firmware-b5d6c049e6caec89f04707663efd37d46be3e9c5.zip | |
Bootloader make issue (#2975)
* Added Modular keyboards L,R and NUM
Created code modules for the 3 modules of the modular keyboard.
Original idea by MechboardsUK. Uses i2c implementation similar to lets
split
* Remove modular from master
This is to fix incorrect branching
* fixed bootloader makefile
- Echo -e does not behave coorectly on mac
- Replaced with equivilant printf statements
* quick typo fix
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index bd58bd285..cf62b0f07 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -252,16 +252,16 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf | |||
| 252 | 252 | ||
| 253 | bootloader: | 253 | bootloader: |
| 254 | make -C lib/lufa/Bootloaders/DFU/ clean | 254 | make -C lib/lufa/Bootloaders/DFU/ clean |
| 255 | echo -e "#ifndef QMK_KEYBOARD\n#define QMK_KEYBOARD\n" > lib/lufa/Bootloaders/DFU/Keyboard.h | 255 | printf "#ifndef QMK_KEYBOARD\n#define QMK_KEYBOARD\n\n" > lib/lufa/Bootloaders/DFU/Keyboard.h |
| 256 | echo -e `$(GREP) "MANUFACTURER" $(ALL_CONFIGS) -h | tail -1` >> lib/lufa/Bootloaders/DFU/Keyboard.h | 256 | printf "%s\n" "`$(GREP) "MANUFACTURER" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 257 | echo -e `$(GREP) "PRODUCT" $(ALL_CONFIGS) -h | tail -1` Bootloader >> lib/lufa/Bootloaders/DFU/Keyboard.h | 257 | printf "%s Bootloader\n" "`$(GREP) "PRODUCT" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 258 | echo -e `$(GREP) "QMK_ESC_OUTPUT" $(ALL_CONFIGS) -h | tail -1` >> lib/lufa/Bootloaders/DFU/Keyboard.h | 258 | printf "%s\n" "`$(GREP) "QMK_ESC_OUTPUT" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 259 | echo -e `$(GREP) "QMK_ESC_INPUT" $(ALL_CONFIGS) -h | tail -1` >> lib/lufa/Bootloaders/DFU/Keyboard.h | 259 | printf "%s\n" "`$(GREP) "QMK_ESC_INPUT" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 260 | echo -e `$(GREP) "QMK_LED" $(ALL_CONFIGS) -h | tail -1` >> lib/lufa/Bootloaders/DFU/Keyboard.h | 260 | printf "%s\n" "`$(GREP) "QMK_LED" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 261 | echo -e `$(GREP) "QMK_SPEAKER" $(ALL_CONFIGS) -h | tail -1` >> lib/lufa/Bootloaders/DFU/Keyboard.h | 261 | printf "%s\n" "`$(GREP) "QMK_SPEAKER" $(ALL_CONFIGS) -h | tail -1`" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 262 | echo -e "\n#endif" >> lib/lufa/Bootloaders/DFU/Keyboard.h | 262 | printf "\n#endif" >> lib/lufa/Bootloaders/DFU/Keyboard.h |
| 263 | make -C lib/lufa/Bootloaders/DFU/ | 263 | make -C lib/lufa/Bootloaders/DFU/ |
| 264 | echo -e "BootloaderDFU.hex copied to $(TARGET)_bootloader.hex" | 264 | printf "BootloaderDFU.hex copied to $(TARGET)_bootloader.hex\n" |
| 265 | cp lib/lufa/Bootloaders/DFU/BootloaderDFU.hex $(TARGET)_bootloader.hex | 265 | cp lib/lufa/Bootloaders/DFU/BootloaderDFU.hex $(TARGET)_bootloader.hex |
| 266 | 266 | ||
| 267 | production: $(BUILD_DIR)/$(TARGET).hex bootloader cpfirmware | 267 | production: $(BUILD_DIR)/$(TARGET).hex bootloader cpfirmware |