4 Commits

Author SHA1 Message Date
Myx
5c26b8f8dd Add support for esp 2025-07-19 18:59:53 +02:00
Myx
732d7c8295 Added a new ui 2025-07-19 02:49:23 +02:00
Myx
71535ec456 Optimise for minimal memory 2025-07-15 22:13:17 +02:00
Myx
480a38baac Add image generation 2025-07-15 02:42:16 +02:00
23 changed files with 122 additions and 1554 deletions

View File

@@ -1,302 +0,0 @@
name: Build and Deploy
on:
push:
branches:
- master
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
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'
- 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"
}
# 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: 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
- name: Create GitHub Release
if: ${{ github.event.inputs.create_release != 'false' }}
id: create_release
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: Create placeholder appsettings for release
if: ${{ github.event.inputs.create_release != 'false' }}
run: |
$appSettings = @{
Logging = @{
LogLevel = @{
Default = "Information"
"Microsoft.AspNetCore" = "Warning"
}
}
Seq = @{
ServerUrl = "https://log.azaaxin.com"
ApiKey = "KEY"
MinimumLevel = "Trace"
LevelOverride = @{
Microsoft = "Warning"
}
}
ApiConfiguration = @{
EspConfiguration = @{
InformationBoardImageUrl = "http://server_ip:port/home/default.jpg"
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 = "SET THIS TO YOUR KEY"
ResRobot = "SET THIS TO YOUR KEY"
}
BaseUrls = @{
Nominatim = "${{ vars.NOMINATIM_URL }}"
Aurora = "${{ vars.AURORA_URL }}"
Weather = "${{ vars.WEATHER_URL }}"
ResRobot = "${{ vars.RES_ROBOT_URL }}"
}
DefaultCity = "CITY ADDRESS"
DefaultStation = "YOUR STATION"
}
AllowedHosts = "*"
}
$appSettings | ConvertTo-Json -Depth 10 | Set-Content -Path "./output/dotnet/appsettings.json"
Write-Host "Created placeholder appsettings.json successfully"
- name: Zip the build for github release
if: ${{ github.event.inputs.create_release != 'false' }}
run: Compress-Archive -Path './output/*' -DestinationPath './output/HomeScreen_Build_${{ steps.semver.outputs.next }}.zip' -CompressionLevel Optimal -Force
- name: Upload Release Asset
if: ${{ github.event.inputs.create_release != 'false' }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./output/HomeScreen_Build_${{ steps.semver.outputs.next }}.zip
asset_name: HomeScreen_Build_${{ steps.semver.outputs.next }}.zip
asset_content_type: application/zip
- name: Generate appsettings.json
run: |
$appSettings = @{
Logging = @{
LogLevel = @{
Default = "Information"
"Microsoft.AspNetCore" = "Warning"
}
}
Seq = @{
ServerUrl = ${{ vars.SEQ_URL }}
ApiKey = ${{ secrets.seq_api_key }}
MinimumLevel = "Trace"
LevelOverride = @{
Microsoft = "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"
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: dotnet-artifacts
path: ./output/dotnet
deploy:
runs-on: self-hosted
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

@@ -1,157 +0,0 @@
#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

@@ -1,587 +0,0 @@
#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 ===========
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;
// Forward declarations
bool fetchConnectionInformation();
void fetchAndDisplayImage();
void clearDisplay();
// Centralized cleanup + deep sleep
void finishAndSleep(const char* reason) {
Serial.println();
Serial.println("========== Going to deep sleep ==========");
if (reason && reason[0]) {
Serial.print("Reason: ");
Serial.println(reason);
}
// Free dithering buffers if allocated
if (errorR) { free(errorR); errorR = NULL; }
if (errorG) { free(errorG); errorG = NULL; }
if (errorB) { free(errorB); errorB = NULL; }
// Put display to sleep (safe to call even if already sleeping)
EPD_7IN5B_V2_Sleep();
// Free framebuffers
if (BlackImage) { free(BlackImage); BlackImage = NULL; }
if (RYImage) { free(RYImage); RYImage = NULL; }
// Tidy up WiFi to save power before deep sleep
WiFi.disconnect(true, true);
WiFi.mode(WIFI_OFF);
delay(50);
Serial.print("Sleeping for ");
Serial.print(sleepDuration / 60000000);
Serial.println(" minutes");
esp_sleep_enable_timer_wakeup(sleepDuration);
esp_deep_sleep_start();
}
// 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; // [1..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 clearDisplay() {
// Clear both layers of the display
Paint_SelectImage(BlackImage);
Paint_Clear(WHITE);
Paint_SelectImage(RYImage);
Paint_Clear(WHITE);
// Send clear command to the display
EPD_7IN5B_V2_Display(BlackImage, RYImage);
Serial.println("Display cleared.");
}
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!");
// Even on failure, deep-sleep to allow recovery on next boot
finishAndSleep("Framebuffer allocation failed");
}
// 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.mode(WIFI_STA);
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!");
// IMPORTANT: Do not just return; always deep sleep so we retry later
finishAndSleep("WiFi connection failed");
}
// 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");
}
// Always finish with cleanup and deep sleep (success or failure)
finishAndSleep("Normal cycle complete");
}
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;
}
yield(); // keep WiFi stack happy
}
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");
clearDisplay();
}
} else {
Serial.println("Failed to read entire image.");
clearDisplay();
}
free(buffer);
} else {
Serial.println("Failed to allocate buffer!");
clearDisplay();
}
} else {
Serial.println("Content length unknown or invalid.");
clearDisplay();
}
} else if (httpCode == HTTPC_ERROR_CONNECTION_REFUSED) {
Serial.println("Connection refused - server may be down");
clearDisplay();
} else if (httpCode == HTTPC_ERROR_CONNECTION_LOST) {
Serial.println("Connection lost during request");
clearDisplay();
} else if (httpCode == HTTPC_ERROR_NO_HTTP_SERVER) {
Serial.println("No HTTP server found");
clearDisplay();
} else if (httpCode == HTTPC_ERROR_NOT_CONNECTED) {
Serial.println("Not connected to server");
clearDisplay();
} else {
Serial.printf("HTTP GET failed, error: %d\n", httpCode);
clearDisplay();
}
http.end();
}
void loop() {
// Empty - using deep sleep instead
}

11
HomeApi.csproj Normal file
View File

@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
</Project>

View File

@@ -7,12 +7,6 @@ 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
@@ -26,6 +20,5 @@ 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

@@ -18,10 +18,10 @@ public static class ContractExtensions
/// A <see cref="WeatherInformation"/> object populated with current weather, aurora probability, and forecast information.
/// </returns>
public static WeatherInformation ToContract(
this WeatherData? weather,
string? locationName,
this WeatherData weather,
string locationName,
AuroraForecastApiResponse? auroraForecast,
List<Models.Forecast>? forecasts)
List<Models.Forecast> forecasts)
{
return new WeatherInformation
{
@@ -58,23 +58,23 @@ public static class ContractExtensions
},
AuroraProbability = new Probability
{
Date = auroraForecast?.Date ?? DateTime.Now,
Date = auroraForecast.Date,
Calculated = new CalculatedProbability
{
Value = auroraForecast?.Probability.Calculated.Value ?? 0,
Colour = auroraForecast?.Probability.Calculated.Colour ?? string.Empty,
Lat = auroraForecast?.Probability.Calculated.Lat ?? 0,
Long = auroraForecast?.Probability.Calculated.Long ?? 0
Value = auroraForecast.Probability.Calculated.Value,
Colour = auroraForecast.Probability.Calculated.Colour,
Lat = auroraForecast.Probability.Calculated.Lat,
Long = auroraForecast.Probability.Calculated.Long
},
Colour = auroraForecast?.Probability.Colour ?? string.Empty,
Value = auroraForecast?.Probability.Value.ToString() ?? "No data",
Colour = auroraForecast.Probability.Colour,
Value = auroraForecast.Probability.Value,
HighestProbability = new Highest
{
Colour = auroraForecast?.Probability.Highest.Colour ?? string.Empty,
Lat = auroraForecast?.Probability.Highest.Lat ?? 0,
Long = auroraForecast?.Probability.Highest.Long ?? 0,
Value = auroraForecast?.Probability.Highest.Value ?? 0,
Date = auroraForecast?.Probability.Highest.Date ?? DateTime.Now
Colour = auroraForecast.Probability.Highest.Colour,
Lat = auroraForecast.Probability.Highest.Lat,
Long = auroraForecast.Probability.Highest.Long,
Value = auroraForecast.Probability.Highest.Value,
Date = auroraForecast.Probability.Highest.Date
}
}
},

View File

@@ -1,22 +0,0 @@
using MediatR;
namespace HomeApi.Extensions;
public static class MediatorExtensions
{
public static async Task<T?> TrySendAsync<T>(
this IMediator mediator,
IRequest<T> request,
CancellationToken cancellationToken) where T : class
{
try
{
return await mediator.Send(request, cancellationToken);
}
catch (OperationCanceledException) { throw; }
catch
{
return null;
}
}
}

View File

@@ -1,23 +0,0 @@
namespace HomeApi.Extensions;
public static class ServiceCallExtensions
{
public static async Task<TResult?> TryCallAsync<TService, TResult>(
this TService service,
Func<TService, Task<TResult>> action,
ILogger logger,
string errorMessage)
where TResult : class?
{
try
{
return await action(service);
}
catch (OperationCanceledException) { throw; }
catch (Exception exception)
{
logger.LogError(exception, errorMessage);
return null;
}
}
}

View File

@@ -1,6 +1,5 @@
using System.Dynamic;
using System.Reflection;
using HomeApi.Extensions;
using HomeApi.Models.Configuration;
using MediatR;
using Microsoft.Extensions.Options;
@@ -23,8 +22,8 @@ public static class ImageGeneration
public async Task<Stream> Handle(Command request, CancellationToken cancellationToken)
{
var weather = await mediator.TrySendAsync(new Weather.Command(), cancellationToken);
var departureBoard = await mediator.TrySendAsync(new DepartureBoard.Command(), cancellationToken);
var weather = await mediator.Send(new Weather.Command(), cancellationToken);
var departureBoard = await mediator.Send(new DepartureBoard.Command(), cancellationToken);
var model = new Models.Image
{
@@ -32,6 +31,8 @@ public static class ImageGeneration
TimeTable = departureBoard
};
if(weather is null)
throw new Exception("Weather data not found");
var engine = new RazorLightEngineBuilder()
.SetOperatingAssembly(Assembly.GetExecutingAssembly())
@@ -58,7 +59,7 @@ public static class ImageGeneration
{
var browserFetcher = new BrowserFetcher();
await browserFetcher.DownloadAsync();
await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
{
Headless = true,
Args = ["--disable-gpu"]

View File

@@ -35,27 +35,16 @@ public static class Weather
public async Task<WeatherInformation> Handle(Command request, CancellationToken cancellationToken)
{
var coordinates = await _geocodingService.TryCallAsync(service =>
service.GetCoordinatesAsync(_apiConfiguration.DefaultCity),
_logger,
"Failed to get coordinates"
);
var coordinates = await _geocodingService.GetCoordinatesAsync(_apiConfiguration.DefaultCity);
if (coordinates is null)
throw new Exception("Coordinates not found");
var aurora = await _auroraService.TryCallAsync(service =>
service.GetAuroraForecastAsync(coordinates?.Lat ?? "0.00", coordinates?.Lon ?? "0.00"),
_logger,
"Failed to get aurora forecast"
);
var aurora = await _auroraService.GetAuroraForecastAsync(coordinates.Lat, coordinates.Lon);
var weather = await _weatherService.GetWeatherAsync(coordinates.Lat, coordinates.Lon);
var weather = await _weatherService.TryCallAsync(service =>
service.GetWeatherAsync(coordinates?.Lat ?? string.Empty, coordinates?.Lon ?? string.Empty),
_logger,
"Failed to get weather data"
);
var forecasts = weather.Forecast.Forecastday.Select(day => day.ToForecast()).ToList();
var forecasts = weather?.Forecast.Forecastday.Select(day => day.ToForecast()).ToList();
return weather?.ToContract(coordinates?.Name, aurora, forecasts) ?? new WeatherInformation();
return weather.ToContract(coordinates.Name, aurora, forecasts);
}
}
}

View File

@@ -17,11 +17,9 @@
<PackageReference Include="RazorLight" Version="2.3.1" />
<PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.5.6" />
<PackageReference Include="Seq.Extensions.Logging" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="..\README.md" />
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
@@ -31,8 +29,5 @@
<Content Include="wwwroot\index.cshtml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\.github\workflows\build.yml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

View File

@@ -14,15 +14,9 @@ public class WeatherService(IWeatherClient weatherApi, IOptions<ApiConfiguration
{
private readonly ApiConfiguration _apiConfig = options.Value;
public Task<WeatherData> GetWeatherAsync(string? lat, string? lon)
public Task<WeatherData> GetWeatherAsync(string lat, string lon)
{
var location = $"{lat},{lon}";
if (string.IsNullOrEmpty(lat) || string.IsNullOrEmpty(lon))
{
location = _apiConfig.DefaultCity;
}
return weatherApi.GetForecastAsync(_apiConfig.Keys.Weather, location);
}
}

View File

@@ -2,6 +2,6 @@ namespace HomeApi.Models;
public class Image
{
public WeatherInformation? Weather { get; set; }
public List<TimeTable>? TimeTable { get; set; }
public WeatherInformation Weather { get; set; }
public List<TimeTable> TimeTable { get; set; }
}

View File

@@ -1,5 +1,4 @@
namespace HomeApi.Models.Response;
public class TrafikLabsApiResponse
{
public List<Departure> Departure { get; set; }

View File

@@ -1,153 +0,0 @@
using System.Text.Json.Serialization;
namespace HomeApi.Models.Response;
public class Data
{
[JsonPropertyName("instant")]
public Instant Instant { get; set; }
[JsonPropertyName("next_12_hours")]
public Next12Hours Next12Hours { get; set; }
[JsonPropertyName("next_1_hours")]
public Next1Hours Next1Hours { get; set; }
[JsonPropertyName("next_6_hours")]
public Next6Hours Next6Hours { get; set; }
}
public class Details
{
[JsonPropertyName("air_pressure_at_sea_level")]
public double AirPressureAtSeaLevel { get; set; }
[JsonPropertyName("air_temperature")]
public double AirTemperature { get; set; }
[JsonPropertyName("cloud_area_fraction")]
public double CloudAreaFraction { get; set; }
[JsonPropertyName("relative_humidity")]
public double RelativeHumidity { get; set; }
[JsonPropertyName("wind_from_direction")]
public double WindFromDirection { get; set; }
[JsonPropertyName("wind_speed")]
public double WindSpeed { get; set; }
[JsonPropertyName("precipitation_amount")]
public double PrecipitationAmount { get; set; }
}
public class Geometry
{
[JsonPropertyName("type")]
public string Type { get; set; }
[JsonPropertyName("coordinates")]
public List<double> Coordinates { get; set; }
}
public class Instant
{
[JsonPropertyName("details")]
public Details Details { get; set; }
}
public class Meta
{
[JsonPropertyName("updated_at")]
public DateTime UpdatedAt { get; set; }
[JsonPropertyName("units")]
public Units Units { get; set; }
}
public class Next12Hours
{
[JsonPropertyName("summary")]
public Summary Summary { get; set; }
[JsonPropertyName("details")]
public Details Details { get; set; }
}
public class Next1Hours
{
[JsonPropertyName("summary")]
public Summary Summary { get; set; }
[JsonPropertyName("details")]
public Details Details { get; set; }
}
public class Next6Hours
{
[JsonPropertyName("summary")]
public Summary Summary { get; set; }
[JsonPropertyName("details")]
public Details Details { get; set; }
}
public class Properties
{
[JsonPropertyName("meta")]
public Meta Meta { get; set; }
[JsonPropertyName("timeseries")]
public List<Timeseries> Timeseries { get; set; }
}
public class YrWeatherForecastResponse
{
[JsonPropertyName("type")]
public string Type { get; set; }
[JsonPropertyName("geometry")]
public Geometry Geometry { get; set; }
[JsonPropertyName("properties")]
public Properties Properties { get; set; }
}
public class Summary
{
[JsonPropertyName("symbol_code")]
public string SymbolCode { get; set; }
}
public class Timeseries
{
[JsonPropertyName("time")]
public DateTime Time { get; set; }
[JsonPropertyName("data")]
public Data Data { get; set; }
}
public class Units
{
[JsonPropertyName("air_pressure_at_sea_level")]
public string AirPressureAtSeaLevel { get; set; }
[JsonPropertyName("air_temperature")]
public string AirTemperature { get; set; }
[JsonPropertyName("cloud_area_fraction")]
public string CloudAreaFraction { get; set; }
[JsonPropertyName("precipitation_amount")]
public string PrecipitationAmount { get; set; }
[JsonPropertyName("relative_humidity")]
public string RelativeHumidity { get; set; }
[JsonPropertyName("wind_from_direction")]
public string WindFromDirection { get; set; }
[JsonPropertyName("wind_speed")]
public string WindSpeed { get; set; }
}

View File

@@ -1,26 +1,24 @@
#nullable disable
using HomeApi.Models.Response;
namespace HomeApi.Models;
public class WeatherInformation
{
public string CityName { get; set; } = "Not defined";
public string CityName { get; set; } = string.Empty;
public Current Current { get; set; } = new();
public List<Forecast> Forecast { get; set; }
}
public class Current
{
public string Date { get; set; } = string.Empty;
public double Feelslike { get; set; } = 0;
public int IsDay { get; set; } = 1;
public string Date { get; set; }
public double Feelslike { get; set; }
public int IsDay { get; set; }
public double WindPerMeterSecond { get; set; } = 0;
public double WindGustPerMeterSecond { get; set; } = 0;
public double Temperature { get; set; } = 0;
public string LastUpdated { get; set; } = string.Empty;
public int Cloud { get; set; } = 0;
public int Cloud { get; set; }
public string WindDirection { get; set; } = string.Empty;
public Location WeatherDataLocation { get; set; } = new();
public AirQuality AirQuality { get; set; }
@@ -30,72 +28,72 @@ public class Current
public class Location
{
public string Name { get; set; } = string.Empty;
public string Region { get; set; } = string.Empty;
public string Country { get; set; } = string.Empty;
public double Lat { get; set; } = 0;
public double Lon { get; set; } = 0;
public string Name { get; set; }
public string Region { get; set; }
public string Country { get; set; }
public double Lat { get; set; }
public double Lon { get; set; }
}
public class Probability
{
public DateTime Date { get; set; } = DateTime.Now;
public CalculatedProbability Calculated { get; set; } = new();
public string Colour { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty;
public Highest HighestProbability { get; set; } = new();
public DateTime Date { get; set; }
public CalculatedProbability Calculated { get; set; } // my location?
public string Colour { get; set; }
public int Value { get; set; }
public Highest HighestProbability { get; set; }
}
public class Highest
{
public DateTime Date { get; set; } = DateTime.Now;
public string Colour { get; set; } = string.Empty;
public double Lat { get; set; } = 0;
public double Long { get; set; } = 0;
public int Value { get; set; } = 0;
public DateTime Date { get; set; }
public string Colour { get; set; }
public double Lat { get; set; }
public double Long { get; set; }
public int Value { get; set; }
}
public class Forecast
{
public string Date { get; set; } = string.Empty;
public double MinTempC { get; set; } = 0;
public double MaxTempC { get; set; } = 0;
public string DayIcon { get; set; } = string.Empty;
public WeatherSummary? Day { get; set; } = null;
public WeatherSummary? Night { get; set; } = null;
public Astro Astro { get; set; } = new();
public int IconCode { get; set; } = 0;
public string Date { get; set; }
public double MinTempC { get; set; }
public double MaxTempC { get; set; }
public string DayIcon { get; set; }
public WeatherSummary? Day { get; set; }
public WeatherSummary? Night { get; set; }
public Astro Astro { get; set; }
public int IconCode { get; set; }
public int ChanceOfRain { get; set; } = 0;
public int ChanceOfRain { get; set; }
}
public class Astro
{
public string Sunrise { get; set; } = string.Empty;
public string Sunset { get; set; } = string.Empty;
public string Moonrise { get; set; } = string.Empty;
public string Moonset { get; set; } = string.Empty;
public string Moon_Phase { get; set; } = string.Empty;
public string Sunrise { get; set; }
public string Sunset { get; set; }
public string Moonrise { get; set; }
public string Moonset { get; set; }
public string Moon_Phase { get; set; }
public double? Moon_Illumination { get; set; }
}
public class AirQuality
{
public double Co { get; set; } = 0;
public double No2 { get; set; } = 0;
public double O3 { get; set; } = 0;
public double So2 { get; set; } = 0;
public double Pm2_5 { get; set; } = 0;
public double Pm10 { get; set; } = 0;
public int Us_Epa_Index { get; set; } = 0;
public int Gb_Defra_Index { get; set; } = 0;
public double Co { get; set; }
public double No2 { get; set; }
public double O3 { get; set; }
public double So2 { get; set; }
public double Pm2_5 { get; set; }
public double Pm10 { get; set; }
public int Us_Epa_Index { get; set; }
public int Gb_Defra_Index { get; set; }
}
public class WeatherSummary
{
public string ConditionText { get; set; } = string.Empty;
public string ConditionIcon { get; set; } = string.Empty;
public double AvgTempC { get; set; } = 0;
public double AvgFeelslikeC { get; set; } = 0;
public int TotalChanceOfRain { get; set; } = 0;
public int TotalChanceOfSnow { get; set; } = 0;
public string ConditionText { get; set; }
public string ConditionIcon { get; set; }
public double AvgTempC { get; set; }
public double AvgFeelslikeC { get; set; }
public int TotalChanceOfRain { get; set; }
public int TotalChanceOfSnow { get; set; }
}

View File

@@ -1,12 +1,8 @@
using HomeApi.Registration;
using Scalar.AspNetCore;
using Serilog;
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddLogging(loggingBuilder =>
{
loggingBuilder.AddSeq(builder.Configuration.GetSection("Seq"));
});
builder.Services.AddHttpClient();
builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<Program>());
builder.Services.AddControllers();

View File

@@ -12,14 +12,6 @@
"Microsoft.AspNetCore": "Warning"
}
},
"Seq": {
"ServerUrl": "https://log.azaaxin.com",
"ApiKey": "KEY",
"MinimumLevel": "Trace",
"LevelOverride": {
"Microsoft": "Warning"
}
},
"ApiConfiguration": {
"EspConfiguration": {
"InformationBoardImageUrl": "http://192.168.101.178:5000/home/default.jpg",

View File

@@ -12,14 +12,6 @@
"Microsoft.AspNetCore": "Warning"
}
},
"Seq": {
"ServerUrl": "https://log.azaaxin.com",
"ApiKey": "KEY",
"MinimumLevel": "Trace",
"LevelOverride": {
"Microsoft": "Warning"
}
},
"ApiConfiguration": {
"EspConfiguration": {
"InformationBoardImageUrl": "http://192.168.101.178:5000/home/default.jpg",

View File

@@ -43,11 +43,8 @@
return "fa-question-circle";
}
private string GetAirQualityStatus(AirQuality? data)
private string GetAirQualityStatus(AirQuality data)
{
if(data == null)
return "No Data";
var highestAqi = Math.Max(data.Us_Epa_Index, data.Gb_Defra_Index);
return highestAqi switch
@@ -490,14 +487,12 @@
<div class="current-weather">
<div class="location">
<i class="fas fa-map-marker-alt location-icon"></i>
<span class="location-text">@(Model.Weather?.CityName ?? "Failed to fetch data")</span>
<span class="location-text">@Model.Weather.CityName</span>
</div>
<div class="current-temp">
<div class="temp-main">
@(Model.Weather?.Current.Temperature != null ? $"{Model.Weather.Current.Temperature}°C" : "N/A")
</div>
<div class="feels-like">Feels like @Model.Weather?.Current.Feelslike°C</div>
<div class="temp-main">@Model.Weather.Current.Temperature°C</div>
<div class="feels-like">Feels like @Model.Weather.Current.Feelslike°C</div>
</div>
<div class="weather-details">
@@ -506,7 +501,7 @@
<i class="fas fa-cloud cloud-icon"></i>
<span>Clouds</span>
</div>
<span class="detail-value">@Model?.Weather?.Current.Cloud%</span>
<span class="detail-value">@Model.Weather.Current.Cloud%</span>
</div>
<div class="detail-item">
@@ -514,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">
@@ -522,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">
@@ -530,21 +525,21 @@
<i class="fas fa-star aurora-icon"></i>
<span>Aurora</span>
</div>
<span class="detail-value">@Model?.Weather?.Current.AuroraProbability.Value%</span>
<span class="detail-value">@Model.Weather.Current.AuroraProbability.Value%</span>
</div>
</div>
<div class="air-quality-badge">
Air Quality: @GetAirQualityStatus(Model?.Weather?.Current.AirQuality)
Air Quality: @GetAirQualityStatus(Model.Weather.Current.AirQuality)
</div>
</div>
<!-- Middle Column - Forecast -->
<div class="forecast-section">
<h3 class="section-title">@Model?.Weather?.Forecast.Count-Day Forecast</h3>
<h3 class="section-title">@Model.Weather.Forecast.Count-Day Forecast</h3>
<div class="forecast-grid">
@foreach (var day in Model?.Weather?.Forecast ?? Enumerable.Empty<Forecast>())
@foreach (var day in Model.Weather.Forecast)
{
<div class="forecast-card">
<div class="forecast-date">@GetDayStatus(day.Date)</div>
@@ -564,7 +559,7 @@
<i class="fas fa-sun sunrise-icon"></i>
<span>Sunrise</span>
</div>
<span class="sun-moon-value">@Model?.Weather?.Forecast[0].Astro.Sunrise</span>
<span class="sun-moon-value">@Model.Weather.Forecast[0].Astro.Sunrise</span>
</div>
<div class="sun-moon-item">
@@ -572,7 +567,7 @@
<i class="fas fa-sun sunset-icon"></i>
<span>Sunset</span>
</div>
<span class="sun-moon-value">@Model?.Weather?.Forecast[0].Astro.Sunset</span>
<span class="sun-moon-value">@Model.Weather.Forecast[0].Astro.Sunset</span>
</div>
<div class="sun-moon-item">
@@ -580,7 +575,7 @@
<i class="fas fa-moon moon-icon"></i>
<span>Moonrise</span>
</div>
<span class="sun-moon-value">@Model?.Weather?.Forecast[0].Astro.Moonrise</span>
<span class="sun-moon-value">@Model.Weather.Forecast[0].Astro.Moonrise</span>
</div>
<div class="sun-moon-item">
@@ -588,12 +583,12 @@
<i class="fas fa-moon moon-icon"></i>
<span>Moonset</span>
</div>
<span class="sun-moon-value">@Model?.Weather?.Forecast[0].Astro.Moonset</span>
<span class="sun-moon-value">@Model.Weather.Forecast[0].Astro.Moonset</span>
</div>
<div class="sun-moon-item">
<span class="moon-phase-label">Moon phase</span>
<span class="sun-moon-value">@Model?.Weather?.Forecast[0].Astro.Moon_Illumination%</span>
<span class="sun-moon-value">@Model.Weather.Forecast[0].Astro.Moon_Illumination%</span>
</div>
</div>
</div>
@@ -603,7 +598,7 @@
<h3 class="section-title">Upcoming Departures</h3>
<div class="transport-list">
@foreach (var transport in Model?.TimeTable?.Take(5) ?? Enumerable.Empty<TimeTable>())
@foreach (var transport in Model.TimeTable.Take(5))
{
var departureTime = DateTime.Parse(transport.DepartureTime);

3
Program.cs Normal file
View File

@@ -0,0 +1,3 @@
// See https://aka.ms/new-console-template for more information
Console.WriteLine("Hello, World!");

146
README.md
View File

@@ -1,145 +1 @@
[![myxelium - Wireless_Eink_HomeScreen](https://img.shields.io/static/v1?label=myxelium&message=Wireless_Eink_HomeScreen&color=purple&logo=github)](https://github.com/myxelium/Wireless_Eink_HomeScreen "Go to GitHub repo")
[![stars - Wireless_Eink_HomeScreen](https://img.shields.io/github/stars/myxelium/Wireless_Eink_HomeScreen?style=social)](https://github.com/myxelium/Wireless_Eink_HomeScreen)
[![forks - Wireless_Eink_HomeScreen](https://img.shields.io/github/forks/myxelium/Wireless_Eink_HomeScreen?style=social)](https://github.com/myxelium/Wireless_Eink_HomeScreen)
[![GitHub tag](https://img.shields.io/github/tag/myxelium/Wireless_Eink_HomeScreen?include_prereleases=&sort=semver&color=purple)](https://github.com/myxelium/Wireless_Eink_HomeScreen/releases/)
[![License](https://img.shields.io/badge/License-GPL-purple)](https://www.gnu.org/licenses/gpl-3.0.en.html)
[![issues - Wireless_Eink_HomeScreen](https://img.shields.io/github/issues/myxelium/Wireless_Eink_HomeScreen)](https://github.com/myxelium/Wireless_Eink_HomeScreen/issues)
[![Build and Deploy](https://github.com/Myxelium/Wireless_Eink_HomeScreen/actions/workflows/build.yml/badge.svg)](https://github.com/Myxelium/Wireless_Eink_HomeScreen/actions/workflows/build.yml)
# What why how
This is a project I created that pulls weather data from the internet, transforms it into custom images, and displays them on an e-ink screen powered by an ESP32.
## What This Project Does
I wanted a low-power way to see weather information at a glance, so I built this system that:
- Fetches real-time weather data from online APIs
- Processes and converts the data into visual images (temperature graphs, forecast icons, etc.)
- Sends these images wirelessly to an ESP32 microcontroller
- Displays the information on an energy-efficient e-ink screen
- Updates periodically while consuming minimal power
<img width="800" height="480" alt="image" src="https://github.com/user-attachments/assets/ef5af0c6-ea3a-494d-b2af-3de6e70b3e6a" />
# How do I get to use this without programming knowledge?
Check in the wiki for the guide how to get everything working!
### 😺 [Wiki Get Started Guide](https://github.com/Myxelium/Wireless_Eink_HomeScreen/wiki/)
## Git Notes
All commits has to follow this [Conventional Commits style](https://www.conventionalcommits.org/) to pass the pipeline.
## Features 😺
- Display current weather data
- Display public transport information
- Display time and date
## Requirements 🫥
- [ESP32 board](https://www.waveshare.com/wiki/E-Paper_ESP32_Driver_Board)
- [E-ink display (e.g. Waveshare 7.5 inch)](https://www.waveshare.com/7.5inch-e-paper-hat.htm)
# 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 Http 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
```
# ESP32 configuration and building
<img width="4096" height="1842" alt="image" src="https://github.com/user-attachments/assets/5acf1b3b-f9bb-48bd-b310-a2852544eaba" />
Best way of getting the ESP32 ready for code upload is to follow this guide [WAVESHARE ESP32 GUIDE](https://web.archive.org/web/20250706150325/https://www.waveshare.com/wiki/E-Paper_ESP32_Driver_Board).
Once you have it ready so you can upload code to it copy my code in: Esp32_Code/INFOSCREEN_WITH_INTERVAL from this repo.
Install following libraries (if more is needed search for them and install them too):
* ArduinoJson
* GUI_Paint
* JPEGDEC
You need the Waveshare examples installed since it uses code from them download them here [Download](https://files.waveshare.com/upload/5/50/E-Paper_ESP32_Driver_Board_Code.7z) or check above link.
E-ink solar panel screen showing info, this is the api for it. Low effort code

View File

@@ -1,15 +1,13 @@
version: '3.8'
services:
services:
homeapi:
image: homeapi
build:
context: .
dockerfile: Dockerfile
homeapi-1:
image: homeapi-1
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