From 7092ba104ae90eea21beb21c35900e1ccbfaf957 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Fri, 18 Feb 2022 12:00:59 -0600 Subject: Change git repo to organization repos Signed-off-by: Matt Strapp --- System/Uploads/donovanTestScript.py | 81 ------------------------------------- System/Uploads/upload.py | 81 ------------------------------------- 2 files changed, 162 deletions(-) delete mode 100644 System/Uploads/donovanTestScript.py delete mode 100644 System/Uploads/upload.py (limited to 'System/Uploads') diff --git a/System/Uploads/donovanTestScript.py b/System/Uploads/donovanTestScript.py deleted file mode 100644 index 4a51f08..0000000 --- a/System/Uploads/donovanTestScript.py +++ /dev/null @@ -1,81 +0,0 @@ - - - - - -import sys -sys.path.insert(0, '/home/pi/pendulum/System') -from System.system import System -import time -from sys import exit -#import pandas - - -### -sys.path.insert(0, '/home/pi/pendulum/System') -from encoder import Encoder -import RPi.GPIO as GPIO - - -clk_pin = 3 -cs_pin = 23 -data_pin = 2 - -e = Encoder(clk_pin, cs_pin, data_pin) -e.set_zero() -### - - - - -sys = System(angular_units = 'Radians') - -for x in range(4,20): - linear = 0 - - print("beginning of test with speed " + str(x)) - - while linear > -7: - sys.adjust(-5) - angle, linear = sys.measure() - print("Angle: " + str(angle) + ", Linear: " + str(linear)) - time.sleep(0.1) - sys.adjust(0) - time.sleep(3) - sys.add_log("this is a test with speed " + str(x)) - - while linear < 7: - sys.adjust(x) - angle, linear = sys.measure() - print("Angle: " + str(angle) + ", Linear: " + str(linear)) - sys.add_results(e.read_position('Degrees'), linear, x) - time.sleep(0.1) - sys.adjust(0) - print("end of test with speed " + str(x)) - time.sleep(3) - - -exit() - - - - - - - - -#class test(): -# def __init__(self, x, theta): -# self.x = 0 -# self.theta = 0 -# -# def getINFO(self, theta): -# #theta, x = self.System.measure() -# theta, x = self.sys.measure() -# -#while(1): -# test.getINFO() -# print("t") -# #print("theta",test.theta) -# #print("x",test.x) -# diff --git a/System/Uploads/upload.py b/System/Uploads/upload.py deleted file mode 100644 index 4a51f08..0000000 --- a/System/Uploads/upload.py +++ /dev/null @@ -1,81 +0,0 @@ - - - - - -import sys -sys.path.insert(0, '/home/pi/pendulum/System') -from System.system import System -import time -from sys import exit -#import pandas - - -### -sys.path.insert(0, '/home/pi/pendulum/System') -from encoder import Encoder -import RPi.GPIO as GPIO - - -clk_pin = 3 -cs_pin = 23 -data_pin = 2 - -e = Encoder(clk_pin, cs_pin, data_pin) -e.set_zero() -### - - - - -sys = System(angular_units = 'Radians') - -for x in range(4,20): - linear = 0 - - print("beginning of test with speed " + str(x)) - - while linear > -7: - sys.adjust(-5) - angle, linear = sys.measure() - print("Angle: " + str(angle) + ", Linear: " + str(linear)) - time.sleep(0.1) - sys.adjust(0) - time.sleep(3) - sys.add_log("this is a test with speed " + str(x)) - - while linear < 7: - sys.adjust(x) - angle, linear = sys.measure() - print("Angle: " + str(angle) + ", Linear: " + str(linear)) - sys.add_results(e.read_position('Degrees'), linear, x) - time.sleep(0.1) - sys.adjust(0) - print("end of test with speed " + str(x)) - time.sleep(3) - - -exit() - - - - - - - - -#class test(): -# def __init__(self, x, theta): -# self.x = 0 -# self.theta = 0 -# -# def getINFO(self, theta): -# #theta, x = self.System.measure() -# theta, x = self.sys.measure() -# -#while(1): -# test.getINFO() -# print("t") -# #print("theta",test.theta) -# #print("x",test.x) -# -- cgit v1.2.3