robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Removed restart and added warning if wrong processor architecture is detected

Browse source
This commit is contained in:
Philip Trauner 2016-04-08 08:36:06 +02:00
parent 254b07d781
commit bef2413538
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Server/Server.py
View file

@ -11,6 +11,7 @@ import json
import os import os
import subprocess import subprocess
import re import re
import platform
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
@ -78,10 +79,6 @@ class WallabyControl(Routing.ServerRoute):
handler.sock.send("Wallaby not connected anymore.", "error_report") handler.sock.send("Wallaby not connected anymore.", "error_report")
def restart(self, wallaby_handler, handler):
wallaby_handler.sock.send("restart", "wallaby_control")
def disconnect(self, wallaby_handler, handler): def disconnect(self, wallaby_handler, handler):
pass pass
@ -126,6 +123,8 @@ class Compile(Routing.ServerRoute):
if not os.path.exists(full_path): if not os.path.exists(full_path):
os.mkdir(full_path) os.mkdir(full_path)
error = True error = True
if platform.machine() != "armv7l":
Logging.warning("Wrong processor architecture! Generated binaries will not run on Wallaby Controllers.")
p = Popen(["gcc", "-pipe", "-O0", "-o", "%s" % full_path + "/botball_user_program", path + relpath], stdout=PIPE, stderr=PIPE) p = Popen(["gcc", "-pipe", "-O0", "-o", "%s" % full_path + "/botball_user_program", path + relpath], stdout=PIPE, stderr=PIPE)
error = False if p.wait() == 0 else True error = False if p.wait() == 0 else True
result = "" result = ""