Skip to content
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

PIO_ENV #5239

Merged
merged 6 commits into from
Nov 4, 2024
Merged

PIO_ENV #5239

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f037ae2
add hw_env to packet
caveman99 Nov 3, 2024
03049f2
rename to pio_env
caveman99 Nov 3, 2024
a4f676c
Merge branch 'master' into hw-env
thebentern Nov 3, 2024
dca73fe
Merge branch 'master' into hw-env
thebentern Nov 4, 2024
bf45401
Move to mynodeinfo
thebentern Nov 4, 2024
38f4755
Includy doody
thebentern Nov 4, 2024
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
3 changes: 2 additions & 1 deletion bin/platformio-custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,13 @@ def esp32_create_combined_bin(source, target, env):

prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
verObj = readProps(prefsLoc)
print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"])
print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))

# General options that are passed to the C and C++ compilers
projenv.Append(
CCFLAGS=[
"-DAPP_VERSION=" + verObj["long"],
"-DAPP_VERSION_SHORT=" + verObj["short"],
"-DAPP_ENV=" + env.get("PIOENV"),
]
)
1 change: 1 addition & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
#if !(MESHTASTIC_EXCLUDE_PKI)
deviceMetadata.hasPKC = true;
#endif
strncpy(deviceMetadata.pio_env, optstr(APP_ENV), sizeof(deviceMetadata.pio_env));
return deviceMetadata;
}
#ifndef PIO_UNIT_TESTING
Expand Down
Loading