Merge branch 'test/withSoftI2CRemap' into 'test/withColorSensors' (15700d3d) · Commits · CdF / CdF 2020-2021 / modules / control-panel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

control-panel
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

15700d3d

Commit 15700d3d authored 3 years ago by

Thomas VADEBOUT

Downloads
- Plain Diff

Merge branch 'test/withSoftI2CRemap' into 'test/withColorSensors'

# Conflicts:
#   src/main.cpp

parents 916d6751 432f928e

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

include/.gitkeep 0 additions, 0 deletions

include/.gitkeep
lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.cpp 0 additions, 1 deletion

lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.cpp
src/main.cpp 29 additions, 1 deletion

src/main.cpp

with 29 additions and 2 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment