Skip to content
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

Power tc tm #191

Merged
merged 35 commits into from
Apr 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
090f51a
whatever
lagilfillan69 Mar 30, 2024
d0903fd
removed comments
lagilfillan69 Mar 30, 2024
742ec00
Merge branch 'main' of https://github.com/asmithie13/ECE-1140
lagilfillan69 Mar 30, 2024
b450dbc
power check
tav38 Mar 30, 2024
552b42c
Merge branch 'main' of https://github.com/asmithie13/ECE-1140 into Po…
tav38 Mar 30, 2024
242d174
train power testing
tav38 Mar 30, 2024
9ce3318
Updated Vital and headlight logic
CECollina Mar 31, 2024
34088ca
testing trainmodel calculations
tav38 Mar 31, 2024
a6dceca
Train displays TrainID
tav38 Mar 31, 2024
9e2c182
train model testing
tav38 Mar 31, 2024
7affff6
adding math
tav38 Mar 31, 2024
f49eb75
Update app_trainmodel_ui.py
tav38 Mar 31, 2024
ed4f9fb
fixed trainID issues
tav38 Mar 31, 2024
73c7681
added grade to train calculations
tav38 Apr 1, 2024
f215b5c
got rid of test values from train model math
tav38 Apr 1, 2024
fd92b9d
testing acc velcity
tav38 Apr 1, 2024
7718e46
test train model
tav38 Apr 1, 2024
c5ff8dc
fixed train model units
tav38 Apr 1, 2024
1a4983d
yippie
lagilfillan69 Apr 1, 2024
8acec6f
Merge branch 'Power_TC_TM' of https://github.com/asmithie13/ECE-1140 …
lagilfillan69 Apr 1, 2024
9a33e75
adding ad
tav38 Apr 1, 2024
ebd3266
adding bk ad
tav38 Apr 1, 2024
6159a58
bd ad should work now
tav38 Apr 1, 2024
b6146d8
updated prev velocity
tav38 Apr 1, 2024
17812f9
speedy
lagilfillan69 Apr 1, 2024
a22f6ff
Merge branch 'Power_TC_TM' of https://github.com/asmithie13/ECE-1140 …
lagilfillan69 Apr 1, 2024
bf131a8
decrement
lagilfillan69 Apr 1, 2024
f4ac6ad
testing math
tav38 Apr 1, 2024
8efa48e
phys
tav38 Apr 1, 2024
3f1db33
auth fix
lagilfillan69 Apr 1, 2024
ffe8bd8
Merge branch 'Power_TC_TM' of https://github.com/asmithie13/ECE-1140 …
lagilfillan69 Apr 1, 2024
dcb667c
fixing auth
lagilfillan69 Apr 1, 2024
0317feb
Merge branch 'main' of https://github.com/asmithie13/ECE-1140
lagilfillan69 Apr 2, 2024
d87e985
Merge branch 'main' into Power_TC_TM
lagilfillan69 Apr 2, 2024
5516a0c
delete generated file?
lagilfillan69 Apr 2, 2024
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
Prev Previous commit
Next Next commit
fixing auth
lagilfillan69 committed Apr 1, 2024
commit dcb667cfe40e6ed00dea0e79b4fa1b351d506926
13 changes: 8 additions & 5 deletions Train_Controller_SW/Authority.py
Original file line number Diff line number Diff line change
@@ -19,10 +19,12 @@ def Authority_Monitor(self):

#calculate authority using d=r*t
self.rate = self.ui.lcdCurSpd.value()*1.46667 #mph to fps
self.rate_metric = self.ui.lcdCurSpd.value()*0.44704
self.time = 1
if(not(self.ui.lcdAuth.value() == 0) and not(self.ui.lcdCurSpd.value == 0)):
self.ui.lcdAuth.display(self.ui.lcdAuth.value() - int(self.rate*self.time)) #auth = auth - rate*time
self.decimal
self.decimal_m_auth = self.decimal_m_auth - float(self.rate_metric*self.time)

if self.ui.lcdAuth.value() != 0:

#authority in m from ft
@@ -45,10 +47,11 @@ def Authority_Monitor(self):
self.ui.vertSliderBrk.setValue(1)
self.ui.vertSliderPow.setValue(0)
self.ui.vertSliderPow.setDisabled(True)
if self.AuthM < self.stoppubgdistanceEmergency:
self.ui.Ebrake.setChecked(True)
elif self.ui.Ebrake.isChecked():
self.ui.Ebrake.setChecked(False)
if self.AuthM < self.stoppubgdistanceEmergency:
self.ui.vertSliderBrk.setValue(0)
self.ui.Ebrake.setChecked(True)
# elif self.ui.Ebrake.isChecked():
# self.ui.Ebrake.setChecked(False)


#we need to deal with whatever this is