vato007/picar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/MotorControl' into MotorControl

Browse Source
This commit is contained in:
Piv
2019-09-29 19:01:18 +09:30
parent d91d666aa9 1feb8c235e
commit aef30f9f2f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MotorControl/MotorServer.py Normal file → Executable file
View File

@@ -6,8 +6,8 @@ from concurrent import futures
import grpc import grpc
from . import motorService_pb2 import motorService_pb2
from . import motorService_pb2_grpc import motorService_pb2_grpc
from MotorControl.gpiozero.motor_session import Motor from MotorControl.gpiozero.motor_session import Motor
servo_pin = 18 servo_pin = 18
@@ -66,4 +66,4 @@ run = True
while run: while run:
inp = input('Please press q to stop the server') inp = input('Please press q to stop the server')
if inp == 'q' or inp == 'Q': if inp == 'q' or inp == 'Q':
run = False run = False

7
MotorControl/gpiozero/motor_session.py
View File

@@ -8,9 +8,8 @@ class Motor:
def __init__(self, motor_pin=19): def __init__(self, motor_pin=19):
# This may not work properly, should print. # This may not work properly, should print.
Device.pin_factory = PiGPIOFactory() Device.pin_factory = PiGPIOFactory()
print('Using pin factory: ' + Device.pin_factory) print('Using pin factory:')
# This will say it fails if pigpio daemon is already started, just ignore it. print(Device.pin_factory)
os.system("sudo pigpiod")
self.set_motor_pin(motor_pin) self.set_motor_pin(motor_pin)
self.initialise_motor() self.initialise_motor()
@@ -43,4 +42,4 @@ class Motor:
return False return False
def stop(self): def stop(self):
self.set_throttle(0) self.set_throttle(0)

2
MotorControl/motorService_pb2_grpc.py
View File

@@ -1,7 +1,7 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
import grpc import grpc
from . import motorService_pb2 as motorService__pb2 import motorService_pb2 as motorService__pb2
class CarControlStub(object): class CarControlStub(object):