Skip to content

some minor cleanups#6

Merged
geeksville merged 1 commit into
meshtastic:masterfrom
girtsf:fix-some-warnings
Feb 29, 2020
Merged

some minor cleanups#6
geeksville merged 1 commit into
meshtastic:masterfrom
girtsf:fix-some-warnings

Conversation

@girtsf

@girtsf girtsf commented Feb 28, 2020

Copy link
Copy Markdown
Contributor
  • Suppress warnings about conflicting library names in platformio.ini by
    explicitly picking the libraries by id that we want.
  • fix unused static function warning by making it not static ;)
  • hopefully fix the broken platformio dependency detection for fsm that
    shows up in the CI builds?

Tested: pio run builds.

@girtsf

girtsf commented Feb 28, 2020

Copy link
Copy Markdown
Contributor Author

gotta start somewhere

@geeksville

geeksville commented Feb 28, 2020 via email

Copy link
Copy Markdown
Member

@geeksville geeksville self-assigned this Feb 28, 2020
@geeksville

Copy link
Copy Markdown
Member

ooh yah - I'm so excited that this might fix https://github.com/geeksville/Meshtastic-esp32/blob/master/.github/workflows/main.yml CI builds.

* Suppress warnings about conflicting library names in platformio.ini by
  explicitly picking the libraries by id that we want.
* fix unused static function warning by making it not static ;)
* declare arduino-fsm as dependency for BluetoothOTA. Hopefully this
  fixes the CI builds?

Tested: `pio run` builds.
Comment thread platformio.ini
; note: we add src to our include search path so that lmic_project_config can override
; FIXME fix dependencies on arduino-fsm
build_flags = -Wall -Wextra -Wno-missing-field-initializers -I.pio/libdeps/esp32/arduino-fsm -Isrc -Os -Wl,-Map,.pio/build/esp32/output.map -DAXP_DEBUG_PORT=Serial
; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yay!

Comment thread platformio.ini
OneButton
CRC32 ; explicitly needed because dependency is missing in the ble ota update lib
1260 ; OneButton
1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious - why did you need to use the numeric versions here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple libraries with the same name. If you don't specify one by number, it spits out these warnings:

image

(I wish they had a nicer syntax, e.g., OneButton#1260 or something)

@geeksville geeksville merged commit 57d5a54 into meshtastic:master Feb 29, 2020
@geeksville

geeksville commented Mar 1, 2020 via email

Copy link
Copy Markdown
Member

mc-hamster added a commit that referenced this pull request Sep 20, 2020
Pulling from meshtastic dev-wifi to my work area
@GUVWAF GUVWAF mentioned this pull request Apr 20, 2023
thebentern added a commit that referenced this pull request Nov 5, 2023
* INA3221 / Power Telemetry Variant Implementation
	modified:   platformio.ini
	modified:   src/configuration.h
	modified:   src/detect/ScanI2C.h
	modified:   src/detect/ScanI2CTwoWire.cpp
	modified:   src/main.cpp
	modified:   src/modules/Modules.cpp
	new file:   src/modules/Telemetry/PowerTelemetry.cpp
	new file:   src/modules/Telemetry/PowerTelemetry.h
	new file:   src/modules/Telemetry/Sensor/INA3221Sensor.cpp
	new file:   src/modules/Telemetry/Sensor/INA3221Sensor.h
	modified:   src/mqtt/MQTT.cpp

* ifdef for portduino / linux native
	modified:   src/modules/Telemetry/PowerTelemetry.cpp

* try #2
	modified:   src/modules/Modules.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	deleted:    variants/xiao_ble/1.0.0/libraries/SPI/SPI.cpp

* try #3
	modified:   src/modules/Modules.cpp

* try #4
	modified:   src/modules/Telemetry/PowerTelemetry.cpp

* try #5?
	modified:   src/modules/Telemetry/PowerTelemetry.cpp

* try #6
	modified:   src/modules/Telemetry/PowerTelemetry.cpp

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
h3lix1 referenced this pull request in h3lix1/mesh-firmware-sunl Sep 23, 2025
krisclarkdev added a commit to krisclarkdev/firmware that referenced this pull request Dec 24, 2025
Reverting meshtastic#6 (PhoneAPIModule) due to concerns about behavioral changes.
Keeping meshtastic#8 (ESP-IDF deprecation comment fix) which is safe.
Jorropo pushed a commit to Jorropo/firmware that referenced this pull request Jan 4, 2026
use array of accepted modes per region
Prondtoo pushed a commit to Prondtoo/meshtastic_fw that referenced this pull request Jan 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants