Skip to content

Commit 9d660a9

Browse files
committed
Phase Align code, ping pong feature stopped
1 parent bff9afd commit 9d660a9

File tree

2 files changed

+35
-20
lines changed

2 files changed

+35
-20
lines changed

app/src/main/java/com/googleresearch/capturesync/MainActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ private void handleWebSocketMsg(@NotNull WsMessageContext wsMessageContext){
431431
((SoftwareSyncLeader) softwareSyncController.softwareSync)
432432
.broadcastRpc(
433433
SoftwareSyncController.METHOD_EMPTY_DEVICE,
434-
"0");
434+
"");
435435

436436
break;
437437

@@ -448,6 +448,10 @@ private void handleWebSocketMsg(@NotNull WsMessageContext wsMessageContext){
448448
Log.i(TAG,"handling the message in PING" );
449449
wsMessageContext.send("PONG");
450450
break;
451+
case "PHASE_ALIGN" :
452+
((SoftwareSyncLeader) softwareSyncController.softwareSync)
453+
.broadcastRpc(SoftwareSyncController.METHOD_DO_PHASE_ALIGN, "");
454+
break;
451455
}
452456
}
453457

remote_control/remote_control.py

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import websocket
1515
import rel
1616
import threading
17-
17+
CONNECTION_URL = "ws://192.168.5.3:7867/remotecon"
1818
class RemoteController(object):
1919

2020
def __init__(self, MainWindow ) -> None:
@@ -103,26 +103,31 @@ def isPrefix(self, prefix_text):
103103
return False
104104
return True
105105

106-
def asyncTask(self, f_stop):
107-
self.ws.send("PING")
108-
if not f_stop.is_set():
109-
# call f() again in 60 seconds
110-
threading.Timer(5, self.asyncTask, [f_stop]).start()
106+
def phaseAlign(self):
107+
try:
108+
self.ws.send("PHASE_ALIGN")
109+
except Exception as e:
110+
self.show_popup()
111+
with open('last_prefix.txt','w+') as file:
112+
file.writelines(self.download_prefix_text.toPlainText())
113+
sys.exit()
114+
115+
116+
117+
# def asyncTask(self, f_stop):
118+
# self.ws.send("PING")
119+
# self.ws.recv()
120+
# if not f_stop.is_set():
121+
# # call f() again in 60 seconds
122+
# threading.Timer(5, self.asyncTask, [f_stop]).start()
111123

112124
def setupUi(self, MainWindow):
113125
# Setup the WEB SOCKET
114126
#self.ws = websocket.WebSocketApp("ws://192.168.5.2:7867/remotecon")
115127
self.ws = websocket.WebSocket()
116-
self.ws.connect("ws://192.168.5.2:7867/remotecon")
117-
f_stop = threading.Event()
118-
self.asyncTask(f_stop)
119-
# self.ws = websocket.WebSocketApp("ws://192.168.5.2:7867/remotecon")
120-
#
121-
# self.ws.run_forever(ping_interval=1)
122-
# self.ws.run_forever(dispatcher=rel, reconnect=5)
123-
# rel.signal(2, rel.abort)
124-
# rel.dispatch()
125-
# await ws.send('2')
128+
self.ws.connect(CONNECTION_URL)
129+
# f_stop = threading.Event()
130+
# self.asyncTask(f_stop)
126131
# Setup the GUI
127132
MainWindow.setObjectName("MainWindow")
128133
MainWindow.resize(800, 800)
@@ -131,7 +136,7 @@ def setupUi(self, MainWindow):
131136
self.label = QtWidgets.QLabel(self.centralwidget)
132137
self.label.setGeometry(QtCore.QRect(290, 10, 161, 61))
133138
font = QtGui.QFont()
134-
font.setFamily("Source Code Pro")
139+
#font.setFamily("Source Code Pro")
135140
font.setPointSize(19)
136141
self.label.setFont(font)
137142
self.label.setObjectName("label")
@@ -177,11 +182,17 @@ def setupUi(self, MainWindow):
177182
self.download_btn.clicked.connect(self.downloadBtn)
178183

179184
self.delete_btn = QtWidgets.QPushButton(self.centralwidget)
180-
self.delete_btn.setGeometry(QtCore.QRect(280, 520, 161, 50))
185+
self.delete_btn.setGeometry(QtCore.QRect(450, 520, 161, 50))
181186
self.delete_btn.setFont(font)
182187
self.delete_btn.setObjectName("pushButton_6")
183188
self.delete_btn.clicked.connect(self.delete_all_btn)
184189

190+
self.phase_align_btn = QtWidgets.QPushButton(self.centralwidget)
191+
self.phase_align_btn.setGeometry(QtCore.QRect(120,520, 161, 50))
192+
self.phase_align_btn.setFont(font)
193+
self.phase_align_btn.setObjectName("pushButton_phase")
194+
self.phase_align_btn.clicked.connect(self.phaseAlign)
195+
185196

186197
self.status_label = QtWidgets.QPlainTextEdit(self.centralwidget)
187198
self.status_label.setGeometry(QtCore.QRect(173, 280, 381, 91))
@@ -218,13 +229,13 @@ def retranslateUi(self, MainWindow):
218229
self.download_prefix_text.setPlaceholderText(_translate("MainWindow", " Enter Session Prefix"))
219230
self.download_btn.setText(_translate("MainWindow", "Download"))
220231
self.prefix_list_btn.setText(_translate("MainWindow", "Prefix List"))
232+
self.phase_align_btn.setText(_translate("MainWindow", "Phase Align"))
221233
self.status_label.setPlaceholderText(_translate("MainWindow", "No status "))
222234

223235

224236
if __name__ == "__main__":
225237
app = QtWidgets.QApplication(sys.argv)
226238
MainWindow = QtWidgets.QMainWindow()
227-
228239
rc = RemoteController(MainWindow)
229240
rc.setupUi(MainWindow)
230241

0 commit comments

Comments
 (0)