Skip to content

Commit

Permalink
Merge pull request #120 from hideakitai/fix/compile-error-with-fastled
Browse files Browse the repository at this point in the history
Fix/compile error with fastled
  • Loading branch information
hideakitai authored Jul 13, 2024
2 parents 25e768c + 25d35e6 commit 9a3d20c
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 42 deletions.
68 changes: 29 additions & 39 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,27 @@ jobs:
- vendor: esp32
arch: esp32
name: esp32
- vendor: esp32
arch: esp32
name: esp32s3
# TODO: temporary disabled because of compile error of FastLED
# - vendor: esp32
# arch: esp32
# name: esp32s3
- vendor: esp32
arch: esp32
name: esp32c3
- vendor: rp2040
arch: rp2040
name: rpipicow
# TODO: temporary disabled because of compile error of FastLED (Error: invalid offset, value too big)
# - vendor: rp2040
# arch: rp2040
# name: rpipicow
include:
- index: https://arduino.esp8266.com/stable/package_esp8266com_index.json
board:
vendor: esp8266
- index: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
board:
vendor: esp32
- index: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
board:
vendor: rp2040
# - index: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
# board:
# vendor: rp2040
steps:
- uses: actions/checkout@v4
- uses: arduino/arduino-lint-action@v1
Expand All @@ -64,13 +66,8 @@ jobs:
platforms: |
- name: ${{matrix.board.vendor}}:${{matrix.board.arch}}
source-url: ${{matrix.index}}
# temporary disable FastLED examples due to Error: invalid offset, value too big
# sketch-paths: |
# - examples/WiFi
sketch-paths: |
- examples/WiFi/receiver
- examples/WiFi/send_receive
- examples/WiFi/sender
- examples/WiFi
libraries: |
- source-path: ./
- name: ArxContainer
Expand Down Expand Up @@ -262,9 +259,10 @@ jobs:
- vendor: esp32
arch: esp32
name: esp32
- vendor: esp32
arch: esp32
name: esp32s3
# TODO: temporary disabled because of compile error of FastLED
# - vendor: esp32
# arch: esp32
# name: esp32s3
- vendor: esp32
arch: esp32
name: esp32c3
Expand All @@ -285,13 +283,8 @@ jobs:
platforms: |
- name: ${{matrix.board.vendor}}:${{matrix.board.arch}}
source-url: ${{matrix.index}}
# temporary disable FastLED examples due to Error: invalid offset, value too big
# sketch-paths: |
# - examples/ETH
sketch-paths: |
- examples/ETH/receiver
- examples/ETH/send_receive
- examples/ETH/sender
- examples/ETH
libraries: |
- source-path: ./
- name: ArxContainer
Expand Down Expand Up @@ -332,15 +325,17 @@ jobs:
- vendor: esp32
arch: esp32
name: esp32
- vendor: esp32
arch: esp32
name: esp32s3
# TODO: temporary disabled because of compile error of FastLED
# - vendor: esp32
# arch: esp32
# name: esp32s3
- vendor: esp32
arch: esp32
name: esp32c3
- vendor: rp2040
arch: rp2040
name: rpipicow
# TODO: temporary disabled because of compile error of FastLED (Error: invalid offset, value too big)
# - vendor: rp2040
# arch: rp2040
# name: rpipicow
include:
- index: https://downloads.arduino.cc/packages/package_index.json
board:
Expand All @@ -351,9 +346,9 @@ jobs:
- index: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
board:
vendor: esp32
- index: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
board:
vendor: rp2040
# - index: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
# board:
# vendor: rp2040
steps:
- uses: actions/checkout@v4
- uses: arduino/arduino-lint-action@v1
Expand All @@ -367,13 +362,8 @@ jobs:
platforms: |
- name: ${{matrix.board.vendor}}:${{matrix.board.arch}}
source-url: ${{matrix.index}}
# temporary disable FastLED examples due to Error: invalid offset, value too big
# sketch-paths: |
# - examples/EthernetENC/receive_fastled
# - examples/EthernetENC/receiver
# - examples/EthernetENC/send_receive
# - examples/EthernetENC/sender
sketch-paths: |
- examples/EthernetENC/receive_fastled
- examples/EthernetENC/receiver
- examples/EthernetENC/send_receive
- examples/EthernetENC/sender
Expand Down
2 changes: 1 addition & 1 deletion Artnet/Receiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class Receiver_
}
void forwardArtDmxDataToFastLED(uint16_t universe, CRGB* leds, uint16_t num)
{
this->subscribeArtDmxUniverse(universe, [leds, num](const uint8_t* data, const uint16_t size, const ArtDmxMetadata &, const RemoteInfo &) {
this->subscribeArtDmxUniverse(universe, [this, leds, num](const uint8_t* data, const uint16_t size, const ArtDmxMetadata &, const RemoteInfo &) {
size_t n;
if (num <= size / 3) {
// OK: requested number of LEDs is less than received data size
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"url": "https://github.com/hideakitai",
"maintainer": true
},
"version": "0.7.0",
"version": "0.7.1",
"license": "MIT",
"frameworks": "*",
"platforms": "*",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ArtNet
version=0.7.0
version=0.7.1
author=hideakitai
maintainer=hideakitai
sentence=Art-Net Sender/Receiver for Arduino (Ethernet, WiFi)
Expand Down

0 comments on commit 9a3d20c

Please sign in to comment.