zzh
/
LISHUZUOXUN_yangjiang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zzh:dea4d837a131e965d4a0f86b0c771c3950358887
Branches Tags
zzh:main
...
compare: zzh:3370b91eb30bf2e5711037af78053950e6940bf4
Branches Tags
zzh:main

2 Commits
dea4d837a1 ... 3370b91eb3

Author SHA1 Message Date
渣渣和 3370b91eb3 双杠 2024-10-10 12:33:34 +08:00
渣渣和 2948fc861e 双杠 2024-10-10 12:25:05 +08:00
2 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

1
Exercise3/pull_up_1.py
View File

@ -203,7 +203,6 @@ class PullUp_1(BaseExercise):
self.direction = 0
self._time = 0
self.end_test = 0
if self.count % 1 == 0:
self.speak_driver.speed_control(320)
self.speak_driver.add_speak("{}".format(int(self.count)))
if self.count == 1:

6
Exercise3/tricep_dip.py
View File

@ -189,7 +189,7 @@ class Tricep_dip_1(BaseExercise):
self.state = 0
self.time = 0
if elbow_1 >= 146 and shoulder_1_y < elbow_1_y and shoulder_1_y < self.initial_wrist_1_y - 30 and shoulder_angle > 60 and self.count > 0 and wrist_1_y - self.initial_wrist_1_y < 50:
if elbow_1 >= 146 and shoulder_1_y < elbow_1_y and shoulder_1_y < self.initial_wrist_1_y - 30 and shoulder_angle > 45 and self.count > 0 and wrist_1_y - self.initial_wrist_1_y < 50:
self.feedback = "下落"
if self.state == 0:
self.time += 1
@ -209,7 +209,7 @@ class Tricep_dip_1(BaseExercise):
# self.pre_pos = 2
# self.had_done = True
if elbow_2 <= 93 and shoulder_2_y >= elbow_2_y and wrist_2_y - self.initial_wrist_2_y < 50:
if elbow_2 <= 95 and shoulder_2_y >= elbow_2_y and wrist_2_y - self.initial_wrist_2_y < 50:
self.feedback = "上升"
if self.state == 1:
self.time += 1
@ -218,7 +218,7 @@ class Tricep_dip_1(BaseExercise):
self.state = 0
self.time = 0
if elbow_2 >= 146 and shoulder_2_y < elbow_2_y and shoulder_2_y < self.initial_wrist_2_y - 30 and shoulder_angle > 60 and self.count > 0 and wrist_2_y - self.initial_wrist_2_y < 50:
if elbow_2 >= 146 and shoulder_2_y < elbow_2_y and shoulder_2_y < self.initial_wrist_2_y - 30 and shoulder_angle > 45 and self.count > 0 and wrist_2_y - self.initial_wrist_2_y < 50:
self.feedback = "下落"
if self.state == 0:
self.time += 1