From cf9668251043280088b4bb58f3fcdc428562835e Mon Sep 17 00:00:00 2001 From: Richardo Otros Date: Thu, 16 Jul 2020 18:33:49 +0200 Subject: [PATCH 1/5] added requirements to setup.py --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8346d4b..9fb0372 100644 --- a/setup.py +++ b/setup.py @@ -3,8 +3,12 @@ setup( name='Shush', - version='0.1dev', + version='0.1.0', packages=find_packages(), license='GNU General Public License v3.0', long_description=open('README.md').read(), + install_requires=[ + 'spidev', + 'RPi.GPIO', + ] ) From 78af4b55dc018223e77886b64c0882bd14ab562e Mon Sep 17 00:00:00 2001 From: MrSchnitzel Date: Fri, 24 Jul 2020 19:43:59 +0200 Subject: [PATCH 2/5] update board cs pins --- shush/boards/shush_mk1.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/shush/boards/shush_mk1.py b/shush/boards/shush_mk1.py index 9eda221..dcdd2e1 100644 --- a/shush/boards/shush_mk1.py +++ b/shush/boards/shush_mk1.py @@ -5,23 +5,31 @@ # TODO: Update these values once the PCB is designed. # Any other pin definitions neede? +# m | mod | cs# | BCM +# 0 | 1 | 0 | 8 +# 1 | 2 | 3 | 24 +# 2 | 3 | 1 | 7 +# 3 | 4 | 4 | 23 +# 4 | 5 | 2 | 25 +# 5 | 6 | 5 | 18 + m0_cs = 8 m0_enable = 2 # Need to update these as the board is developed. # Numbers are only placeholders -m1_cs = 7 +m1_cs = 24 m1_enable = 3 -m2_cs = 1 +m2_cs = 7 m2_enable = 4 -m3_cs = 12 +m3_cs = 23 m3_enable = 17 -m4_cs = 16 +m4_cs = 25 m4_enable = 27 -m5_cs = 20 +m5_cs = 18 m5_enable = 22 From 010f2ecd7f4f5b42f5ed4643880abd9b17cd1043 Mon Sep 17 00:00:00 2001 From: MrSchnitzel Date: Fri, 24 Jul 2020 19:51:40 +0200 Subject: [PATCH 3/5] test script --- test_all_motors.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 test_all_motors.py diff --git a/test_all_motors.py b/test_all_motors.py new file mode 100644 index 0000000..6abc24a --- /dev/null +++ b/test_all_motors.py @@ -0,0 +1,29 @@ +import shush as s +import time + +m0 = s.Motor(0) +m1 = s.Motor(1) +m2 = s.Motor(2) +m3 = s.Motor(3) +m4 = s.Motor(4) +m5 = s.Motor(5) + +while True: + m0.move_velocity(0, 10000) + m0.stop_motor() + time.sleep(2) + m1.move_velocity(0, 10000) + m1.stop_motor() + time.sleep(2) + m2.move_velocity(0, 10000) + m2.stop_motor() + time.sleep(2) + m3.move_velocity(0, 10000) + m3.stop_motor() + time.sleep(2) + m4.move_velocity(0, 10000) + m4.stop_motor() + time.sleep(2) + m5.move_velocity(0, 10000) + m5.stop_motor() + time.sleep(2) \ No newline at end of file From 8fe10742ef738d2c31a2a2a8fccde1d5b562d382 Mon Sep 17 00:00:00 2001 From: MrSchnitzel Date: Fri, 24 Jul 2020 19:51:59 +0200 Subject: [PATCH 4/5] up --- test_all_motors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_all_motors.py b/test_all_motors.py index 6abc24a..3ea8d31 100644 --- a/test_all_motors.py +++ b/test_all_motors.py @@ -26,4 +26,4 @@ time.sleep(2) m5.move_velocity(0, 10000) m5.stop_motor() - time.sleep(2) \ No newline at end of file + time.sleep(2) From 483e7b6f7ebf3825a22fc24a128fe62f96b062cf Mon Sep 17 00:00:00 2001 From: MrSchnitzel Date: Fri, 24 Jul 2020 20:01:50 +0200 Subject: [PATCH 5/5] wip --- test_all_motors.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test_all_motors.py b/test_all_motors.py index 3ea8d31..2893871 100644 --- a/test_all_motors.py +++ b/test_all_motors.py @@ -10,20 +10,20 @@ while True: m0.move_velocity(0, 10000) - m0.stop_motor() time.sleep(2) + m0.stop_motor() m1.move_velocity(0, 10000) - m1.stop_motor() time.sleep(2) + m1.stop_motor() m2.move_velocity(0, 10000) - m2.stop_motor() time.sleep(2) + m2.stop_motor() m3.move_velocity(0, 10000) - m3.stop_motor() time.sleep(2) + m3.stop_motor() m4.move_velocity(0, 10000) - m4.stop_motor() time.sleep(2) + m4.stop_motor() m5.move_velocity(0, 10000) - m5.stop_motor() time.sleep(2) + m5.stop_motor()