1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- a/mjo/Arduino.mk
+++ b/mjo/Arduino.mk
@@ -310,7 +310,7 @@
AVRDUDE_ARD_BAUDRATE = 19200
endif
-AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT)
+AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT) $(AVRDUDE_ARD_EXTRAOPTS)
ifndef ISP_LOCK_FUSE_PRE
ISP_LOCK_FUSE_PRE = 0x3f
@@ -361,15 +361,15 @@
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-U flash:w:$(TARGET_HEX):i
-# stty on MacOS likes -F, but on Debian it likes -f redirecting
+# BSD stty likes -F, but GNU stty likes -f/--file. Redirecting
# stdin/out appears to work but generates a spurious error on MacOS at
# least. Perhaps it would be better to just do it in perl ?
reset:
for STTYF in 'stty --file' 'stty -f' 'stty <' ; \
- do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
- done ;\
- $$STTYF $(ARD_PORT) hupcl ;\
- (sleep 0.1 || sleep 1) ;\
+ do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \
+ done ; \
+ $$STTYF $(ARD_PORT) hupcl ; \
+ (sleep 0.1 2>/dev/null || sleep 1) ; \
$$STTYF $(ARD_PORT) -hupcl
ispload: $(TARGET_HEX)
|
