Repository navigation
Fix Heltec Mesh Solar companion build: undef NONE macro from meshsolar logger - #3510
Open
marcelverdult wants to merge 1 commit into
Open
marcelverdult wants to merge 1 commit into
marcelverdult wants to merge 1 commit into
Conversation
Blake-Latchford
approved these changes
Sep 27, 2026
Blake-Latchford
left a comment
Blake-Latchford
left a comment
Contributor
There was a problem hiding this comment.
I'm not sure which compiler this project uses, but I think this is why c++ introduced enum classes (also called scooped enums) .
https://en.cppreference.com/cpp/language/enum
marcelverdult
force-pushed
the
fix/mesh-solar-none-macro
branch
from
October 19, 2026 16:52
83f4dc5 to
a6e8dec
Compare
marcelverdult
added a commit
to marcelverdult/MeshCore_Refactor
that referenced
this pull request
Oct 19, 2026
…proposal This reverts the merge of fix/interface-type-none-macro-clash (2119cc8). Both fixes for the meshsolar NONE macro collision work; this one is withdrawn because the other one is already proposed upstream as meshcore-dev#3510 and the fork should not carry a second, different solution for the same defect. Measured before the swap, with the toolchain of the build environment action: the rename built 29 environments, all 29 building; the upstream proposal builds all five Heltec_mesh_solar environments, including companion_radio_usb and companion_radio_ble, which do not build without either fix. The rename is referenced in exactly one place, the default initializer in src/helpers/MultiSerialInterface.h, so nothing else depends on it. What the rename did better, for the record: the macros ERROR, WARNING, INFO, LOG, DEBUG, FET and S are still defined by the same dependency header, so the next enumerator that happens to share one of those names will hit the same problem. The undef only covers NONE.
marcelverdult
added a commit
to marcelverdult/MeshCore_Refactor
that referenced
this pull request
Oct 19, 2026
This branch has not been deployed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Heltec_mesh_solar_companion_radio_ble/_usbcurrently fail to compile ondev:The meshsolar library's
logger.hdefinesNONE(and other log-level names) as macros, which clashes withInterfaceType::NONEadded in e672679. meshsolar only uses these names in#ifchecks inside its own header, so undefiningNONEright after includingmeshSolarApp.his safe.Tested with
pio runondev(1934a49): all fiveHeltec_mesh_solar_*envs (companion ble/usb, repeater, room server, kiss modem) build. Without the change,_companion_radio_usbfails with the error above.