Skip to content

Commit

Permalink
Update from uptream (#10)
Browse files Browse the repository at this point in the history
* sed doesn't like newlines (meshtastic#4847)

* sed doesn't like newlines

* fold remove-debug-flags block

* PATH is a system env var

* Runners don't like rm -f ${workspace path}

* chomp trailing newline (meshtastic#4848)

* Fix Ublox M10 Setup (meshtastic#4842)

There is no EXTINT pin available on the Tdeck, which uses
the Ublox M10 GPS. Therefore our previous hack to use that pin
makes the GPS not work. That workaround was implemented to
fix sleep issues which have now since been fixed with the
state machine.

This patch restores the state prior to the hack, which is
known-working.

Additionaly, it was discovered that M10s hate it when you
try and save to non-extistent eeprom/SPI flash.

This patch creates a new SAVE command for the M10 that fixes
this issue.

Many thanks to @MisterC925 whose report and testing was
essential for this fix.

fixes meshtastic#4625

Co-authored-by: Ken McGuire <[email protected]>

* Remove old comments from main (meshtastic#4849)

These comments were circa 4 years old. Remove them.

* Try v3

* Don't run checks on workflow_dispatch

* Remove native and add v4 back

* Don't wait for after-checks

* Remove amd64

* Ony run on test runner label

* Got the runner labels backwards

* Setup python

* [create-pull-request] automated change (meshtastic#4858)

Co-authored-by: thebentern <[email protected]>

* pip3

* pipx

* No args

* Update tests.yml

* Pipargs

* PIO script

* Setup node

* Consolidate commands

* Who chose that ridiculous name anyway?!

* Checkout should handle this but oh well

* Bin path

* Meshtestic submodule update

* master ref

* Actual ref

* python3 ref

* Put this back

* fix meshtastic#4844 (meshtastic#4859)

* Also put this back

---------

Co-authored-by: Jason Murray <[email protected]>
Co-authored-by: Tom Fifield <[email protected]>
Co-authored-by: Ken McGuire <[email protected]>
Co-authored-by: Ben Meadors <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: thebentern <[email protected]>
Co-authored-by: Thomas Göttgens <[email protected]>
  • Loading branch information
8 people authored Sep 25, 2024
1 parent 295a307 commit 2f7a159
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 17 deletions.
43 changes: 29 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,50 @@ jobs:
reporter: java-junit

hardware-tests:
runs-on: ubuntu-latest
runs-on: test-runner
steps:
- name: Checkout code
uses: actions/checkout@v4

# - uses: actions/setup-python@v5
# with:
# python-version: '3.10'

# pipx install "setuptools<72"
- name: Upgrade python tools
shell: bash
run: |
python3 -m pip install --upgrade pip
pip install -U --no-build-isolation --no-cache-dir "setuptools<72"
pip install -U platformio adafruit-nrfutil --no-build-isolation
pip install -U poetry --no-build-isolation
pip install -U meshtastic --pre --no-build-isolation
pipx install adafruit-nrfutil
pipx install poetry
pipx install meshtastic --pip-args=--pre
- name: Install PlatformIO from script
shell: bash
run: |
curl -fsSL -o get-platformio.py https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py
python3 get-platformio.py
- name: Upgrade platformio
shell: bash
run: |
export PATH=$PATH:$HOME/.local/bin
pio upgrade
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18

- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: latest

- name: Install Dependencies
run: pnpm install

- name: Setup devices
run: pnpm run setup

- name: Execute end to end tests on connected hardware
run: pnpm run test
- name: Install dependencies, setup devices and run
shell: bash
run: |
git submodule update --init --recursive
cd meshtestic/
pnpm install
pnpm run setup
pnpm run test
2 changes: 1 addition & 1 deletion meshtestic
8 changes: 7 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,13 @@ void setup()
buttonThread = new ButtonThread();
#endif

playStartMelody();
// only play start melody when role is not tracker or sensor
if (config.power.is_power_saving == true && (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR))
LOG_DEBUG("Tracker/Sensor: Skipping start melody\n");
else
playStartMelody();

// fixed screen override?
if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[VERSION]
major = 2
minor = 5
build = 2
build = 3

0 comments on commit 2f7a159

Please sign in to comment.