Skip to content

Commit e4cf5a4

Browse files
authored
Merge pull request #54 from anklimov/develop
Release-2.1
2 parents 9ce0a84 + 56a0360 commit e4cf5a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+36011
-24423
lines changed

build-flags/build_flags_due-5500

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-DWiz5500
22
-DARTNET_ENABLE
3+
-DDMX_SMOOTH

build-flags/build_flags_esp32-wifi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
-DSPILED_DISABLE
77
-DAC_DISABLE
88
#-DM5STACK
9+
-DOTA
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
-DMODBUS_DISABLE
22
#-DCOUNTER_DISABLE
3+
-DOTA
4+
-std=gnu++11

build-flags/build_flags_lighthub21

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
-DWiz5500
22
-DW5500_CS_PIN=53
33
-DARTNET_ENABLE
4+
-DDMX_SMOOTH
5+
-DMODBUS_DIMMER_PARAM=SERIAL_8N1
6+
-DMODBUS_SERIAL_BAUD=9600
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -c arduino -P /dev/cu.usbmodem1411 -b 19200 -p m16u2 -vvv -U flash:w:16u2.hex:i
1+
../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -c arduino -P /dev/cu.usbmodem14101 -b 19200 -p m16u2 -vvv -U flash:w:16u2.hex:i

compiled/controllino/firmware.hex

Lines changed: 5907 additions & 5452 deletions
Large diffs are not rendered by default.

compiled/due-5100/firmware.bin

3.86 KB
Binary file not shown.

compiled/due-5500/firmware.bin

3.88 KB
Binary file not shown.

compiled/due-5500/upload.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export PORT=cu.usbmodem1411
1+
export PORT=cu.usbmodem14201
22
echo . | stty -f /dev/$PORT speed 1200
33
../tools/mac/tool-bossac/bossac -U false -p $PORT -i -e -w -v -b firmware.bin -R

compiled/esp32-wifi/firmware.bin

14.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)