diff --git a/src/atmega/Makefile b/src/atmega/Makefile index aa29b61..ba84c74 100644 --- a/src/atmega/Makefile +++ b/src/atmega/Makefile @@ -2,7 +2,6 @@ PROJECT = vase-control MCU = atmega328p F_CPU = 16000000UL -PROGRAMMER = usbasp ARDUINO_INSTALL_PATH = /usr/share/arduino ARDUINO_CORE_PATH = $(ARDUINO_INSTALL_PATH)/hardware/arduino/avr/cores/arduino @@ -12,10 +11,12 @@ CC = avr-gcc CXX = avr-g++ LD = $(CXX) OC = avr-objcopy -AD = avrdude AR = avr-ar RM = rm -f +AVRDUDE = avrdude +AVRDUDE_FLAGS = -v -p m328p -c usbasp + BUILD_DIR = build OBJ_DIR = $(BUILD_DIR)/obj CORE_DIR = $(BUILD_DIR)/core @@ -65,7 +66,6 @@ $(ELF_TARGET): $(OBJS) $(CORE_LIB) $(CORE_LIB): $(CORE_OBJS) $(AR) rcs $@ $^ -# Compile your C++ files $(OBJ_DIR)/%.o: %.cpp $(HDRS) Makefile $(CXX) $(CXXFLAGS) -c $< -o $@ @@ -78,11 +78,8 @@ $(CORE_DIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp Makefile $(TARGET): $(ELF_TARGET) $(OC) -O ihex -R .eeprom $< $@ -flash: $(TARGET) - $(AD) -v -p $(MCU) -c $(PROGRAMMER) -D -U flash:w:$<:i - clean: $(RM) $(TARGET) $(ELF_TARGET) $(OBJS) $(CORE_OBJS) $(CORE_LIB) $(RM) -r $(BUILD_DIR) -.PHONY: all flash clean +.PHONY: all clean diff --git a/src/atmega/build-atmega.sh b/src/atmega/build-atmega.sh index 0b1d5ab..e929996 100755 --- a/src/atmega/build-atmega.sh +++ b/src/atmega/build-atmega.sh @@ -17,4 +17,4 @@ docker run --rm "$IMAGE_NAME" \ cat /usr/src/build/moisture.hex > "$DEST_HEX" command -v avrdude >/dev/null || { echo "Install avrdude"; exit 1; } -avrdude -v -p "$MCU" -c "$PRG" $AVR_FLAGS -D -U flash:w:"$DEST_HEX":i +avrdude -v -p m328p -c usbasp -U flash:w:build/moisture.hex:i