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.

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

Feature/thermo13 #59

Merged
merged 56 commits into from
Nov 20, 2024
Merged

Feature/thermo13 #59

merged 56 commits into from
Nov 20, 2024

Conversation

ctacke
Copy link
Contributor

@ctacke ctacke commented Nov 9, 2024

No description provided.

ctacke and others added 30 commits July 7, 2022 20:55
adrianstevens and others added 26 commits April 30, 2024 13:12
# Conflicts:
#	Source/C16x9/Sample/C16x9_Sample/C16x9_Sample.csproj
#	Source/C420R/Driver/C420R.csproj
#	Source/C420R/Sample/C420R_Sample/C420R_Sample.csproj
#	Source/C420T/Driver/C420T.csproj
#	Source/C420T/Sample/C420T_Sample/C420T_Sample.csproj
#	Source/C8800Retro/Sample/C8800Retro_ProjectLab_Sample/C8800Retro_ProjectLab_Sample.csproj
#	Source/C8800Retro/Sample/C8800Retro_Sample/C8800Retro_Sample.csproj
#	Source/C8x8/Sample/C8x8_ProjectLab_Sample/C8x8_ProjectLab_Sample.csproj
#	Source/C8x8/Sample/C8x8_Sample/C8x8_Sample.csproj
#	Source/CACCurrent/Sample/CACCurrent_Sample/CACCurrent_Sample.csproj
#	Source/CButton/Sample/CButton_Sample/CButton_Sample.csproj
#	Source/CGNSS10/Sample/CGNSS10_ProjectLab_Sample/CGNSS10_ProjectLab_Sample.csproj
#	Source/CGNSS10/Sample/CGNSS10_Sample/CGNSS10_Sample.csproj
#	Source/CGNSS5/Sample/CGNSS5_ProjectLab_Sample/CGNSS5_ProjectLab_Sample.csproj
#	Source/CGNSS5/Sample/CGNSS5_Sample/CGNSS5_Sample.csproj
#	Source/CJoystick/Sample/CJoystick_Sample/CJoystick_Sample.csproj
#	Source/CLEM/Sample/CLEM_Sample/CLEM_Sample.csproj
#	Source/CMBusMaster/Driver/CMBusMaster.csproj
#	Source/CMBusMaster/Sample/CMBusMaster_ProjectLab_Sample/CMBusMaster_ProjectLab_Sample.csproj
#	Source/CTempHum15/Sample/CTempHum15_Sample/CTempHum15_Sample.csproj
#	Source/mikroBUS.sln
@adrianstevens adrianstevens merged commit 02fe8a8 into develop Nov 20, 2024
1 check passed
@adrianstevens adrianstevens deleted the feature/thermo13 branch November 20, 2024 03:07
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.

3 participants