some minor cleanups #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
gotta start somewhere |
|
Super awesome! I'm on a plane flight today but will merge tomorrow and
bless you as a contributor for GitHub.
(Sent from a phone - please ignore typos)
…On Thu, Feb 27, 2020, 21:49 Girts ***@***.***> wrote:
gotta start somewhere
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<https://github.com/geeksville/Meshtastic-esp32/pull/6?email_source=notifications&email_token=AABXB2O4S53HF4E2H6OTSETRFCQUZA5CNFSM4K5JQTTKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOENHCYKY#issuecomment-592325675>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AABXB2MWFR3TYMTBZTCYHUDRFCQUZANCNFSM4K5JQTTA>
.
|
|
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.
girtsf
force-pushed
the
fix-some-warnings
branch
from
e5f20db to
0b8d776
Compare
geeksville
reviewed
Feb 29, 2020
| @@ -21,8 +21,8 @@ framework = arduino | |||
| board_build.partitions = partition-table.csv | |||
|
|
|||
| ; 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 | |||
geeksville
reviewed
Feb 29, 2020
| 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 |
There was a problem hiding this comment.
just curious - why did you need to use the numeric versions here?
There was a problem hiding this comment.
There are multiple libraries with the same name. If you don't specify one by number, it spits out these warnings:
(I wish they had a nicer syntax, e.g., OneButton#1260 or something)
geeksville
approved these changes
Feb 29, 2020
|
ah - thanks!
…On Sat, Feb 29, 2020 at 9:48 AM Girts ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In platformio.ini
<#6 (comment)>
:
> https://github.com/geeksville/esp8266-oled-ssd1306.git ; ESP8266_SSD1306
AXP202X_Library
SPI
- 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
There are multiple libraries with the same name. If you don't specify one
by number, it spits out these warnings:
[image: image]
<https://user-images.githubusercontent.com/260191/75612463-7a544400-5ad8-11ea-96c8-27845f058956.png>
(I wish they had a nicer syntax, e.g., OneButton#1260 or something)
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#6>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AABXB2K7OINBF54WWII4CRTRFFE6JANCNFSM4K5JQTTA>
.
|
mc-hamster
added a commit
that referenced
this pull request
Sep 20, 2020
Pulling from meshtastic dev-wifi to my work area
Merged
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 <[email protected]>
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
explicitly picking the libraries by id that we want.
shows up in the CI builds?
Tested:
pio runbuilds.