~ruther/qmk_firmware

c74295de88e33322db8dcf861608c61db036b9ee — fauxpark 5 years ago a720953
Set proper AVR part for USBasp avrdude flashing (#7552)

* Set proper AVR part for USBasp avrdude flashing

* Remove `PROGRAM_CMD` stuff from rules.mk as they should not be needed anymore

* Missed the Plaid readme

* Remove PROGRAM_CMD from Mysterium
M keyboards/coseyfannitutti/discipad/rules.mk => keyboards/coseyfannitutti/discipad/rules.mk +0 -5
@@ 11,14 11,9 @@ MCU = atmega328p
#   ATmega328P   USBasp
BOOTLOADER = USBasp

# Flash program via avrdude, but default command is not suitable.
# You can use coseyfannitutti/discipad:default:program
PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex

# disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0


# Build Options
#   change yes to no to disable
#

M keyboards/coseyfannitutti/discipline/readme.md => keyboards/coseyfannitutti/discipline/readme.md +1 -1
@@ 12,7 12,7 @@ Make example for this keyboard (after setting up your build environment):

    make coseyfannitutti/discipline:default

Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
Flashing example for this keyboard:

    make coseyfannitutti/discipline:default:flash


M keyboards/coseyfannitutti/discipline/rules.mk => keyboards/coseyfannitutti/discipline/rules.mk +0 -4
@@ 14,10 14,6 @@ F_CPU = 16000000
#   ATmega328P   USBasp
BOOTLOADER = USBasp

# Flash program via avrdude, but default command is not suitable.
# You can use plaid:default:program
PROGRAM_CMD = avrdude -c usbasp -p m32 -U flash:w:$(BUILD_DIR)/$(TARGET).hex

# disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0


M keyboards/coseyfannitutti/mysterium/rules.mk => keyboards/coseyfannitutti/mysterium/rules.mk +0 -4
@@ 14,10 14,6 @@ F_USB = 16000000
#   ATmega328P   USBasp
BOOTLOADER = USBasp

# Flash program via avrdude, but default command is not suitable.
# You can use coseyfannitutti/discipline:default:program
PROGRAM_CMD = avrdude -c usbasp -p m32 -U flash:w:$(BUILD_DIR)/$(TARGET).hex

# disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0


M keyboards/gingham/readme.md => keyboards/gingham/readme.md +4 -3
@@ 9,11 9,12 @@ Hardware Supported: ATMEGA328p with vusb [PCB](https://github.com/yiancar/gingha
Hardware Availability: https://yiancar-designs.com/, https://novelkeys.xyz, https://mechboards.co.uk/  

Make example for this keyboard (after setting up your build environment):

    make gingham:default

Flash firmware:
    // In bootloader mode
    make gingham:default:program
Flashing example for this keyboard:

    make gingham:default:flash

Bootloader:
use usbasploader HSGW's my repository.

M keyboards/gingham/rules.mk => keyboards/gingham/rules.mk +0 -4
@@ 14,10 14,6 @@ MCU = atmega328p
#   ATmega328P   USBasp
BOOTLOADER = USBasp

# Flash program via avrdude, but default command is not suitable.
# You can use plaid:default:program
PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex

# disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0


M keyboards/handwired/hnah40/readme.md => keyboards/handwired/hnah40/readme.md +5 -1
@@ 10,7 10,11 @@ Hardware Availability: https://github.com/vuhopkep/PCB/tree/master/Hnah40-Atmega

Make example for this keyboard (after setting up your build environment):

    make handwired/hnah40:default:program
    make handwired/hnah40:default

Flashing example for this keyboard:

    make handwired/hnah40:default:flash

## Bootloader 
use usbasploader from hsgw.

M keyboards/handwired/hnah40/rules.mk => keyboards/handwired/hnah40/rules.mk +0 -6
@@ 11,15 11,9 @@ MCU = atmega328p
#   ATmega328P   USBasp
BOOTLOADER = USBasp

# Flash program via avrdude, but default command is not suitable.
# You can use hnah40:default:program
PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex


# disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0


# Build Options
#   change yes to no to disable
#

M keyboards/plaid/readme.md => keyboards/plaid/readme.md +3 -3
@@ 11,9 11,9 @@ Hardware Availability: Group buy in r/mk
Make example for this keyboard (after setting up your build environment):
    make plaid:default

Flash firmware:
    // In bootloader mode
    make plaid:default:program
Flashing example for this keyboard:

    make plaid:default:flash

## Bootloader
use usbasploader in my repository.

M keyboards/plaid/rules.mk => keyboards/plaid/rules.mk +0 -6
@@ 11,15 11,9 @@ MCU = atmega328p
#   ATmega328P   USBasp
BOOTLOADER = USBasp

# Flash program via avrdude, but default command is not suitable.
# You can use plaid:default:program
PROGRAM_CMD = avrdude -c usbasp -p m328p -U flash:w:$(BUILD_DIR)/$(TARGET).hex


# disable debug code
OPT_DEFS = -DDEBUG_LEVEL=0


# Build Options
#   change yes to no to disable
#

M quantum/mcu_selection.mk => quantum/mcu_selection.mk +6 -0
@@ 75,6 75,9 @@ ifneq (,$(filter $(MCU),atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 a
endif

ifneq (,$(filter $(MCU),atmega32a))
  # MCU name for avrdude
  AVRDUDE_MCU = m32

  PROTOCOL = VUSB

  # Processor frequency.


@@ 90,6 93,9 @@ ifneq (,$(filter $(MCU),atmega32a))
endif

ifneq (,$(filter $(MCU),atmega328p))
  # MCU name for avrdude
  AVRDUDE_MCU = m328p

  PROTOCOL = VUSB

  # Processor frequency.

M tmk_core/avr.mk => tmk_core/avr.mk +1 -1
@@ 240,7 240,7 @@ avrdude-split-right: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
	$(call EXEC_AVRDUDE,eeprom-righthand.eep)

define EXEC_USBASP
	avrdude -p $(MCU) -c usbasp -U flash:w:$(BUILD_DIR)/$(TARGET).hex
	avrdude -p $(AVRDUDE_MCU) -c usbasp -U flash:w:$(BUILD_DIR)/$(TARGET).hex
endef

usbasp: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware