Merge pull request #8 from jgosmann/master

Fixing hanging uploads
This commit is contained in:
Sudar 2012-11-10 21:41:49 -08:00
commit bb172d1c42

View file

@ -840,9 +840,9 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
$(DEP_FILE): $(OBJDIR) $(DEPS) $(DEP_FILE): $(OBJDIR) $(DEPS)
cat $(DEPS) > $(DEP_FILE) cat $(DEPS) > $(DEP_FILE)
upload: reset raw_upload upload: raw_upload
raw_upload: $(TARGET_HEX) raw_upload: reset $(TARGET_HEX)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-U flash:w:$(TARGET_HEX):i -U flash:w:$(TARGET_HEX):i