phillip/dezibot
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/phillip.kuehne/dezibot.git synced 2025-05-20 19:41:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove mergingcomments

Browse Source
This commit is contained in:
Anina Morgner 2024-06-12 22:03:38 +02:00
parent 19358b2aa7
commit f906ad924a
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Dezibot.cpp
View File

@ -7,38 +7,23 @@
#define SCL_PIN 2 #define SCL_PIN 2
#include "Dezibot.h" #include "Dezibot.h"
<<<<<<< HEAD
#include <SPI.h> #include <SPI.h>
#include <Adafruit_NeoPixel.h> #include <Adafruit_NeoPixel.h>
#define GPIO_LED 48
void Dezibot::begin(void) {
=======
#include <Wire.h> #include <Wire.h>
#define GPIO_LED 48
Dezibot::Dezibot():multiColorLight(){}; Dezibot::Dezibot():multiColorLight(){};
void Dezibot::begin(void) { void Dezibot::begin(void) {
Wire.begin(SDA_PIN,SCL_PIN); Wire.begin(SDA_PIN,SCL_PIN);
infraredLight.begin(); infraredLight.begin();
lightDetection.begin(); lightDetection.begin();
>>>>>>> remotes/origin/feature/#9-display
motion.begin(); motion.begin();
lightDetection.begin(); lightDetection.begin();
colorDetection.begin(); colorDetection.begin();
multiColorLight.begin(); multiColorLight.begin();
<<<<<<< HEAD
motionDetection.begin(); motionDetection.begin();
infraredLight.begin();
}
=======
display.begin(); display.begin();
}; };
>>>>>>> remotes/origin/feature/#9-display