Skip to content

Fix listener automatic builds #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jocke4f merged 7 commits into from
Apr 18, 2025
Merged

Fix listener automatic builds #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a87e64
Changed actions/upload-artifact
Jocke4f Jan 31, 2025
5c3162a
Changed actions/upload-artifact
Jocke4f Jan 31, 2025
5c522c4
Build Atom fixes
Jocke4f Jan 31, 2025
d56bd3a
Renamed WiFiEvents
Jocke4f Jan 31, 2025
1252ec2
Updated m5stick-c building
Jocke4f Jan 31, 2025
b0ce21a
Updated m5stikc-c build
Jocke4f Jan 31, 2025
ffbe6a9
Update build-listener-clients.yaml
Jocke4f Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build-listener-clients.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
platforms: |
- name: esp32:esp32
source-url: https://dl.espressif.com/dl/package_esp32_index.json
fqbn: 'esp32:esp32:m5stick-c'
fqbn: 'esp32:esp32:m5stack_stickc'
libraries: |
- source-url: https://github.com/m5stack/M5StickC/archive/refs/tags/0.2.9.zip
- source-url: https://github.com/m5stack/M5StickC/archive/refs/tags/0.3.0.zip
- source-url: https://github.com/m5stack/M5StickC-Plus/archive/refs/tags/0.1.0.zip
- name: WebSockets
- name: WiFiManager
Expand All @@ -36,10 +36,10 @@ jobs:
- listener_clients/m5stickc-listener
enable-deltas-report: true
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: 'TallyArbiter-Listener-M5StickC'
path: 'listener_clients/m5stickc-listener/build/esp32.esp32.m5stick-c'
path: 'listener_clients/m5stickc-listener/build/esp32.esp32.m5stack_stickc'

build_m5atom-listener:
name: Build M5Atom Listener
Expand All @@ -51,9 +51,9 @@ jobs:
platforms: |
- name: esp32:esp32
source-url: https://dl.espressif.com/dl/package_esp32_index.json
fqbn: 'esp32:esp32:m5stack-atom'
fqbn: 'esp32:esp32:m5stack_atom'
libraries: |
- source-url: https://github.com/m5stack/M5Atom/archive/refs/tags/0.1.2.zip
- source-url: https://github.com/m5stack/M5Atom/archive/refs/tags/0.1.3.zip
- name: WebSockets
- name: WiFiManager
- name: MultiButton
Expand All @@ -65,10 +65,10 @@ jobs:
- listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom
enable-deltas-report: true
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: 'TallyArbiter-Listener-M5Atom'
path: 'listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom/build/esp32.esp32.m5stack-atom'
path: 'listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom/build/esp32.esp32.m5stack_atom'

build_esp32-neopixel-listener:
name: Build ESP32 NeoPixel Listener
Expand All @@ -93,7 +93,7 @@ jobs:
- listener_clients/esp32-neopixel-listener
enable-deltas-report: true
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: 'TallyArbiter-Listener-ESP32-NeoPixel'
path: 'listener_clients/esp32-neopixel-listener/build/esp32.esp32.esp32'
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
FQBN_REPLACED=$(echo $RAW_FQBN | sed 's/:/./g')
echo "FQBN_REPLACED=$FQBN_REPLACED" >> $GITHUB_ENV
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: 'TallyArbiter-Listener-${{ matrix.board.name }}'
path: 'listener_clients/TTGO_T-listener/build/${{ env.FQBN_REPLACED }}'
Expand Down
6 changes: 3 additions & 3 deletions listener_clients/TTGO_T-listener/TTGO_T-listener.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Modify User_Setup_Select.h in libraryY TFT_eSPI
#include <WiFi.h>
#include <WebSocketsClient.h>
#include <SocketIOclient.h>
#include <WiFiManager.h>
#include <TFT_eSPI.h>
#include <Arduino_JSON.h>
#include <PinButton.h>
#include <SPI.h>
#include <Arduino.h>
#include <WiFiManager.h>
#include <ArduinoOTA.h>
#include <ESPmDNS.h>
#include <Preferences.h>
Expand Down Expand Up @@ -277,12 +277,12 @@ void saveParamCallback() {

void WiFiEvent(WiFiEvent_t event) {
switch (event) {
case SYSTEM_EVENT_STA_GOT_IP:
case IP_EVENT_STA_GOT_IP:
logger("Network connected!", "info");
logger(WiFi.localIP().toString(), "info");
networkConnected = true;
break;
case SYSTEM_EVENT_STA_DISCONNECTED:
case WIFI_EVENT_STA_DISCONNECTED:
tft.setCursor(0, 0);
tft.fillScreen(TFT_BLACK);
tft.setTextSize(2);
Expand Down
4 changes: 2 additions & 2 deletions listener_clients/esp32-neopixel-listener/esp32-neopixel-listener.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,12 @@ void saveParamCallback() {

void WiFiEvent(WiFiEvent_t event) {
switch (event) {
case SYSTEM_EVENT_STA_GOT_IP:
case IP_EVENT_STA_GOT_IP:
logger("Network connected!", "info");
logger(WiFi.localIP().toString(), "info");
networkConnected = true;
break;
case SYSTEM_EVENT_STA_DISCONNECTED:
case WIFI_EVENT_STA_DISCONNECTED:
logger("Network connection lost!", "info");
networkConnected = false;
break;
Expand Down
Loading