diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b103b3d0..0e47212a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,8 @@ on: pull_request: push: branches: - - master - - build-workflow + - master + - build-workflow workflow_dispatch: jobs: @@ -16,16 +16,47 @@ jobs: os: [ubuntu-latest] # os: [ubuntu-latest, windows-latest, macos-latest] include: - - os: ubuntu-latest - path: ~/.cache/pip - platformio-path: ~/.platformio - - os: macos-latest - path: ~/Library/Caches/pip - platformio-path: ~/Library/Caches/platformio - - os: windows-latest - path: ~\AppData\Local\pip\Cache - platformio-path: ~\AppData\Local\platformio\Cache - board: [heltecv2.h,heltecv21.h,ttgov21new.h] + - os: ubuntu-latest + path: ~/.cache/pip + platformio-path: ~/.platformio + # - os: macos-latest + # path: ~/Library/Caches/pip + # platformio-path: ~/Library/Caches/platformio + # - os: windows-latest + # path: ~\AppData\Local\pip\Cache + # platformio-path: ~\AppData\Local\platformio\Cache + board: + [ + generic.h, + ebox.h, + eboxtube.h, + ecopower.h, + heltec.h, + heltecv2.h, + heltecv21.h, + ttgov1.h, + ttgov2.h, + ttgov21old.httgov21new.h, + ttgofox.h, + ttgobeam.h, + ttgobeam10.h, + ttgotdisplay.h, + ttgotwristband.h, + fipy.h, + lopy.h, + lopy4.h, + lolin32litelora.h, + lolin32lora.h, + lolin32lite.h, + wemos32oled.h, + wemos32matrix.h, + octopus32.h, + tinypico.h, + tinypicomatrix.h, + m5core.h, + m5fire.h, + olimexpoeiso.h, + ] runs-on: ${{ matrix.os }} steps: diff --git a/build.py b/build.py index 5d5e4cb2..e6bd6b50 100644 --- a/build.py +++ b/build.py @@ -107,10 +107,10 @@ env.Replace(PAXEXPRESS_API_TOKEN=apitoken) # get runtime credentials and put them to compiler directive env.Append(BUILD_FLAGS=[ - u'-DWIFI_SSID=\\"' + mykeys["OTA_WIFI_SSID"] + '\\"', - u'-DWIFI_PASS=\\"' + mykeys["OTA_WIFI_PASS"] + '\\"', - u'-DPAXEXPRESS_USER=\\"' + mykeys["PAXEXPRESS_USER"] + '\\"', - u'-DPAXEXPRESS_REPO=\\"' + mykeys["PAXEXPRESS_REPO"] + '\\"', + u'-DWIFI_SSID=\\"' + mykeys["OTA_WIFI_SSID"] + '\\"', + u'-DWIFI_PASS=\\"' + mykeys["OTA_WIFI_PASS"] + '\\"', + u'-DPAXEXPRESS_USER=\\"' + mykeys["PAXEXPRESS_USER"] + '\\"', + u'-DPAXEXPRESS_REPO=\\"' + mykeys["PAXEXPRESS_REPO"] + '\\"', u'-DPAXEXPRESS_PACKAGE=\\"' + package + '\\"', u'-DARDUINO_LMIC_PROJECT_CONFIG_H=' + lmicconfig, u'-I \"' + srcdir + '\"' @@ -136,7 +136,7 @@ def publish_paxexpress(source, target, env): } r = None - + try: r = requests.put(url, data=open(firmware_path, "rb"), diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf index 5249a6f0..ce9a42c3 100644 --- a/src/paxcounter_orig.conf +++ b/src/paxcounter_orig.conf @@ -97,7 +97,7 @@ #define RCMDPORT 2 // remote commands #define STATUSPORT 2 // remote command results #define CONFIGPORT 3 // config query results -#define GPSPORT 4 // gps - NOTE: set to 1 to send combined GPS+COUNTERPORT payload +#define GPSPORT 4 // gps - NOTE: set to 1 to send combined GPS+COUNTERPORT payload #define BUTTONPORT 5 // button pressed signal #define RESERVEDPORT 6 // reserved (unused) #define BMEPORT 7 // BME680 sensor @@ -126,4 +126,4 @@ #define MQTT_PASSWD "public" #define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds #define MQTT_KEEPALIVE 10 // keep alive interval in seconds -//#define MQTT_CLIENTNAME "my_paxcounter" // generated by default +//#define MQTT_CLIENTNAME "my_paxcounter" // generated by default \ No newline at end of file