Skip to content

sync changes brought in with DexterOS #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 40 commits into from
Sep 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
fe6c107
Feature/split easy libraries (#149)
CleoQc Feb 14, 2018
debe8c3
Feature/overall mutex (#152)
CleoQc Feb 23, 2018
bf24f59
Merge branch 'master' into develop
RobertLucian Feb 27, 2018
4f4d428
Notebooks for Mouse Controller project. Change turn_degrees blocking…
CleoQc Feb 28, 2018
6dc64c4
better handling of mutex checking (#155)
CleoQc Mar 2, 2018
7d597de
Bug/line follower (#156)
CleoQc Mar 2, 2018
00d2b1d
Fix/overallmutex (#157)
CleoQc Mar 6, 2018
05165bc
Merge branch 'master' into develop
RobertLucian Mar 8, 2018
d5d66b5
Merge pull request #161 from mattallen37/master
Mar 12, 2018
e6c4b77
Fix/trickle down use mutex value (#162)
CleoQc Mar 13, 2018
fdd9810
Merge branch 'master' into develop
RobertLucian Mar 22, 2018
576291f
Merge branch 'master' into develop
RobertLucian Mar 22, 2018
e93b2f8
new reconfig_bus() method (#167)
CleoQc Mar 28, 2018
447e5f3
feature - updated documentation for all the things we did (#168)
RobertLucian Apr 5, 2018
f60dffa
Fix/distance sensor (#169)
CleoQc Apr 6, 2018
dfd6957
Merge branch 'master' into develop
RobertLucian Apr 24, 2018
db9f32e
Sync develop to master (#175)
CleoQc Apr 26, 2018
af11817
install control panel within install script (#177)
CleoQc May 2, 2018
58c41d3
Add Scratch into the Pi menu (#170)
CleoQc May 2, 2018
786fb51
Fix/broken gui (#176)
CleoQc May 2, 2018
28c196a
Fix/control panel (#178)
CleoQc May 4, 2018
52e419e
feature - change how the installation of the robot goes (#180)
RobertLucian May 10, 2018
ea6cce9
fix deprecated distance sensor init for Scratch (#181)
CleoQc May 14, 2018
8940759
Remove confusion between left/right eyes (#182)
CleoQc May 16, 2018
5b261f3
Error window in Control Panel if GPG3 not found (#184)
CleoQc May 17, 2018
ed254d8
feature - changing the sources (#183)
RobertLucian May 17, 2018
3990f0d
Merge branch 'master' into develop
RobertLucian May 23, 2018
91b758a
fix - browser bot project (#187)
RobertLucian May 30, 2018
7b1a42d
feature - change script tools ref (#185)
RobertLucian Jun 1, 2018
90525e4
fix - remove unnecessary instruction from install script (#188)
RobertLucian Jun 1, 2018
13b1855
Sync 'master' with develop
RobertLucian Jun 5, 2018
d1f84fd
Merge branch 'master' into develop
RobertLucian Jun 5, 2018
b1b35eb
Merge branch 'master' into develop
RobertLucian Jun 11, 2018
91d5e49
Merge branch 'master' into develop
RobertLucian Jun 14, 2018
09ea0c9
Merge branch 'master' into develop
RobertLucian Jun 27, 2018
ee1f025
Merge branch 'master' into develop
RobertLucian Sep 12, 2018
1c2f05d
read line follower from left to right, and speed it up (#200)
CleoQc Sep 12, 2018
d9a97d4
new methods: spin_left, spin_right, steer and orbit (#201)
CleoQc Sep 14, 2018
15c3f34
Fix line follower examples (#202)
CleoQc Sep 18, 2018
cc68f20
fix - the documentation & update the copyright year (#203)
RobertLucian Sep 21, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Software/Python/Examples/Line_Sensor/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# LINE FOLLOWER SENSOR

These files showcase how to use the line follower with a GoPiGo3.

For these files to work, the DI Sensors drivers must first be installed. On Raspbian for Robots they are pre-installed already.

## Installation
If you need to install the DI Sensors repo, this is how to do it:

`curl -kL dexterindustries.com/update_sensors | bash`

## More
See more at https://github.com/DexterInd/DI_Sensors
Empty file.
3 changes: 1 addition & 2 deletions Software/Python/Examples/Line_Sensor/basic_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@
'''
from __future__ import print_function
from __future__ import division
from builtins import input
# the above lines are meant for Python3 compatibility.
# they force the use of Python3 functionality for print(),
# the integer division and input()
# mind your parentheses!

import line_sensor
from line_follower import line_sensor
import time

def get_sensorval():
Expand Down
41 changes: 27 additions & 14 deletions Software/Python/Examples/Line_Sensor/line_follower-basic_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,37 @@
'''
from __future__ import print_function
from __future__ import division
from builtins import input
# the above lines are meant for Python3 compatibility.
# they force the use of Python3 functionality for print(),
# the integer division and input()
# mind your parentheses!

import line_sensor
import easygopigo3 as easy
import time

def get_sensorval():
while True:
val=line_sensor.read_sensor()
if val[0]!=-1:
return val
#else:
#Read once more to clear buffer and remove junk values
# val=line_sensor.read_sensor()
while True:
l0,l1,l2,l3,l4=get_sensorval()
print (l0,l1,l2,l3,l4)
#time.sleep(.05)
sensor_readings = None

gpg = easy.EasyGoPiGo3()

try:
my_linefollower = gpg.init_line_follower()
time.sleep(0.1)
except:
print('Line Follower not responding')
time.sleep(0.2)
exit()
my_linefollower.read_position()
my_linefollower.read_position()


# start
gpg.forward()
while not my_linefollower.read_position() == "black":
if my_linefollower.read_position() == 'center':
gpg.forward()
if my_linefollower.read_position() == 'left':
gpg.left()
if my_linefollower.read_position() == 'right':
gpg.right()
gpg.stop()

225 changes: 0 additions & 225 deletions Software/Python/Examples/Line_Sensor/line_sensor.py

This file was deleted.

Loading