Skip to content

Commit 60bd9e0

Browse files
committed
Final changes before merge
1 parent 5fc1d69 commit 60bd9e0

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

lib/framework/EthernetSettingsService.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>
112112

113113
// 🌙 compiler directives to variables
114114
#ifdef CONFIG_IDF_TARGET_ESP32S3
115-
int8_t v_ETH_SPI_SCK = INT8_MAX; //42; v_ETH_SPI_SCK is check if configured, see configureNetwork and ModuleIO
115+
int8_t v_ETH_SPI_SCK = -1; //42; v_ETH_SPI_SCK is check if configured, see configureNetwork and ModuleIO
116116
int8_t v_ETH_SPI_MISO = 44;
117117
int8_t v_ETH_SPI_MOSI = 43;
118118

src/MoonBase/Modules/ModuleIO.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -498,11 +498,11 @@ class ModuleIO : public Module {
498498
EXT_LOGD(MB_TAG, "Try to configure ethernet");
499499
EthernetSettingsService* ess = _sveltekit->getEthernetSettingsService();
500500
#ifdef CONFIG_IDF_TARGET_ESP32S3
501-
ess->v_ETH_SPI_SCK = INT8_MAX;
502-
ess->v_ETH_SPI_MISO = INT8_MAX;
503-
ess->v_ETH_SPI_MOSI = INT8_MAX;
504-
ess->v_ETH_PHY_CS = INT8_MAX;
505-
ess->v_ETH_PHY_IRQ = INT8_MAX;
501+
ess->v_ETH_SPI_SCK = -1;
502+
ess->v_ETH_SPI_MISO = -1;
503+
ess->v_ETH_SPI_MOSI = -1;
504+
ess->v_ETH_PHY_CS = -1;
505+
ess->v_ETH_PHY_IRQ = -1;
506506

507507
auto assignIfValid = [](uint8_t gpio, uint8_t usage, int8_t& target) {
508508
if (GPIO_IS_VALID_GPIO(gpio))
@@ -534,7 +534,7 @@ class ModuleIO : public Module {
534534
}
535535

536536
// allocate the pins found
537-
if (ess->v_ETH_SPI_SCK != INT8_MAX && ess->v_ETH_SPI_MISO != INT8_MAX && ess->v_ETH_SPI_MOSI != INT8_MAX && ess->v_ETH_PHY_CS != INT8_MAX && ess->v_ETH_PHY_IRQ != INT8_MAX) {
537+
if (ess->v_ETH_SPI_SCK != -1 && ess->v_ETH_SPI_MISO != -1 && ess->v_ETH_SPI_MOSI != -1 && ess->v_ETH_PHY_CS != -1 && ess->v_ETH_PHY_IRQ != -1) {
538538
// ess->v_ETH_PHY_TYPE = ETH_PHY_W5500;
539539
// ess->v_ETH_PHY_ADDR = 1;
540540
ess->v_ETH_PHY_RST = -1; // not wired

src/MoonLight/Nodes/Drivers/D_ArtnetIn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ArtNetInDriver : public Node {
2929
uint8_t view = 0; // physical layer
3030
uint16_t port = 6454;
3131
uint16_t universeMin = 0;
32-
uint16_t universeMax = 255;
32+
uint16_t universeMax = 32767;
3333

3434
void setup() override {
3535
addControl(ddp, "DDP", "checkbox");

0 commit comments

Comments
 (0)