Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
stijn
2021-03-31 13:10:38 +02:00
23 changed files with 1531 additions and 202 deletions

View File

@@ -41,6 +41,10 @@ Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "Servo_driver", "GLCDdriver\
EndProject
Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "Eindopdracht", "Eindopdracht\Eindopdracht.cproj", "{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}"
EndProject
Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "GLCD", "GLCD\GLCD.cproj", "{BBFA8A24-6283-45FE-A253-1F0C6111B1F0}"
EndProject
Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "LCDMatrix", "LCDMatrix\LCDMatrix.cproj", "{B8250AAD-AA24-4F1E-8F84-52B104F66735}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|AVR = Debug|AVR
@@ -123,6 +127,17 @@ Global
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Debug|AVR.Build.0 = Debug|AVR
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Release|AVR.ActiveCfg = Release|AVR
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Release|AVR.Build.0 = Release|AVR
<<<<<<< HEAD
=======
{BBFA8A24-6283-45FE-A253-1F0C6111B1F0}.Debug|AVR.ActiveCfg = Debug|AVR
{BBFA8A24-6283-45FE-A253-1F0C6111B1F0}.Debug|AVR.Build.0 = Debug|AVR
{BBFA8A24-6283-45FE-A253-1F0C6111B1F0}.Release|AVR.ActiveCfg = Release|AVR
{BBFA8A24-6283-45FE-A253-1F0C6111B1F0}.Release|AVR.Build.0 = Release|AVR
{B8250AAD-AA24-4F1E-8F84-52B104F66735}.Debug|AVR.ActiveCfg = Debug|AVR
{B8250AAD-AA24-4F1E-8F84-52B104F66735}.Debug|AVR.Build.0 = Debug|AVR
{B8250AAD-AA24-4F1E-8F84-52B104F66735}.Release|AVR.ActiveCfg = Release|AVR
{B8250AAD-AA24-4F1E-8F84-52B104F66735}.Release|AVR.Build.0 = Release|AVR
>>>>>>> main
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE