diff --git a/integration/Window.py b/integration/Window.py index 0a25044fad239be86320d688e46d3fe2f6403d98..d789dcffd4895dbf6667fa504e29920ffddccb2b 100644 --- a/integration/Window.py +++ b/integration/Window.py @@ -461,7 +461,7 @@ class Window: data = self.arduino_EMG.readline() emg_data = self._decode(data) if emg_data is not None: - print(f"EMG 1: {emg_data[0]} , EMG 2: {emg_data[1]}") + #print(f"EMG 1: {emg_data[0]} , EMG 2: {emg_data[1]}") self.outer_EMG_Number.config(text=f"{emg_data[0]}") @@ -658,14 +658,14 @@ class trainingInterface: def EMG_connect_HandOpen(self): self.arduino_EMG = serial.Serial('COM5', 9600, timeout=1) gesture = "handOpen" - self.start_countdown(5) + self.start_countdown(11) self.displayAndsaveDate() def handCloseButton(self): self.arduino_EMG = serial.Serial('COM5', 9600, timeout=1) gesture = "handOpen" - self.start_countdown_close(5) + self.start_countdown_close(11) self.displayAndsaveDate() @@ -708,38 +708,34 @@ class trainingInterface: self.trainData() def displayAndsaveDate(self): - if self.startSave: - try: - while (self.arduino_EMG.inWaiting() > 0) : - data = self.arduino_EMG.readline() - emg_data = self._decode(data) - if emg_data is not None: - print(f"EMG 1: {emg_data[0]} , EMG 2: {emg_data[1]}") - # Append the new data to the lists - - self.emg_data_1.append(emg_data[0]) - self.emg_data_1.pop(0) - self.emg_data_2.append(emg_data[1]) - self.emg_data_2.pop(0) - if self.startSave==True: - self.savingData.append([emg_data[0],emg_data[1]]) - print(len(self.savingData)) - - - # Update the line data to shift the line from right to left - self.line1.set_data(range(len(self.emg_data_1)), self.emg_data_1) - self.line2.set_data(range(len(self.emg_data_2)), self.emg_data_2) + if self.startSave: + try: + while self.arduino_EMG.inWaiting() > 0: + data = self.arduino_EMG.readline() + emg_data = self._decode(data) - # Redraw the canvas - self.canvas1.draw() # Redraw the canvas + if emg_data is not None: + # Append the new data to the lists and update plot data + self.emg_data_1.append(emg_data[0]) + self.emg_data_1.pop(0) + self.emg_data_2.append(emg_data[1]) + self.emg_data_2.pop(0) - except Exception as e: - print(f"An error occurred: {e}") + if self.startSave: + self.savingData.append([emg_data[0], emg_data[1]]) - self.EMG_display_id = self.root.after(50, self.displayAndsaveDate) + # Update the line data to shift the line from right to left + self.line1.set_data(range(len(self.emg_data_1)), self.emg_data_1) + self.line2.set_data(range(len(self.emg_data_2)), self.emg_data_2) + # Redraw the canvas + self.canvas1.draw() + except (OSError, ValueError, IndexError) as e: + print(f"An error occurred: {e}") + # Schedule the next update + self.EMG_display_id = self.root.after(10, self.displayAndsaveDate) def initialEMGTraining(self): self.EMG_transmitting = False @@ -1047,7 +1043,7 @@ class gameScreen: print(f"last roll is: {self.last_averageRoll}") differ_roll = self.last_averageRoll - roll print(f"differ roll is: {differ_roll}") - CalculatedAngle = differ_roll * 3000 / 2.5 + CalculatedAngle = differ_roll * 3000 / 1.5 print(f"CalculatedAngle is: {CalculatedAngle}") if (differ_roll) > 0: self.send_command_to_unity(f"Command : down {CalculatedAngle}") @@ -1061,7 +1057,7 @@ class gameScreen: print(f"last yaw is: {self.last_averageyaw}") differ_yaw = self.last_averageyaw - yaw print(f"differ yaw is: {differ_yaw}") - yawAngle = differ_yaw * 90 / 2 + yawAngle = differ_yaw * 110 / 2.5 print(f"yawAngle is: {yawAngle}") if (differ_yaw) < 0: self.send_command_to_unity(f"Command : back {-yawAngle}")