Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create ArtnetEtherENC.h #79

Merged
merged 22 commits into from
Jan 10, 2024
+304 −5
Merged

Create ArtnetEtherENC.h #79

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
70f6966
Create ArtnetEtherENC.h
MrFrangipane Jan 5, 2024
0121a64
fix mac address error when using EthernetENC
Jan 5, 2024
a5aa0dd
try to add examples and workflows
Jan 8, 2024
67d4d45
fix readme
Jan 8, 2024
dd1b268
fix readme
Jan 8, 2024
5c82eec
fix readme
Jan 8, 2024
9312719
make notes about ENC28J60 collapsible/exandable
Jan 8, 2024
d89e9ec
modify build for ENC28J60 to support any platform + fix readme
Jan 8, 2024
519fa04
fix build tabulation
Jan 8, 2024
b4df224
add explanation for 4 callacks limitation
Jan 8, 2024
c4a09e8
remove MAC address condition (latest github ENC supports it) + update…
Jan 9, 2024
af4f950
remove avr:uno from workflow / fix lib url from workflow
Jan 9, 2024
78d82d1
fix(workflow): split sketch-path to reduce memory footprint for avr b…
Jan 9, 2024
c447be0
fix(readme): use suggested formulation for ArtPoll explanation
Jan 9, 2024
ed18b37
fix: remove unused svg file
Jan 9, 2024
ad5dd56
fix(ArtnetEntherENC.h): remove unused directive
Jan 9, 2024
b4cb6d3
test(workflow): enable avr:uno to check memory usage (since sketch-pa…
Jan 10, 2024
05f2288
test(workflows/ethernetENC): add fastled and send_receive folders (di…
Jan 10, 2024
9ddd952
fix(workflows/ethernetENC): name folders correctly
Jan 10, 2024
c04d767
fix(workflows/ethernetENC): remove FastLED because not supported by m…
Jan 10, 2024
743aa1c
fix(workflows/ethernetENC): remove mkrvidor4000 and reinstate FastLED
Jan 10, 2024
72f22b9
Update README.md
MrFrangipane Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Artnet/Receiver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class Receiver_ {
}
template <typename T = S>
auto macAddress(uint8_t* mac) -> std::enable_if_t<std::is_same<T, EthernetUDP>::value> {
#ifndef ESP8266
#if !defined(ESP8266) && !defined(ARTNET_ETHER_IS_ENC28J60)
Ethernet.MACAddress(mac);
#endif
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest (on GitHub) version has the MACAddress() method.

https://github.com/JAndrassy/EthernetENC/blob/3a50d3aa9c1510e4090d1763ec3e91c700b764a1/src/Ethernet.h#L99

So, could you modify these lines as follows? (ESP8266 also has MACAddress() method now, #if directive has removed)

Suggested change
#if !defined(ESP8266) && !defined(ARTNET_ETHER_IS_ENC28J60)
Ethernet.MACAddress(mac);
#endif
Ethernet.MACAddress(mac);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

I was able to compile my sketch after cloning the latest ENC library and removing the #if directive

Readme and workflow have been updated to use git instead of regular installation

}
Expand Down
20 changes: 20 additions & 0 deletions ArtnetEtherENC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#pragma once
#ifndef ARTNET_ETHER_H
#define ARTNET_ETHER_H

#define ARTNET_ENABLE_ETHER
#define ARTNET_ETHER_IS_ENC28J60

#include <Arduino.h>
#include <ArxTypeTraits.h>
#include <ArxContainer.h>
#include <EthernetENC.h>
#include <EthernetUdp.h>
#include "Artnet/util/TeensyDirtySTLErrorSolution/TeensyDirtySTLErrorSolution.h"
#include "Artnet/Manager.h"

using Artnet = art_net::Manager<EthernetUDP>;
using ArtnetSender = art_net::Sender<EthernetUDP>;
using ArtnetReceiver = art_net::Receiver<EthernetUDP>;

#endif // ARTNET_ETHER_H
Loading