Merge branch 'master' of [email protected]:pichenettes/avril

syddo · Dec 28, 2013 · 5f40a0c · 5f40a0c
2 parents 40ad1e7 + dcef056
commit 5f40a0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/adc.h b/adc.h
@@ -81,6 +81,9 @@ class Adc {
   static inline void Wait() {
     while (AdcConvert::value());
   }
+  static bool ready() {
+    return !AdcConvert::value();
+  }
   static inline int16_t ReadOut() {
     uint8_t low = ADCL;
     uint8_t high = ADCH;

diff --git a/makefile.mk b/makefile.mk
@@ -143,6 +143,10 @@ upload:    $(TARGET_HEX)
 		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
 			-B 1 -U flash:w:$(TARGET_HEX):i -U lock:w:0x$(LOCK):m
 
+slow_upload:    $(TARGET_HEX)
+		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
+			-B 4 -U flash:w:$(TARGET_HEX):i -U lock:w:0x$(LOCK):m
+
 clean:
 		$(REMOVE) $(OBJS) $(TARGETS) $(DEP_FILE) $(DEPS)