merged treppe.cpp

This commit is contained in:
Dominik Bartsch 2021-06-28 15:49:07 +02:00
parent 50e714e5f8
commit 5d32392844

View File

@ -194,11 +194,7 @@ void Treppe::task(){
last_sensor_state[0] = current_sensor_state[0]; last_sensor_state[0] = current_sensor_state[0];
last_sensor_state[1] = current_sensor_state[1]; last_sensor_state[1] = current_sensor_state[1];
<<<<<<< HEAD
=======
>>>>>>> 3d13e761f497a0408c134059ff0dfadaa93ebbf4
ledsequence(); ledsequence();
} }