29 Commits

Author SHA1 Message Date
a45f60c09e fix: Update build.yml 2025-07-20 18:39:26 +02:00
93ad7ba411 fix: Added 7z 2025-07-20 18:36:07 +02:00
Myx
592b44ee43 fix: Test pipeline 2025-07-20 18:22:24 +02:00
1f78fedcb3 Update build.yml 2025-07-20 18:13:21 +02:00
Myx
58858700d9 fix: readme had not proper content
Everyone should be happy now!
2025-07-20 17:57:43 +02:00
2c86c7741d Update README.md 2025-07-20 17:50:17 +02:00
fc52024d5a Update README.md 2025-07-20 17:49:03 +02:00
d768b8ae3f More info (#3) 2025-07-20 17:47:54 +02:00
acd428ed9c Update build.yml 2025-07-20 17:11:20 +02:00
3c6205c44d Update build.yml 2025-07-20 17:04:43 +02:00
acd16f3b5d Update build.yml 2025-07-20 17:03:42 +02:00
65257303a8 Auto release 2025-07-20 17:01:11 +02:00
5a6c715fd8 Delete ClientMachineCode/INFOSCREEN_WITH_INTERVAL/.INFOSCREEN_WITH_INTERVAL.ino.kate-swp 2025-07-20 16:50:59 +02:00
202c6fad1b Fix dispaly turning off before loading data 2025-07-20 16:50:38 +02:00
337be8e534 Update build.yml 2025-07-20 16:24:54 +02:00
44821fb465 Update build.yml 2025-07-20 16:21:20 +02:00
58d50ecee2 Update build.yml 2025-07-20 15:59:47 +02:00
98fb59a97b Update index.cshtml remove ; 2025-07-20 15:42:39 +02:00
91cc89ac02 Update README.md 2025-07-20 15:18:48 +02:00
dbf0d93d00 Update build.yml 2025-07-20 14:59:33 +02:00
c8e4a85296 Update build.yml 2025-07-20 14:48:50 +02:00
6fd653b45d Add restart 2025-07-20 14:42:29 +02:00
07c618d55d Update build.yml 2025-07-20 14:40:16 +02:00
6077a6e14b Create build.yml 2025-07-20 14:29:53 +02:00
ba47856fbc Update README.md 2025-07-19 19:17:06 +02:00
e21601234a Add image generation (#2)
* Add image generation

* Optimise for minimal memory

* Added a new ui

* Add support for esp
2025-07-19 19:11:31 +02:00
e9d145455e Update INFOSCREEN_WITH_INTERVAL.ino 2025-07-19 18:17:10 +02:00
c987a0bd58 Update INFOSCREEN_WITH_INTERVAL.ino 2025-07-19 17:42:05 +02:00
Myx
c0536d789b Added Machine code 2025-07-15 22:19:24 +02:00
8 changed files with 1077 additions and 12 deletions

246
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,246 @@
name: Build and Deploy
on:
push:
branches:
- master # Change to your default branch if different
workflow_dispatch:
inputs:
environment:
description: 'Environment to deploy to'
required: true
default: 'prod'
type: choice
options:
- prod
- dev
- test
restart_iis:
description: 'Restart IIS after deployment'
required: true
default: true
type: boolean
create_release:
description: 'Create release'
required: true
default: true
type: boolean
jobs:
build:
runs-on: self-hosted # Ensure your self-hosted runner is configured
environment: ${{ github.event.inputs.environment || 'prod' }}
steps:
- name: Get Current User
run: |
$env:USERNAME
- name: Checkout Repository
uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetches all history and tags for versioning
- name: Set up .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: '9.0' # Change to your required .NET version
- name: Restore .NET Dependencies
run: dotnet restore ./HomeApi.sln
- name: Build .NET Project
run: dotnet build --configuration Release ./HomeApi/HomeApi.csproj
- name: Publish .NET Project
run: |
dotnet publish ./HomeApi/HomeApi.csproj --configuration Release --output ./output/dotnet --self-contained false --no-restore /p:PublishTrimmed=false /p:CopyOutputSymbolsToPublishDirectory=false
# Verify wwwroot was published
if (Test-Path -Path "./output/dotnet/wwwroot") {
Write-Host "wwwroot folder was published successfully"
} else {
Write-Host "WARNING: wwwroot folder was not found in published output!"
}
# Check for Chrome-related files
if (Test-Path -Path "./output/dotnet/Chrome") {
Write-Host "Chrome folder was published successfully"
} else {
Write-Host "Chrome folder not found in published output"
}
if (Test-Path -Path "./output/dotnet/ChromeHeadlessShell") {
Write-Host "ChromeHeadlessShell was published successfully"
} else {
Write-Host "ChromeHeadlessShell not found in published output"
}
- name: Generate SemVer version
if: ${{ github.event.inputs.create_release != 'false' }}
id: semver
uses: ietf-tools/semver-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: master
patchAll: true # Always increment patch number
- name: Create GitHub Release
if: ${{ github.event.inputs.create_release != 'false' }}
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.semver.outputs.next }}
release_name: Release ${{ steps.semver.outputs.next }}
draft: false
prerelease: false
- name: Zip the build for github release
if: ${{ github.event.inputs.create_release != 'false' }}
run: 7z a -tzip ./out/HomeScreen_Build_${{ steps.semver.outputs.next }}.zip ./out/*
- name: Upload Release Asset
if: ${{ github.event.inputs.create_release != 'false' }}
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./out/HomeScreen_Build_"{${{ steps.semver.outputs.next }}}".zip
asset_name: Lunaris_${{steps.semver.outputs.patch}}.zip
asset_content_type: application/zip
- name: Generate appsettings.json
run: |
$appSettings = @{
Logging = @{
LogLevel = @{
Default = "Information"
"Microsoft.AspNetCore" = "Warning"
}
}
ApiConfiguration = @{
EspConfiguration = @{
InformationBoardImageUrl = "${{ vars.ESP_IMAGE_URL }}"
UpdateIntervalMinutes = [int]"${{ vars.ESP_UPDATE_INTERVAL }}"
BlackTextThreshold = [int]"${{ vars.ESP_BLACK_TEXT_THRESHOLD }}"
EnableDithering = [System.Convert]::ToBoolean("${{ vars.ESP_ENABLE_DITHERING }}")
DitheringStrength = [int]"${{ vars.ESP_DITHERING_STRENGTH }}"
EnhanceContrast = [System.Convert]::ToBoolean("${{ vars.ESP_ENHANCE_CONTRAST }}")
ContrastStrength = [int]"${{ vars.ESP_CONTRAST_STRENGTH }}"
IsHighContrastMode = [System.Convert]::ToBoolean("${{ vars.ESP_HIGH_CONTRAST_MODE }}")
}
Keys = @{
Weather = "${{ secrets.WEATHER_API_KEY }}"
ResRobot = "${{ secrets.RES_ROBOT_API_KEY }}"
}
BaseUrls = @{
Nominatim = "${{ vars.NOMINATIM_URL }}"
Aurora = "${{ vars.AURORA_URL }}"
Weather = "${{ vars.WEATHER_URL }}"
ResRobot = "${{ vars.RES_ROBOT_URL }}"
}
DefaultCity = "${{ vars.DEFAULT_CITY }}"
DefaultStation = "${{ vars.DEFAULT_STATION }}"
}
AllowedHosts = "*"
}
$appSettings | ConvertTo-Json -Depth 10 | Set-Content -Path "./output/dotnet/appsettings.json"
Write-Host "Generated appsettings.json successfully"
# Check wwwroot and manually copy if missing
- name: Ensure wwwroot is Included
run: |
if (-not (Test-Path -Path "./output/dotnet/wwwroot")) {
Write-Host "wwwroot folder not found in published output, manually copying..."
# Check if wwwroot exists in project directory
$sourceWwwroot = "./HomeApi/wwwroot"
if (Test-Path -Path $sourceWwwroot) {
Write-Host "Found wwwroot directory in source, copying..."
New-Item -ItemType Directory -Path "./output/dotnet/wwwroot" -Force
Copy-Item -Path "$sourceWwwroot/*" -Destination "./output/dotnet/wwwroot" -Recurse -Force
} else {
Write-Host "WARNING: Could not find wwwroot in source directory!"
}
}
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: dotnet-artifacts
path: ./output/dotnet
deploy:
runs-on: self-hosted # Ensure your self-hosted runner is configured
needs: build
environment: ${{ github.event.inputs.environment || 'prod' }}
steps:
- name: Download .NET Artifacts
uses: actions/download-artifact@v4
with:
name: dotnet-artifacts
path: ./output/dotnet
- name: Stop IIS Application Pool
run: |
Import-Module WebAdministration
$appPoolName = "${{ vars.IIS_APP_POOL_NAME }}"
if ([string]::IsNullOrEmpty($appPoolName)) {
$appPoolName = "HomeApi"
}
Write-Host "Stopping application pool: $appPoolName"
# Check if app pool exists
if (Test-Path "IIS:\AppPools\$appPoolName") {
# Stop app pool
if ((Get-WebAppPoolState -Name $appPoolName).Value -ne "Stopped") {
Stop-WebAppPool -Name $appPoolName
Start-Sleep -Seconds 5 # Give it time to fully stop
Write-Host "Application pool stopped successfully"
} else {
Write-Host "Application pool was already stopped"
}
} else {
Write-Host "Warning: Application pool '$appPoolName' not found. Will attempt to copy files anyway."
}
- name: Copy .NET Publish Files to IIS Server
run: |
# Ensure destination directory exists
if (-not (Test-Path "C:\inetpub\applications\HomeApi")) {
New-Item -ItemType Directory -Path "C:\inetpub\applications\HomeApi" -Force
Write-Host "Created destination directory"
}
# Copy files
Write-Host "Copying files to destination..."
Copy-Item -Path ".\output\dotnet\*" -Destination "C:\inetpub\applications\HomeApi" -Recurse -Force
Write-Host "Files copied successfully"
- name: Restart IIS Application Pool
if: ${{ github.event.inputs.restart_iis != 'false' }}
run: |
Import-Module WebAdministration
$appPoolName = "${{ vars.IIS_APP_POOL_NAME }}"
if ([string]::IsNullOrEmpty($appPoolName)) {
$appPoolName = "HomeApi"
}
Write-Host "Starting application pool: $appPoolName"
# Check if app pool exists
if (Test-Path "IIS:\AppPools\$appPoolName") {
# Start app pool
Start-WebAppPool -Name $appPoolName
Write-Host "Application pool started successfully"
} else {
Write-Host "Warning: Application pool '$appPoolName' not found. Using IISReset instead."
iisreset /restart
Write-Host "IIS restarted successfully"
}

View File

@@ -0,0 +1,157 @@
#include <WiFi.h>
#include "EPD.h"
#include "DEV_Config.h"
#include "GUI_Paint.h"
// — Wi-Fi & image endpoint ———————————————————————————————
const char* ssid = "x";
const char* password = "x";
const char* HOST = "192.168.x.x";
const uint16_t PORT = 5000;
const char* PATH = "/Home/default.bmp";
// — Framebuffers for black & red ——————————————————————————————
UBYTE *BlackImage = nullptr;
UBYTE *RYImage = nullptr;
void setup() {
Serial.begin(115200);
DEV_Module_Init();
// 1) Allocate framebuffers
const int W = EPD_7IN5B_V2_WIDTH;
const int H = EPD_7IN5B_V2_HEIGHT;
size_t bufSize = ((W + 7) / 8) * H;
BlackImage = (UBYTE*)malloc(bufSize);
RYImage = (UBYTE*)malloc(bufSize);
if (!BlackImage || !RYImage) {
Serial.println("ERROR: not enough RAM"); while(1) delay(1000);
}
// 2) Wi-Fi connect
WiFi.begin(ssid, password);
Serial.print("Wi-Fi connecting");
while (WiFi.status() != WL_CONNECTED) {
delay(500); Serial.print(".");
}
Serial.println("");
Serial.print("ESP32 IP = "); Serial.println(WiFi.localIP());
// 3) Prepare white canvases
Paint_NewImage(BlackImage, W, H, 0, WHITE);
Paint_NewImage(RYImage, W, H, 0, WHITE);
Paint_SelectImage(BlackImage); Paint_Clear(WHITE);
Paint_SelectImage(RYImage); Paint_Clear(WHITE);
// 4) Manual HTTP GET via WiFiClient
{
WiFiClient client;
Serial.printf("Connecting to %s:%u …", HOST, PORT);
if (!client.connect(HOST, PORT)) {
Serial.println(" FAILED");
} else {
Serial.println(" OK");
// Send the GET request
client.printf("GET %s HTTP/1.1\r\n", PATH);
client.printf("Host: %s\r\n", HOST);
client.print ("Connection: close\r\n\r\n");
// Wait up to 15 s for the first byte
uint32_t start = millis();
while (!client.available() && millis() - start < 15000) {
delay(10);
}
if (!client.available()) {
Serial.println("No response—timeout");
} else {
Serial.println("Received response, parsing…");
// ✅ 4.1 Read and parse status line
String statusLine = client.readStringUntil('\n');
Serial.print("HTTP Status Line: ");
Serial.println(statusLine);
int statusCode = statusLine.substring(9, 12).toInt(); // "HTTP/1.1 200 OK"
if (statusCode != 200) {
Serial.printf("❌ HTTP Error: %d\n", statusCode);
client.stop();
return;
}
// ✅ 4.2 Skip the remaining HTTP headers
while (client.available()) {
String line = client.readStringUntil('\n');
if (line == "\r" || line == "") break; // End of headers
}
// ✅ Continue with BMP header reading...
// 4.3 Read BMP header
uint8_t header[54];
client.readBytes(header, 54);
uint32_t dataOffset =
uint32_t(header[10])
| (uint32_t(header[11]) << 8)
| (uint32_t(header[12]) << 16)
| (uint32_t(header[13]) << 24);
// 4.3 Skip any extra header padding
if (dataOffset > 54) {
uint32_t toSkip = dataOffset - 54;
uint8_t dum[32];
while (toSkip) {
size_t chunk = toSkip > sizeof(dum) ? sizeof(dum) : toSkip;
client.readBytes(dum, chunk);
toSkip -= chunk;
}
}
// 4.4 Decode bottom-up, line by line
int rowSize = ((W * 3 + 3) / 4) * 4;
uint8_t *rowBuf = (uint8_t*)malloc(rowSize);
if (!rowBuf) {
Serial.println("ERROR: rowBuf malloc failed");
}
else {
for (int y = H - 1; y >= 0; y--) {
client.readBytes(rowBuf, rowSize);
uint8_t mask = 0x80;
uint32_t idx = (y * W) / 8;
for (int x = 0; x < W; x++) {
uint8_t b = rowBuf[x*3 + 0];
uint8_t g = rowBuf[x*3 + 1];
uint8_t r = rowBuf[x*3 + 2];
bool isRed = (r > 150 && g < 80 && b < 80);
bool isBlack = (!isRed && ((r+g+b)/3 < 180));
if (isRed) RYImage[idx] &= ~mask;
if (isBlack) BlackImage[idx] &= ~mask;
mask >>= 1;
if (!mask) { mask = 0x80; idx++; }
}
}
free(rowBuf);
Serial.println("BMP decoded successfully!");
}
}
client.stop();
}
}
// 5) Display on the e-ink
EPD_7IN5B_V2_Init();
EPD_7IN5B_V2_Display(BlackImage, RYImage);
DEV_Delay_ms(2000);
EPD_7IN5B_V2_Sleep();
// 6) Clean up
free(BlackImage);
free(RYImage);
}
void loop() {
// nothing
}

View File

@@ -0,0 +1,544 @@
#include <WiFi.h>
#include <HTTPClient.h>
#include <stdint.h>
#include "DEV_Config.h"
#include "EPD.h"
#include "GUI_Paint.h"
#include <ArduinoJson.h>
#include <JPEGDEC.h>
// WiFi credentials
const char* ssid = "x";
const char* password = "x";
// API endpoints
const char* connectionInformation = "http://x/home/configuration";
// These will be updated from the connection information
String imageUrl = ""; // Will be populated from JSON
uint64_t sleepDuration = 30e6; // Default 30 seconds in microseconds
// Display dimensions - use the constants from Waveshare library
#define EPD_WIDTH EPD_7IN5B_V2_WIDTH
#define EPD_HEIGHT EPD_7IN5B_V2_HEIGHT
// =========== IMAGE TUNING PARAMETERS ===========
// These will be updated from the configuration
uint8_t blackTextThreshold = 190; // Default (0-255)
bool enableDithering = true; // Default
uint8_t ditherStrength = 8; // Default (8-32)
bool enhanceContrast = true; // Default
uint8_t contrastLevel = 30; // Default (0-100)
// ===============================================
// Framebuffers for black and red layers
UBYTE *BlackImage, *RYImage;
// Error buffers for dithering
int16_t *errorR = NULL;
int16_t *errorG = NULL;
int16_t *errorB = NULL;
// Create an instance of the JPEG decoder
JPEGDEC jpeg;
// Apply contrast adjustment to RGB values
void adjustContrast(uint8_t *r, uint8_t *g, uint8_t *b) {
if (!enhanceContrast) return;
float contrast = (contrastLevel / 100.0) + 1.0; // Convert to decimal & shift range: [0..2]
float intercept = 128 * (1 - contrast);
*r = constrain((*r * contrast) + intercept, 0, 255);
*g = constrain((*g * contrast) + intercept, 0, 255);
*b = constrain((*b * contrast) + intercept, 0, 255);
}
// JPEG draw callback function for JPEGDEC
int jpegDrawCallback(JPEGDRAW *pDraw) {
// Get MCU block information
uint16_t *pPixels = pDraw->pPixels;
int x = pDraw->x;
int y = pDraw->y;
int width = pDraw->iWidth;
int height = pDraw->iHeight;
// Initialize error buffers for dithering if needed
if (enableDithering && errorR == NULL) {
errorR = (int16_t*)malloc(EPD_WIDTH * sizeof(int16_t));
errorG = (int16_t*)malloc(EPD_WIDTH * sizeof(int16_t));
errorB = (int16_t*)malloc(EPD_WIDTH * sizeof(int16_t));
if (errorR && errorG && errorB) {
memset(errorR, 0, EPD_WIDTH * sizeof(int16_t));
memset(errorG, 0, EPD_WIDTH * sizeof(int16_t));
memset(errorB, 0, EPD_WIDTH * sizeof(int16_t));
} else {
Serial.println("Failed to allocate dithering buffers");
if (errorR) free(errorR);
if (errorG) free(errorG);
if (errorB) free(errorB);
errorR = errorG = errorB = NULL;
}
}
// Process each row in this MCU block
for (int iy = 0; iy < height; iy++) {
// Reset error buffers for each row
if (enableDithering && errorR != NULL) {
memset(errorR, 0, EPD_WIDTH * sizeof(int16_t));
memset(errorG, 0, EPD_WIDTH * sizeof(int16_t));
memset(errorB, 0, EPD_WIDTH * sizeof(int16_t));
}
// Process each pixel in the row
for (int ix = 0; ix < width; ix++) {
int pos_x = x + ix;
int pos_y = y + iy;
// Skip if outside display bounds
if (pos_x >= EPD_WIDTH || pos_y >= EPD_HEIGHT) continue;
// Get the 16-bit pixel value (RGB565)
uint16_t pixel = pPixels[iy * width + ix];
// Extract RGB components (565 format) and convert to 0-255 range
uint8_t r = ((pixel >> 11) & 0x1F) << 3;
uint8_t g = ((pixel >> 5) & 0x3F) << 2;
uint8_t b = (pixel & 0x1F) << 3;
// Apply contrast adjustment if enabled
if (enhanceContrast) {
adjustContrast(&r, &g, &b);
}
// Apply dithering errors if enabled
if (enableDithering && errorR != NULL) {
r = constrain(r + (errorR[pos_x] / ditherStrength), 0, 255);
g = constrain(g + (errorG[pos_x] / ditherStrength), 0, 255);
b = constrain(b + (errorB[pos_x] / ditherStrength), 0, 255);
}
// Calculate grayscale value
float gray = (r * 0.299 + g * 0.587 + b * 0.114);
// ===== IMPROVED COLOR CLASSIFICATION LOGIC =====
// Variable for final color (0=black, 1=white, 2=red)
int finalColor;
// Check for "redness" - how much stronger red is than other components
float redness = r / (float)(g + b + 1); // Add 1 to avoid division by zero
// Check if this is likely a red pixel based on redness
if (r > 100 && redness > 1.5) {
finalColor = 2; // Red
}
// If not red, determine if it's black or white based on grayscale
else if (gray < blackTextThreshold) {
finalColor = 0; // Black
}
else {
finalColor = 1; // White
}
// Determine target colors for error calculation
uint8_t targetR, targetG, targetB;
switch (finalColor) {
case 0: // Black
targetR = targetG = targetB = 0;
break;
case 2: // Red
targetR = 255;
targetG = targetB = 0;
break;
default: // White
targetR = targetG = targetB = 255;
break;
}
// Calculate and distribute dithering errors
if (enableDithering && errorR != NULL) {
int16_t err_r = r - targetR;
int16_t err_g = g - targetG;
int16_t err_b = b - targetB;
// Floyd-Steinberg dithering pattern
if (pos_x + 1 < EPD_WIDTH) {
// Right pixel (7/16)
errorR[pos_x + 1] += (err_r * 7) >> 4;
errorG[pos_x + 1] += (err_g * 7) >> 4;
errorB[pos_x + 1] += (err_b * 7) >> 4;
}
if (pos_x > 0 && pos_x + 1 < EPD_WIDTH) {
errorR[pos_x - 1] += (err_r * 3) >> 4; // left-down (3/16)
errorG[pos_x - 1] += (err_g * 3) >> 4;
errorB[pos_x - 1] += (err_b * 3) >> 4;
errorR[pos_x] += (err_r * 5) >> 4; // down (5/16)
errorG[pos_x] += (err_g * 5) >> 4;
errorB[pos_x] += (err_b * 5) >> 4;
errorR[pos_x + 1] += (err_r * 1) >> 4; // right-down (1/16)
errorG[pos_x + 1] += (err_g * 1) >> 4;
errorB[pos_x + 1] += (err_b * 1) >> 4;
}
}
// Draw the pixel based on the final color
switch (finalColor) {
case 0: // Black
Paint_SelectImage(BlackImage);
Paint_SetPixel(pos_x, pos_y, BLACK);
Paint_SelectImage(RYImage);
Paint_SetPixel(pos_x, pos_y, WHITE);
break;
case 2: // Red
Paint_SelectImage(BlackImage);
Paint_SetPixel(pos_x, pos_y, WHITE);
Paint_SelectImage(RYImage);
Paint_SetPixel(pos_x, pos_y, BLACK); // BLACK in RY buffer = RED
break;
default: // White
Paint_SelectImage(BlackImage);
Paint_SetPixel(pos_x, pos_y, WHITE);
Paint_SelectImage(RYImage);
Paint_SetPixel(pos_x, pos_y, WHITE);
break;
}
}
}
return 1; // Continue decoding
}
void setup() {
Serial.begin(115200);
Serial.println("E-Ink Display Initialization");
// Calculate buffer size as in Waveshare example
UWORD Imagesize = ((EPD_WIDTH % 8 == 0) ? (EPD_WIDTH / 8) : (EPD_WIDTH / 8 + 1)) * EPD_HEIGHT;
// Allocate framebuffers
BlackImage = (UBYTE *)malloc(Imagesize);
RYImage = (UBYTE *)malloc(Imagesize);
if ((BlackImage == NULL) || (RYImage == NULL)) {
Serial.println("Failed to allocate memory for framebuffers!");
while(1); // Halt if memory allocation fails
}
// Initialize e-ink display exactly as in Waveshare example
DEV_Module_Init();
EPD_7IN5B_V2_Init();
// EPD_7IN5B_V2_Clear();
DEV_Delay_ms(500);
// Initialize the Paint library with the buffers
Paint_NewImage(BlackImage, EPD_WIDTH, EPD_HEIGHT, 0, WHITE);
Paint_NewImage(RYImage, EPD_WIDTH, EPD_HEIGHT, 0, WHITE);
Serial.println("Buffers allocated and cleared");
// Connect to WiFi
WiFi.begin(ssid, password);
Serial.print("Connecting to WiFi");
int wifiAttempts = 0;
while (WiFi.status() != WL_CONNECTED && wifiAttempts < 20) {
delay(500);
Serial.print(".");
wifiAttempts++;
}
if (WiFi.status() == WL_CONNECTED) {
Serial.println();
Serial.println("WiFi connected");
Serial.print("IP address: ");
Serial.println(WiFi.localIP());
} else {
Serial.println();
Serial.println("WiFi connection failed!");
return;
}
// Test connectivity to server and get configuration
Serial.println("Fetching connection information...");
if (fetchConnectionInformation()) {
// Fetch and display image
fetchAndDisplayImage();
} else {
Serial.println("Server connectivity test failed - skipping image fetch");
}
// Free dithering buffers if allocated
if (errorR) free(errorR);
if (errorG) free(errorG);
if (errorB) free(errorB);
errorR = errorG = errorB = NULL;
// Put display to sleep
EPD_7IN5B_V2_Sleep();
// Free framebuffers
free(BlackImage);
free(RYImage);
BlackImage = NULL;
RYImage = NULL;
// Enter deep sleep
Serial.print("Going to sleep for ");
Serial.print(sleepDuration / 60000000);
Serial.println(" minutes");
esp_sleep_enable_timer_wakeup(sleepDuration);
esp_deep_sleep_start();
}
bool fetchConnectionInformation() {
HTTPClient http;
http.begin(connectionInformation);
http.setTimeout(10000);
int httpCode = http.GET();
Serial.print("HTTP response code: ");
Serial.println(httpCode);
// Handle the response payload
String payload = "";
if (httpCode == HTTP_CODE_OK) {
payload = http.getString();
// Debug output to show the exact response
Serial.println("-----RAW HTTP RESPONSE BEGIN-----");
Serial.println(payload);
Serial.println("-----RAW HTTP RESPONSE END-----");
// Check if payload is empty
if (payload.length() == 0) {
Serial.println("Warning: Server returned empty response");
http.end();
return false;
}
// Try to find JSON content in the response
int jsonStart = payload.indexOf('{');
int jsonEnd = payload.lastIndexOf('}');
if (jsonStart >= 0 && jsonEnd >= 0 && jsonEnd > jsonStart) {
String jsonPayload = payload.substring(jsonStart, jsonEnd + 1);
Serial.println("-----EXTRACTED JSON BEGIN-----");
Serial.println(jsonPayload);
Serial.println("-----EXTRACTED JSON END-----");
// Deserialize the JSON document - Increased buffer size for more parameters
StaticJsonDocument<768> doc;
DeserializationError error = deserializeJson(doc, jsonPayload);
if (error) {
Serial.print("JSON parsing failed: ");
Serial.println(error.c_str());
http.end();
return false;
}
// Extract values from the JSON
if (doc.containsKey("informationBoardImageUrl")) {
imageUrl = doc["informationBoardImageUrl"].as<String>();
Serial.print("Image URL set to: ");
Serial.println(imageUrl);
} else {
Serial.println("Warning: informationBoardImageUrl not found in JSON");
http.end();
return false;
}
if (doc.containsKey("updateIntervalMinutes")) {
int minutes = doc["updateIntervalMinutes"].as<int>();
sleepDuration = (uint64_t)minutes * 60 * 1000000; // Convert minutes to microseconds
Serial.print("Update interval set to: ");
Serial.print(minutes);
Serial.println(" minutes");
} else {
Serial.println("Warning: updateIntervalMinutes not found in JSON");
// Keep default sleep duration
}
// Extract new image processing parameters
if (doc.containsKey("blackTextThreshold")) {
blackTextThreshold = doc["blackTextThreshold"].as<uint8_t>();
Serial.print("Black text threshold set to: ");
Serial.println(blackTextThreshold);
}
if (doc.containsKey("enableDithering")) {
enableDithering = doc["enableDithering"].as<bool>();
Serial.print("Dithering enabled: ");
Serial.println(enableDithering ? "true" : "false");
}
if (doc.containsKey("ditheringStrength")) {
ditherStrength = doc["ditheringStrength"].as<uint8_t>();
Serial.print("Dithering strength set to: ");
Serial.println(ditherStrength);
}
if (doc.containsKey("enhanceContrast")) {
enhanceContrast = doc["enhanceContrast"].as<bool>();
Serial.print("Contrast enhancement enabled: ");
Serial.println(enhanceContrast ? "true" : "false");
}
if (doc.containsKey("contrastStrength")) {
contrastLevel = doc["contrastStrength"].as<uint8_t>();
Serial.print("Contrast level set to: ");
Serial.println(contrastLevel);
}
http.end();
return true;
} else {
Serial.println("No valid JSON object found in the response");
http.end();
return false;
}
} else {
Serial.print("HTTP request failed with code: ");
Serial.println(httpCode);
http.end();
return false;
}
}
void fetchAndDisplayImage() {
// Check WiFi connection before making HTTP request
if (WiFi.status() != WL_CONNECTED) {
Serial.println("WiFi not connected, cannot fetch image");
return;
}
if (imageUrl.length() == 0) {
Serial.println("Image URL not set, cannot fetch image");
return;
}
HTTPClient http;
http.begin(imageUrl);
http.setTimeout(30000); // Set 30 second timeout
http.addHeader("User-Agent", "ESP32");
Serial.print("Starting HTTP GET for image: ");
Serial.println(imageUrl);
int httpCode = http.GET();
Serial.print("HTTP response code: ");
Serial.println(httpCode);
if (httpCode == HTTP_CODE_OK) {
int len = http.getSize();
Serial.print("Content length: ");
Serial.println(len);
if (len > 0) {
Serial.print("Free heap before allocation: ");
Serial.println(ESP.getFreeHeap());
// Check if we have enough memory
if (ESP.getFreeHeap() < len + 10000) { // Keep 10KB buffer
Serial.println("Not enough memory to load image");
http.end();
return;
}
uint8_t *buffer = (uint8_t*)malloc(len);
if (buffer) {
Serial.print("Allocated ");
Serial.print(len);
Serial.println(" bytes for image buffer.");
// Clear both buffers before processing new image - USING PAINT LIBRARY
Paint_SelectImage(BlackImage);
Paint_Clear(WHITE);
Paint_SelectImage(RYImage);
Paint_Clear(WHITE);
WiFiClient *stream = http.getStreamPtr();
int totalBytesRead = 0;
unsigned long timeout = millis() + 30000; // 30 second timeout for reading
while (totalBytesRead < len && millis() < timeout) {
int bytesRead = stream->readBytes(buffer + totalBytesRead, len - totalBytesRead);
if (bytesRead == 0) {
delay(5); // Short delay if no data available
if (stream->available() == 0) {
if (totalBytesRead < len) {
Serial.println("Stream ended prematurely.");
}
break;
}
} else {
totalBytesRead += bytesRead;
}
}
Serial.print("Total bytes read: ");
Serial.println(totalBytesRead);
if (totalBytesRead == len) {
// Process and display the image using JPEGDEC
Serial.println("Decoding JPEG image...");
// Open JPEG image from memory
if (jpeg.openRAM(buffer, len, jpegDrawCallback)) {
// Get information about the image
int jpegWidth = jpeg.getWidth();
int jpegHeight = jpeg.getHeight();
Serial.print("JPEG image dimensions: ");
Serial.print(jpegWidth);
Serial.print(" x ");
Serial.println(jpegHeight);
// Decode the image
if (jpeg.decode(0, 0, 0)) {
Serial.println("JPEG image decoded successfully");
} else {
Serial.println("Error decoding JPEG image");
}
// Close the file
jpeg.close();
// Display the processed image - using Waveshare's function
Serial.println("Sending image to display...");
EPD_7IN5B_V2_Display(BlackImage, RYImage);
Serial.println("Image displayed successfully.");
} else {
Serial.println("Failed to open JPEG image");
}
} else {
Serial.println("Failed to read entire image.");
}
free(buffer);
} else {
Serial.println("Failed to allocate buffer!");
}
} else {
Serial.println("Content length unknown or invalid.");
}
} else if (httpCode == HTTPC_ERROR_CONNECTION_REFUSED) {
Serial.println("Connection refused - server may be down");
} else if (httpCode == HTTPC_ERROR_CONNECTION_LOST) {
Serial.println("Connection lost during request");
} else if (httpCode == HTTPC_ERROR_NO_HTTP_SERVER) {
Serial.println("No HTTP server found");
} else if (httpCode == HTTPC_ERROR_NOT_CONNECTED) {
Serial.println("Not connected to server");
} else {
Serial.printf("HTTP GET failed, error: %d\n", httpCode);
}
http.end();
}
void loop() {
// Empty - using deep sleep instead
}

View File

@@ -7,6 +7,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HomeApi", "HomeApi\HomeApi.csproj", "{0F340BDE-7B8E-4ACD-8A24-5B5BFFB424F4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ESP32_CODE", "ESP32_CODE", "{B3BCE85B-5021-4D4D-8758-CA7AAFF86C2D}"
ProjectSection(SolutionItems) = preProject
Esp32_Code\ESPSCREEN\ESPSCREEN.ino = Esp32_Code\ESPSCREEN\ESPSCREEN.ino
Esp32_Code\INFOSCREEN_WITH_INTERVAL\INFOSCREEN_WITH_INTERVAL.ino = Esp32_Code\INFOSCREEN_WITH_INTERVAL\INFOSCREEN_WITH_INTERVAL.ino
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -20,5 +26,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0F340BDE-7B8E-4ACD-8A24-5B5BFFB424F4} = {FF03E920-D5E9-4BE0-AA6F-DB2E9287D3E4}
{B3BCE85B-5021-4D4D-8758-CA7AAFF86C2D} = {FF03E920-D5E9-4BE0-AA6F-DB2E9287D3E4}
EndGlobalSection
EndGlobal

View File

@@ -20,6 +20,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="..\README.md" />
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>

View File

@@ -509,7 +509,7 @@
<i class="fas fa-wind wind-icon"></i>
<span>Wind</span>
</div>
<span class="detail-value">@Model.Weather.Current.WindPerMeterSecond.ToString("0.##"); m/s @Model.Weather.Current.WindDirection</span>
<span class="detail-value">@Model.Weather.Current.WindPerMeterSecond.ToString("0.##") m/s @Model.Weather.Current.WindDirection</span>
</div>
<div class="detail-item">
@@ -517,7 +517,7 @@
<i class="fas fa-chart-line activity-icon"></i>
<span>Gusts</span>
</div>
<span class="detail-value">@Model.Weather.Current.WindGustPerMeterSecond.ToString("0.##"); m/s</span>
<span class="detail-value">@Model.Weather.Current.WindGustPerMeterSecond.ToString("0.##") m/s</span>
</div>
<div class="detail-item">

110
README.md
View File

@@ -1 +1,109 @@
E-ink solar panel screen showing info, this is the api for it. Low effort code
# This [![Build and Deploy](https://github.com/Myxelium/HomeScreen/actions/workflows/build.yml/badge.svg)](https://github.com/Myxelium/HomeScreen/actions/workflows/build.yml)
Core api and Esp32 code for displaying weather data and public transport information on a e-ink display.
<img width="800" height="480" alt="image" src="https://github.com/user-attachments/assets/ef5af0c6-ea3a-494d-b2af-3de6e70b3e6a" />
## Features 😺
- Display current weather data
- Display public transport information
- Display time and date
## Requirements 🫥
- ESP32 board
- E-ink display (e.g. Waveshare 7.5 inch)
# Installation
This section provides instructions for setting up and running the HomeApi project.
## Prerequisites
- [.NET 9.0 SDK](https://dotnet.microsoft.com/download/dotnet/9.0) or later
- Docker (optional, for containerized deployment)
- Git (to clone the repository)
## Option 1: Local Development Setup
1. Clone the repository:
```bash
git clone https://github.com/Myxelium/HomeScreen.git
cd HomeApi
```
2. Restore dependencies:
```bash
dotnet restore
```
3. Build the project:
```bash
dotnet build
```
4. Run the application:
```bash
dotnet run
```
The API will be available at `http://localhost:5000`.
## Option 2: Docker Deployment
1. Build the Docker image:
```bash
docker build -t homeapi .
```
2. Run the container:
```bash
docker run -d -p 5000 --name homeapi homeapi
```
The API will be accessible at `http://localhost:5000`.
## Configuration
The application uses the standard .NET configuration system. You can modify settings in:
- `appsettings.json` - Default configuration
- `appsettings.Development.json` - Development environment configuration
API endpoints:
- Weather data: GET `/home`
- Generated image: GET `/home/default.jpg`
- Configuration data: GET `/home/configuration`
- Departure board: GET `/home/departure-board`
## API Documentation
When running, API documentation is available through Scalar at `/scalar`.
```mermaid
flowchart TD
subgraph ESP32 Device
ESP[ESP32 E-Ink Display]
ESP -->|HTTP GET /home/configuration| API
ESP -->|HTTP GET /home/default.jpg| API
end
subgraph HomeApi
API[HomeControllerAPI]
API -->|MediatR| Handlers
Handlers -->|Service Calls| Services
Services -->|Refit Clients| Clients
Clients -->|External APIs| ExtAPIs
API -->|Returns JSON/JPEG| ESP
end
subgraph ExternalAPIs
WeatherAPI[Weather API]
AuroraAPI[Aurora API]
NominatimAPI[Nominatim API]
ResRobotAPI[ResRobot API]
end
ExtAPIs -.-> WeatherAPI
ExtAPIs -.-> AuroraAPI
ExtAPIs -.-> NominatimAPI
ExtAPIs -.-> ResRobotAPI
```

View File

@@ -1,13 +1,15 @@
services:
homeapi:
image: homeapi
build:
context: .
dockerfile: Dockerfile
version: '3.8'
homeapi-1:
image: homeapi-1
services:
homeapi:
build:
context: .
dockerfile: HomeApi/Dockerfile
image: homeapi:latest
ports:
- "5000:5000"
environment:
- ASPNETCORE_ENVIRONMENT=Development
volumes:
- ./HomeApi/appsettings.Development.json:/app/appsettings.Development.json:ro
restart: unless-stopped