andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed network for MEGA+Wiz5500,

Browse Source 
Mega DMX OUT on TX1 pin now (same with DUE),
E81 port Modbus dimmer settings for MEGA. AVR Binaries
This commit is contained in:
Andrey Klimov
2019-07-08 02:25:41 +03:00
parent 1919d3c210
commit 4efe3af7bb
7 changed files with 8200 additions and 8582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
check_custom_build_flags_mega2560-5500.sh
View File

@@ -1,7 +1,10 @@
#! /bin/bash #! /bin/bash
CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560.sh" CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560-5500.sh"
export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
export FLAGS="$FLAGS -DWiz5500" export FLAGS="$FLAGS -DWiz5500"
export FLAGS="$FLAGS -DMODBUS_DIMMER_PARAM=SERIAL_8E1"
export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18"
#TODO: make one file for all envs #TODO: make one file for all envs
if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
source $CUSTOM_BUILD_FLAGS_FILE source $CUSTOM_BUILD_FLAGS_FILE

2
check_custom_build_flags_mega2560-slim.sh
View File

@@ -1,6 +1,8 @@
#! /bin/bash #! /bin/bash
CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560-slim.sh" CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560-slim.sh"
export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
export FLAGS="$FLAGS -DMODBUS_DIMMER_PARAM=SERIAL_8E1"
export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18"
#TODO: make one file for all envs #TODO: make one file for all envs
if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
source $CUSTOM_BUILD_FLAGS_FILE source $CUSTOM_BUILD_FLAGS_FILE

2
check_custom_build_flags_mega2560.sh
View File

@@ -1,6 +1,8 @@
#! /bin/bash #! /bin/bash
CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_mega2560.sh CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_mega2560.sh
export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
export FLAGS="$FLAGS -DMODBUS_DIMMER_PARAM=SERIAL_8E1"
export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18"
if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
source $CUSTOM_BUILD_FLAGS_FILE source $CUSTOM_BUILD_FLAGS_FILE
fi fi

8245
compiled/mega2560-5100/firmware.hex
View File

File diff suppressed because it is too large Load Diff

8513
compiled/mega2560-5500/firmware.hex
View File

File diff suppressed because it is too large Load Diff

10
compiled/mega2560slim-5100/firmware.hex
View File

@@ -109,8 +109,8 @@
:1006C0002C584F46462C544F47474C4500656E7595 :1006C0002C584F46462C544F47474C4500656E7595
:1006D0006D00666C6F617400322E312E300024681C :1006D0006D00666C6F617400322E312E300024681C
:1006E0006F6D696500757074696D652C66726565FE :1006E0006F6D696500757074696D652C66726565FE
:1006F0006865617000656136376434365F32303169 :1006F0006865617000313931396433635F3230319C
:10070000392D30362D3237004C6967687448756270 :10070000392D30362D3239004C696768744875626E
:100710002000246E616D650072656164790020744B :100710002000246E616D650072656164790020744B
:10072000727920616761696E20696E20352073657A :10072000727920616761696E20696E20352073657A
:10073000636F6E6473006661696C65642C2072631C :10073000636F6E6473006661696C65642C2072631C
@@ -193,8 +193,8 @@
:100C0000652E7275000A436F6E66696720736572A0 :100C0000652E7275000A436F6E66696720736572A0
:100C10007665723A000A282B295741544348444FBD :100C10007665723A000A282B295741544348444FBD
:100C200047003230313130334C0020432B2B2076BB :100C200047003230313130334C0020432B2B2076BB
:100C3000657273696F6E3A00656136376434365F8A :100C3000657273696F6E3A00313931396433635FBD
:100C4000323031392D30362D3237000A4C617A7905 :100C4000323031392D30362D3239000A4C617A7903
:100C5000686F6D652E7275204C696768744875629F :100C5000686F6D652E7275204C696768744875629F
:100C600020636F6E74726F6C6C65722000000020E0 :100C600020636F6E74726F6C6C65722000000020E0
:100C7000002300260029002C002F00320000010074 :100C7000002300260029002C002F00320000010074
@@ -2682,7 +2682,7 @@
:10A790007FE084EC97E00E947540EECE61E0C80156 :10A790007FE084EC97E00E947540EECE61E0C80156
:10A7A0000E948740FC01E184F2849091B20A9923CF :10A7A0000E948740FC01E184F2849091B20A9923CF
:10A7B00059F0809170008E7F809370001092B20AE1 :10A7B00059F0809170008E7F809370001092B20AE1
:10A7C000109202021092010283E080930002911124 :10A7C000109202021092010282E180930002911124
:10A7D0000E945E4CC7010E94864C01E010E0E0162A :10A7D0000E945E4CC7010E94864C01E010E0E0162A
:10A7E000F1060CF4EECE60E0C8010E94BC4C0F5F95 :10A7E000F1060CF4EECE60E0C8010E94BC4C0F5F95
:10A7F0001F4FF5CFBA82A982FC82EB82CE0101966F :10A7F0001F4FF5CFBA82A982FC82EB82CE0101966F

5
platformio.ini
View File

@@ -20,7 +20,7 @@ env_default =
; mega2560-5100 ; mega2560-5100
; Arduino Mega + Ethernet shield Wiznet 5500 ; Arduino Mega + Ethernet shield Wiznet 5500
; mega2560-5500 mega2560-5500
; LightHub controller HW revision 2.1 and above (Wiznet 5500 CS on pin 53) ; LightHub controller HW revision 2.1 and above (Wiznet 5500 CS on pin 53)
; lighthub21 ; lighthub21
@@ -288,6 +288,7 @@ lib_ignore =
DmxDue DmxDue
DueFlashStorage DueFlashStorage
WifiManager WifiManager
Ethernet
Ethernet3 Ethernet3
HTTPClient HTTPClient
NRFFlashStorage NRFFlashStorage
@@ -304,7 +305,7 @@ lib_deps =
https://github.com/anklimov/CmdArduino https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet https://github.com/anklimov/Ethernet2
https://github.com/knolleary/pubsubclient.git https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git https://github.com/anklimov/Artnet.git
FastLED FastLED