Firmware 2.2.1(4)

.github/workflows/build-ci.yml

@@ -40,11 +40,19 @@ jobs:
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20' # Or any recent LTS version
+
+      - name: Install html-minifier-terser
+        run: npm install html-minifier-terser
+
       - name: Build PlatformIO Project
-        run: pio run --environment d1_mini
+        run: pio run --environment os3x_esp8266
 
       - name: Move and rename firmware
-        run: mv .pio/build/d1_mini/firmware.bin ./firmware_os_esp8266.bin
+        run: mv .pio/build/os3x_esp8266/firmware.bin ./firmware_os_esp8266.bin
 
       - name: Upload firmware
         uses: actions/upload-artifact@v4
@@ -63,6 +71,9 @@ jobs:
       - name: Build Script
         run: sudo ./build.sh -s demo
 
+      - name: Build Script
+        run: sudo ./build.sh -s demo
+
   build-docker:
     name: Build Docker
     runs-on: ubuntu-latest
@@ -153,11 +164,6 @@ jobs:
           name: firmware
           path: ./firmware
 
-      - name: Add firmware to release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: firmware/*
-
   release-docker:
     name: Release Docker
     runs-on: ubuntu-latest

.gitignore

@@ -10,3 +10,8 @@ build-1284/*
 !build.sh
 !startOpenSprinkler.sh
 !updater.sh
+*.bak
+node_modules
+*.json
+!package.json
+.DS_Store

Dockerfile

@@ -1,13 +1,29 @@
 FROM debian:bookworm-slim AS base
 
+# Set up prerequisites for adding the RPi repository
+# We need ca-certificates, curl/gnupg to add the key, and lsb-release to get the Debian version name (e.g., "bookworm")
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gnupg \
+    lsb-release \
+ && rm -rf /var/lib/apt/lists/*
+
+# Add the Raspberry Pi repository GPG key
+RUN curl -fsSL "https://archive.raspberrypi.org/debian/raspberrypi.gpg.key" | gpg --dearmor -o /usr/share/keyrings/raspberrypi-archive-keyring.gpg
+
+# Add the Raspberry Pi repository to sources
+RUN echo "deb [signed-by=/usr/share/keyrings/raspberrypi-archive-keyring.gpg] https://archive.raspberrypi.org/debian/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/raspberrypi.list > /dev/null
+
 ########################################
 ## 1st stage compiles OpenSprinkler code
 FROM base AS os-build
 
-ARG BUILD_VERSION="OSPI"
+ARG BUILD_VERSION="DEMO"
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y bash g++ make libmosquittopp-dev libssl-dev libi2c-dev libgpiod-dev libgpiod2 gpiod
+RUN apt-get update && apt-get install -y bash g++ make libmosquittopp-dev libssl-dev libi2c-dev liblgpio-dev
 RUN rm -rf /var/lib/apt/lists/*
 COPY . /OpenSprinkler
 WORKDIR /OpenSprinkler
@@ -19,8 +35,12 @@ RUN make VERSION=${BUILD_VERSION}
 FROM base
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y libstdc++6 libmosquittopp1 libi2c0 libgpiod2
-RUN rm -rf /var/lib/apt/lists/* 
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libstdc++6 \
+    libmosquittopp1 \
+    libi2c0 \
+    liblgpio-dev \
+ && rm -rf /var/lib/apt/lists/*
 RUN mkdir /OpenSprinkler
 RUN mkdir -p /data/logs
 
@@ -35,3 +55,4 @@ EXPOSE 8080
 
 #-- By default, start OS using /data for saving data/NVM/log files
 CMD [ "/OpenSprinkler/OpenSprinkler", "-d", "/data" ]
+

Makefile

@@ -3,7 +3,7 @@ CXX=g++
 VERSION?=OSPI
 CXXFLAGS=-std=gnu++14 -D$(VERSION) -DSMTP_OPENSSL -Wall -include string.h -include cstdint -Iexternal/TinyWebsockets/tiny_websockets_lib/include -Iexternal/OpenThings-Framework-Firmware-Library/
 LD=$(CXX)
-LIBS=pthread mosquitto ssl crypto i2c gpiod
+LIBS=pthread mosquitto ssl crypto i2c lgpio
 LDFLAGS=$(addprefix -l,$(LIBS))
 BINARY=OpenSprinkler
 SOURCES=main.cpp OpenSprinkler.cpp notifier.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp mqtt.cpp smtp.c RCSwitch.cpp $(wildcard external/TinyWebsockets/tiny_websockets_lib/src/*.cpp) $(wildcard external/OpenThings-Framework-Firmware-Library/*.cpp)