Skip to content

Commit

Permalink
Merge pull request #142 from Geo-Ron/Failed-to-readADXL345B
Browse files Browse the repository at this point in the history
changes to prevent Failed to readADXL345B
  • Loading branch information
netlars committed Jul 25, 2021
2 parents fc03800 + 0670531 commit 57556a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<<<<<<< HEAD
pcb/megashield_svn_0.5/Dokumentation/Thumbs.db
pcb/megashield_svn_1.2/Platinenbilder/Thumbs.db
=======
*.sublime-workspace
*.db
>>>>>>> origin/master
Thumbs.db
*.bak
code/tests/DUE_TESTS_ARDUMOWER/desktop.ini
code/tests/DUE_TESTS_ARDUMOWER/desktop.ini
desktop.ini
.vscode
2 changes: 1 addition & 1 deletion code/ardumower/consoleui.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ void Robot::menu(){

resetIdleTime();
}
imu.update();
if (imuUse) imu.update();
if (Console.available() > 0) {
ch = (char)Console.read();
switch (ch){
Expand Down
2 changes: 1 addition & 1 deletion code/ardumower/mower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Mower::Mower(){
lawnSensorUse = 0; // use capacitive lawn Sensor

// ------ IMU (compass/accel/gyro) ----------------------
imuUse = 1; // use IMU?
imuUse = 0; // use IMU?
imuCorrectDir = 0; // correct direction by compass?
imuDirPID.Kp = 5.0; // direction PID controller
imuDirPID.Ki = 1.0;
Expand Down

0 comments on commit 57556a0

Please sign in to comment.