Skip to content
This repository has been archived by the owner on Nov 24, 2022. It is now read-only.

Upstream merge: synced with jgromes/RadioLib #2

Merged
merged 587 commits into from
Sep 5, 2021

Conversation

osmanovv
Copy link

@osmanovv osmanovv commented Sep 2, 2021

Updating the meshtastic/RadioLib project to the latest from jgromes/RadioLib.

This is supposed to be preparation for supporting SX1268 module.

jgromes and others added 26 commits June 20, 2021 13:41
…c specific

# Conflicts:
#	src/BuildOpt.h
#	src/Module.cpp
#	src/Module.h
#	src/modules/SX126x/SX126x.cpp
#	src/modules/SX126x/SX126x.h
#	src/modules/SX127x/SX127x.cpp
#	src/modules/SX127x/SX127x.h
@geeksville
Copy link
Member

Thank you for doing this! I bet it was somewhat painful!

@geeksville geeksville merged commit d82e9e6 into meshtastic:master Sep 5, 2021
@osmanovv osmanovv deleted the upstream-merge branch September 25, 2021 03:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants