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

Jump to bottom

mesh.options and mesh.proto are symlinks #2

Closed
EntropyWorks opened this issue Feb 27, 2020 · 1 comment
Closed

mesh.options and mesh.proto are symlinks #2

EntropyWorks opened this issue Feb 27, 2020 · 1 comment
Labels
bug Something isn't working good first issue Good for newcomers

Comments

@EntropyWorks
Copy link

EntropyWorks commented Feb 27, 2020 •
edited
Loading

Just looking around I see two files that are symlinks outside the repo.

mesh.options -> ../MeshUtil/app/src/main/proto/mesh.options
mesh.proto -> ../MeshUtil/app/src/main/proto/mesh.proto

Are these important for the build?
@geeksville
Copy link
Member

geeksville commented Feb 27, 2020 •
edited
Loading

They aren't exactly required for the build because the bin/regen-protos.sh script uses the nanopb tool to generate C code from them (and that C code is checked in). They are actually currently located in the sister android app: https://github.com/geeksville/Meshtastic-Android.

If you'd like to rebuild the C code from the .proto just clone that android repo as a peer directory to the esp32 project. Thanks for the note though - this whole relationship needs to be cleaned up, mostly I wasn't wanting to have to deal with git submodules yet. ;-)

I'll leave this bug open as a reminder to clean this up.

@geeksville geeksville added this to the BeforeBeta milestone Feb 28, 2020
@geeksville geeksville added bug Something isn't working good first issue Good for newcomers labels Feb 28, 2020
geeksville pushed a commit that referenced this issue May 19, 2020
@Dafeman
Merge pull request #2 from meshtastic/master
34fae52 
Update
@retrodime retrodime mentioned this issue Sep 11, 2020
Closed
mc-hamster added a commit that referenced this issue Sep 17, 2020
@mc-hamster
Merge pull request #2 from meshtastic/master
b2a6a40 
Updating from head
geeksville pushed a commit that referenced this issue Oct 29, 2020
@BeardyWalrus
Merge pull request #2 from meshtastic/master
0b1a78c 
Pull to live
@mc-hamster mc-hamster mentioned this issue Dec 25, 2020
Closed
@mc-hamster mc-hamster mentioned this issue Jan 5, 2021
Closed
@mc-hamster mc-hamster mentioned this issue Feb 23, 2021
Closed
@mc-hamster mc-hamster mentioned this issue Mar 27, 2021
Closed
@newtocrypto newtocrypto mentioned this issue Dec 26, 2021
Closed
mc-hamster pushed a commit that referenced this issue Jan 5, 2022
@linagee
Merge pull request #2 from meshtastic/master
69e1985 
Merge master
@majbthrd majbthrd mentioned this issue Jul 29, 2022
Merged
@MasterSPB MasterSPB mentioned this issue Mar 21, 2023
Closed
@GUVWAF GUVWAF mentioned this issue Apr 20, 2023
Merged
thebentern added a commit that referenced this issue Jun 25, 2023
@thebentern
Default ext. notification output for RAK to LED #2
6752cff
thebentern added a commit that referenced this issue Jun 27, 2023
@thebentern
Default ext. notification output for RAK to LED #2 (#2570)
eb0a96a 
* Default ext. notification output for RAK to LED #2

* Enabled by default

* Update

* Wrong macro

* Output and nag
@mverch67 mverch67 mentioned this issue Aug 12, 2023
Merged
jp-bennett added a commit that referenced this issue Sep 28, 2023
@jp-bennett
Attempt #2 at tbeam fix
2641809
thebentern added a commit that referenced this issue Nov 5, 2023
@RicInNewMexico @thebentern
INA3221 / Power Telemetry Payload Variant Implementation (#2916)
f570204 
* 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]>
thebentern pushed a commit that referenced this issue Nov 20, 2023
@RicInNewMexico @jp-bennett
Retain device nodeinfo during reset-nodedb (#2951)
57542ce 
* INA3221 bugfixes & refinement
Reorganized and refactored some INA3221 code
Added comments
Added missing shunt resistor value (100mΩ)
Added INA3221 Channel 1 to getINAVoltage() for device battery monitoring
	modified:   src/Power.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	modified:   src/modules/Telemetry/Sensor/INA3221Sensor.cpp
	modified:   src/modules/Telemetry/Sensor/INA3221Sensor.h
	modified:   src/power.h

* reset-nodedb retain device nodeinfo
	modified:   src/mesh/NodeDB.cpp

* reset-nodedb #2
	modified:   src/mesh/NodeDB.cpp

---------

Co-authored-by: Jonathan Bennett <[email protected]>
@tropho23 tropho23 mentioned this issue Feb 18, 2024
Closed
jp-bennett pushed a commit that referenced this issue Mar 6, 2024
@marelab
Merge pull request #2 from marelab:FixTypo-&-VFS-reference
6361b6d 
Fix Typo & VFS ref.
@mverch67 mverch67 mentioned this issue Mar 11, 2024
Merged
@Talie5in Talie5in mentioned this issue May 22, 2024
Closed
jp-bennett added a commit that referenced this issue May 31, 2024
@jp-bennett
Try #2 to fix timezone/DST
a919ee6
thebentern pushed a commit that referenced this issue May 31, 2024
@jp-bennett
Run tzset() and localtime() in getTZOffset() to ensure proper timezon…
54bccb8 
…e offset (#3999)

* Run tzset() and localtime() in getTZOffset() to ensure proper timezone offset

* Try #2 to fix timezone/DST
@pepefrog1234 pepefrog1234 mentioned this issue Jun 8, 2024
Closed
@ShakataGaNai ShakataGaNai mentioned this issue Aug 23, 2024
Closed
@lagunacomputer lagunacomputer mentioned this issue Sep 30, 2024
Closed
@thebentern thebentern mentioned this issue Oct 10, 2024
Closed
rickmark pushed a commit to rickmark/meshtastic-firmware that referenced this issue Dec 26, 2024
@geeksville
Merge pull request meshtastic#2 from gkelly/fix-comment
c715e50 
 Update comment around use of `modem_config`
rickmark pushed a commit to rickmark/meshtastic-firmware that referenced this issue Dec 26, 2024
@thebentern
Remove meshtastic#2
1d70e78
rickmark pushed a commit to rickmark/meshtastic-firmware that referenced this issue Dec 26, 2024
@uhuruhashimoto
Merge pull request meshtastic#2 from uhuruhashimoto/neighborinfo_module
09f301c 
Neighborinfo module
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working good first issue Good for newcomers
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@geeksville @EntropyWorks