Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@foorschtbar
foorschtbar committed Apr 7, 2024
2 parents a397b2b + e040a29 commit 499c452
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 27 deletions.
5 changes: 5 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ Thanks to these great people for supporting this project.

<!-- ** WORK IN PROGRESS ** -->

### 2.5.1 (2023-04-07)

- (rliegmann) Fixed ESP32 Pin Definition
- (foorschtbar) Fixed build issue with MAX44009 lib

### 2.5.0 (2023-11-20)

- (foorschtbar) Fixes "MQTT message is to long" [[#322](https://github.com/pixelit-project/PixelIt/issues/322)]
Expand Down
16 changes: 8 additions & 8 deletions platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ build_flags =
-DMATRIX_HEIGHT=8 ; Pixel rows
esp32_build_flags =
${common.build_flags}
-DLDR_PIN=A0
-DLDR_PIN=34
-DMATRIX_PIN=27
-DDEFAULT_PIN_SCL="Pin_D1"
-DDEFAULT_PIN_SDA="Pin_D3"
-DDEFAULT_PIN_DFPRX="Pin_D7"
-DDEFAULT_PIN_DFPTX="Pin_D8"
-DDEFAULT_PIN_ONEWIRE="Pin_D1"
-DDEFAULT_PIN_SCL="GPIO_NUM_22"
-DDEFAULT_PIN_SDA="GPIO_NUM_21"
-DDEFAULT_PIN_DFPRX="GPIO_NUM_17"
-DDEFAULT_PIN_DFPTX="GPIO_NUM_16"
-DDEFAULT_PIN_ONEWIRE="GPIO_NUM_16"
-DDEFAULT_MATRIX_TYPE=1
-DDEFAULT_LDR=GL5516
-DVBAT_PIN=0
-DVBAT_PIN=33
esp8266_build_flags =
${common.build_flags}
-DLDR_PIN=A0
Expand Down Expand Up @@ -60,7 +60,7 @@ lib_deps =
links2004/WebSockets@^2.4.0
marcmerlin/FastLED NeoMatrix@^1.2
powerbroker2/DFPlayerMini_Fast@^1.2.0
robtillaart/Max44009@^0.5.2
robtillaart/Max44009@0.6.0
TimeLib = https://github.com/PaulStoffregen/Time.git

[env:ESP32_generic]
Expand Down
35 changes: 17 additions & 18 deletions src/PixelIt.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ void CreateFrames(JsonObject &json, int forceDuration)
for (JsonVariant singleBitmap : json["bitmaps"].as<JsonArray>())
{
DrawSingleBitmap(singleBitmap);
}
}
logMessage += json["bitmaps"].as<JsonArray>().size();
logMessage += F("), ");
}
Expand Down Expand Up @@ -3497,36 +3497,36 @@ uint8_t TranslatePin(String pin)
#elif defined(ESP32)

if (pin == "GPIO_NUM_14")
return GPIO_NUM_14;
return (int)GPIO_NUM_14;
if (pin == "GPIO_NUM_15")
return GPIO_NUM_15;
return (int)GPIO_NUM_15;
if (pin == "GPIO_NUM_16")
return GPIO_NUM_16;
return (int)GPIO_NUM_16;
if (pin == "GPIO_NUM_17")
return GPIO_NUM_17;
return (int)GPIO_NUM_17;
if (pin == "GPIO_NUM_18")
return GPIO_NUM_18;
return (int)GPIO_NUM_18;
if (pin == "GPIO_NUM_19")
return GPIO_NUM_19;
return (int)GPIO_NUM_19;
if (pin == "GPIO_NUM_21")
return GPIO_NUM_21;
return (int)GPIO_NUM_21;
if (pin == "GPIO_NUM_22")
return GPIO_NUM_22;
return (int)GPIO_NUM_22;
if (pin == "GPIO_NUM_23")
return GPIO_NUM_23;
return (int)GPIO_NUM_23;
if (pin == "GPIO_NUM_25")
return GPIO_NUM_25;
return (int)GPIO_NUM_25;
if (pin == "GPIO_NUM_26")
return GPIO_NUM_26;
return (int)GPIO_NUM_26;
if (pin == "GPIO_NUM_27")
return GPIO_NUM_27;
return (int)GPIO_NUM_27;
if (pin == "SPI_CLK_GPIO_NUM")
return SPI_CLK_GPIO_NUM;
return (int)SPI_CLK_GPIO_NUM;
if (pin == "SPI_CS0_GPIO_NUM")
return SPI_CS0_GPIO_NUM;
return (int)SPI_CS0_GPIO_NUM;

Log(F("Pin assignment - unknown pin"), pin);
return GPIO_NUM_32; // IDK
return (int)GPIO_NUM_32; // IDK
#endif
}

Expand Down Expand Up @@ -3643,8 +3643,7 @@ void setup()
else
{
delete bh1750;
max44009 = new Max44009(Max44009::Boolean::False);
max44009->configure(MAX44009_DEFAULT_ADDRESS, &twowire, Max44009::Boolean::False);
max44009 = new Max44009(MAX44009_DEFAULT_ADDRESS, &twowire);
if (max44009->isConnected())
{
Log(F("Setup"), F("Max44009/GY-049 started"));
Expand Down
2 changes: 1 addition & 1 deletion src/Webinterface.h
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Will be replaced via .github/webui.py script during build pipeline
const char mainPage[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" href="https://pixelit-project.github.io/PixelIt/webui/favicon.ico"><title>PixelIt WebUI</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.ccf38f0b.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.820fe545.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/js/app.88d41e8c.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.fcad808a.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.820fe545.css" rel="stylesheet"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.ccf38f0b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Pixel It the Matrix Display doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.fcad808a.js"></script><script src="https://pixelit-project.github.io/PixelIt/webui/js/app.88d41e8c.js"></script></body></html>)=====";
const char mainPage[] PROGMEM = R"=====(<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" href="https://pixelit-project.github.io/PixelIt/webui/favicon.ico"><title>PixelIt WebUI</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.06728995.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="preload" as="style"><link href="https://pixelit-project.github.io/PixelIt/webui/js/app.70de4aeb.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.e308edae.js" rel="preload" as="script"><link href="https://pixelit-project.github.io/PixelIt/webui/css/chunk-vendors.d0ec1288.css" rel="stylesheet"><link href="https://pixelit-project.github.io/PixelIt/webui/css/app.06728995.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Pixel It the Matrix Display doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="https://pixelit-project.github.io/PixelIt/webui/js/chunk-vendors.e308edae.js"></script><script src="https://pixelit-project.github.io/PixelIt/webui/js/app.70de4aeb.js"></script></body></html>)=====";

0 comments on commit 499c452

Please sign in to comment.