remvoed whitespaces, added all boards to workflow
This commit is contained in:
parent
fe156d006d
commit
0267e09ff8
55
.github/workflows/build.yml
vendored
55
.github/workflows/build.yml
vendored
@ -4,8 +4,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- build-workflow
|
- build-workflow
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@ -16,16 +16,47 @@ jobs:
|
|||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
# os: [ubuntu-latest, windows-latest, macos-latest]
|
# os: [ubuntu-latest, windows-latest, macos-latest]
|
||||||
include:
|
include:
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
path: ~/.cache/pip
|
path: ~/.cache/pip
|
||||||
platformio-path: ~/.platformio
|
platformio-path: ~/.platformio
|
||||||
- os: macos-latest
|
# - os: macos-latest
|
||||||
path: ~/Library/Caches/pip
|
# path: ~/Library/Caches/pip
|
||||||
platformio-path: ~/Library/Caches/platformio
|
# platformio-path: ~/Library/Caches/platformio
|
||||||
- os: windows-latest
|
# - os: windows-latest
|
||||||
path: ~\AppData\Local\pip\Cache
|
# path: ~\AppData\Local\pip\Cache
|
||||||
platformio-path: ~\AppData\Local\platformio\Cache
|
# platformio-path: ~\AppData\Local\platformio\Cache
|
||||||
board: [heltecv2.h,heltecv21.h,ttgov21new.h]
|
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 }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
10
build.py
10
build.py
@ -107,10 +107,10 @@ env.Replace(PAXEXPRESS_API_TOKEN=apitoken)
|
|||||||
|
|
||||||
# get runtime credentials and put them to compiler directive
|
# get runtime credentials and put them to compiler directive
|
||||||
env.Append(BUILD_FLAGS=[
|
env.Append(BUILD_FLAGS=[
|
||||||
u'-DWIFI_SSID=\\"' + mykeys["OTA_WIFI_SSID"] + '\\"',
|
u'-DWIFI_SSID=\\"' + mykeys["OTA_WIFI_SSID"] + '\\"',
|
||||||
u'-DWIFI_PASS=\\"' + mykeys["OTA_WIFI_PASS"] + '\\"',
|
u'-DWIFI_PASS=\\"' + mykeys["OTA_WIFI_PASS"] + '\\"',
|
||||||
u'-DPAXEXPRESS_USER=\\"' + mykeys["PAXEXPRESS_USER"] + '\\"',
|
u'-DPAXEXPRESS_USER=\\"' + mykeys["PAXEXPRESS_USER"] + '\\"',
|
||||||
u'-DPAXEXPRESS_REPO=\\"' + mykeys["PAXEXPRESS_REPO"] + '\\"',
|
u'-DPAXEXPRESS_REPO=\\"' + mykeys["PAXEXPRESS_REPO"] + '\\"',
|
||||||
u'-DPAXEXPRESS_PACKAGE=\\"' + package + '\\"',
|
u'-DPAXEXPRESS_PACKAGE=\\"' + package + '\\"',
|
||||||
u'-DARDUINO_LMIC_PROJECT_CONFIG_H=' + lmicconfig,
|
u'-DARDUINO_LMIC_PROJECT_CONFIG_H=' + lmicconfig,
|
||||||
u'-I \"' + srcdir + '\"'
|
u'-I \"' + srcdir + '\"'
|
||||||
@ -136,7 +136,7 @@ def publish_paxexpress(source, target, env):
|
|||||||
}
|
}
|
||||||
|
|
||||||
r = None
|
r = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
r = requests.put(url,
|
r = requests.put(url,
|
||||||
data=open(firmware_path, "rb"),
|
data=open(firmware_path, "rb"),
|
||||||
|
@ -97,7 +97,7 @@
|
|||||||
#define RCMDPORT 2 // remote commands
|
#define RCMDPORT 2 // remote commands
|
||||||
#define STATUSPORT 2 // remote command results
|
#define STATUSPORT 2 // remote command results
|
||||||
#define CONFIGPORT 3 // config query 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 BUTTONPORT 5 // button pressed signal
|
||||||
#define RESERVEDPORT 6 // reserved (unused)
|
#define RESERVEDPORT 6 // reserved (unused)
|
||||||
#define BMEPORT 7 // BME680 sensor
|
#define BMEPORT 7 // BME680 sensor
|
||||||
@ -126,4 +126,4 @@
|
|||||||
#define MQTT_PASSWD "public"
|
#define MQTT_PASSWD "public"
|
||||||
#define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds
|
#define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds
|
||||||
#define MQTT_KEEPALIVE 10 // keep alive interval in 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
|
Loading…
Reference in New Issue
Block a user