From 1483eebb8b4c6070304e55a11df05ec95d4ef015 Mon Sep 17 00:00:00 2001 From: Eugene Batalov Date: Thu, 14 Jul 2016 17:56:06 +0300 Subject: [PATCH] car_srw: dirs renaming + small bug fixes --- car_net/devloader.py | 82 ------------------ car_net/proxy.js | 10 --- .../clients/flash}/.gitignore | 0 .../clients/flash}/.idea/compiler.xml | 0 .../.idea/copyright/profiles_settings.xml | 0 .../clients/flash}/.idea/misc.xml | 0 .../clients/flash}/.idea/modules.xml | 0 .../clients/flash}/build.gradle | 0 .../CarCtl => car_srv/clients/flash}/gradlew | 0 .../clients/flash}/gradlew.bat | 0 .../clients/flash}/run.sh | 0 .../clients/flash}/settings.gradle | 0 .../clients/flash}/src/main/java/Main.kt | 0 .../flash}/src/main/java/client/Client.kt | 0 .../src/main/java/client/ClientHandler.kt | 0 .../src/main/java/client/ClientInitializer.kt | 0 .../flash}/src/main/java/proto/Carkot.java | 0 .../clients/rc}/.gitignore | 0 .../clients/rc}/build.gradle | 0 .../rc}/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../clients/rc}/gradlew | 0 .../clients/rc}/gradlew.bat | 0 .../CarCtl => car_srv/clients/rc}/run.sh | 0 .../clients/rc}/settings.gradle | 0 .../clients/rc}/src/main/java/CarControl.kt | 0 .../clients/rc}/src/main/java/Main.kt | 0 .../rc}/src/main/java/client/Client.kt | 0 .../rc}/src/main/java/client/ClientHandler.kt | 0 .../src/main/java/client/ClientInitializer.kt | 0 .../rc}/src/main/java/proto/car/RouteP.java | 0 .../stFlashServer => car_srv/src}/.gitignore | 0 .../src}/.idea/misc.xml | 0 .../src}/.idea/modules.xml | 0 .../src}/.idea/stFlashServer.iml | 0 .../stFlashServer => car_srv/src}/handlers.js | 12 +-- .../stFlashServer => car_srv/src}/main.js | 21 ++--- .../src}/package.json | 0 .../src}/proto/carkot.proto | 0 .../src}/proto/route.proto | 0 .../stFlashServer => car_srv/src}/router.js | 0 .../stFlashServer => car_srv/src}/server.js | 0 42 files changed, 17 insertions(+), 108 deletions(-) delete mode 100644 car_net/devloader.py delete mode 100644 car_net/proxy.js rename {desktop_clients/CarCtl => car_srv/clients/flash}/.gitignore (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/.idea/compiler.xml (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/.idea/copyright/profiles_settings.xml (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/.idea/misc.xml (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/.idea/modules.xml (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/build.gradle (100%) rename {desktop_clients/CarCtl => car_srv/clients/flash}/gradlew (100%) rename {desktop_clients/CarCtl => car_srv/clients/flash}/gradlew.bat (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/run.sh (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/settings.gradle (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/src/main/java/Main.kt (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/src/main/java/client/Client.kt (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/src/main/java/client/ClientHandler.kt (100%) rename {desktop_clients/CarCtl => car_srv/clients/flash}/src/main/java/client/ClientInitializer.kt (100%) rename {desktop_clients/stFlashClient => car_srv/clients/flash}/src/main/java/proto/Carkot.java (100%) rename {desktop_clients/stFlashClient => car_srv/clients/rc}/.gitignore (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/build.gradle (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/gradle/wrapper/gradle-wrapper.jar (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/gradle/wrapper/gradle-wrapper.properties (100%) rename {desktop_clients/stFlashClient => car_srv/clients/rc}/gradlew (100%) rename {desktop_clients/stFlashClient => car_srv/clients/rc}/gradlew.bat (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/run.sh (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/settings.gradle (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/src/main/java/CarControl.kt (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/src/main/java/Main.kt (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/src/main/java/client/Client.kt (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/src/main/java/client/ClientHandler.kt (100%) rename {desktop_clients/stFlashClient => car_srv/clients/rc}/src/main/java/client/ClientInitializer.kt (100%) rename {desktop_clients/CarCtl => car_srv/clients/rc}/src/main/java/proto/car/RouteP.java (100%) rename {car_net/stFlashServer => car_srv/src}/.gitignore (100%) rename {car_net/stFlashServer => car_srv/src}/.idea/misc.xml (100%) rename {car_net/stFlashServer => car_srv/src}/.idea/modules.xml (100%) rename {car_net/stFlashServer => car_srv/src}/.idea/stFlashServer.iml (100%) rename {car_net/stFlashServer => car_srv/src}/handlers.js (92%) rename {car_net/stFlashServer => car_srv/src}/main.js (66%) rename {car_net/stFlashServer => car_srv/src}/package.json (100%) rename {car_net/stFlashServer => car_srv/src}/proto/carkot.proto (100%) rename {car_net/stFlashServer => car_srv/src}/proto/route.proto (100%) rename {car_net/stFlashServer => car_srv/src}/router.js (100%) rename {car_net/stFlashServer => car_srv/src}/server.js (100%) diff --git a/car_net/devloader.py b/car_net/devloader.py deleted file mode 100644 index e3ca8fc942c..00000000000 --- a/car_net/devloader.py +++ /dev/null @@ -1,82 +0,0 @@ -from SimpleXMLRPCServer import SimpleXMLRPCServer -import os -import tempfile - -def getReq(): - req = { - 'flash_address': '0x08000000', - 'data': '', - 'device': '', - 'method': 'STLINK' - } - data = os.path.join(os.getcwd(), 'devloader', 'data', 'fancyblink.bin') - with open(data, 'rb') as f: - req['data'] = f.read() - f.close() - print 'Image has', len(req['data']), 'bytes' - return req - - -def getFlasher(method, data, address): - flasher = {} - os_arch = 'macosx-x86_64' - root = os.path.join(os.getcwd(), 'devloader', 'data') - if method == 'STLINK': - flasher['program'] = os.path.join(root, os_arch, 'st-flash') - flasher['args'] = ['write', data, address] - else: - return None - return flasher - - -def processReq(req): - temp = tempfile.mktemp() - result = { 'output': '' } - with open(temp, 'wb') as f: - f.write(req['data']) - f.close() - flasher = getFlasher(req['method'], temp, req['flash_address']) - cmd = ' '.join([flasher['program']] + flasher['args'] + ["2>&1"]) - with os.popen(cmd, 'r') as pipe: - for line in pipe: - result['output'] = result['output'] + line - print 'res=', result['output'] - os.unlink(temp) - return result - - - -class Handler: - def __init__(self): - # make all of the string functions available through - # string.func_name - import string - self.string = string - - def _listMethods(self): - # implement this method so that system.listMethods - # knows to advertise the strings methods - return list_public_methods(self) + \ - ['string.' + method for method in list_public_methods(self.string)] - - def flash(self, req): - return processReq(req) - -server = SimpleXMLRPCServer(("localhost", 8000)) -server.register_introspection_functions() -server.register_instance(Handler()) -server.serve_forever() - -def main0(): - req = getReq() - processReq(req) - - -def main(): - server = SimpleXMLRPCServer(("localhost", 8000)) - server.register_introspection_functions() - server.register_instance(Handler()) - server.serve_forever() - -if __name__ == "__main__": - main() diff --git a/car_net/proxy.js b/car_net/proxy.js deleted file mode 100644 index 31c3db5f57d..00000000000 --- a/car_net/proxy.js +++ /dev/null @@ -1,10 +0,0 @@ -var protobuf = require('protocol-buffers') -var fs = require('fs') - -var messages = protobuf(fs.readFileSync(__dirname + '/../proto/carkot.proto')) - -var ex = { - data: '12345' -} - -var buf = messages.Upload.encode(ex) diff --git a/desktop_clients/CarCtl/.gitignore b/car_srv/clients/flash/.gitignore similarity index 100% rename from desktop_clients/CarCtl/.gitignore rename to car_srv/clients/flash/.gitignore diff --git a/desktop_clients/stFlashClient/.idea/compiler.xml b/car_srv/clients/flash/.idea/compiler.xml similarity index 100% rename from desktop_clients/stFlashClient/.idea/compiler.xml rename to car_srv/clients/flash/.idea/compiler.xml diff --git a/desktop_clients/stFlashClient/.idea/copyright/profiles_settings.xml b/car_srv/clients/flash/.idea/copyright/profiles_settings.xml similarity index 100% rename from desktop_clients/stFlashClient/.idea/copyright/profiles_settings.xml rename to car_srv/clients/flash/.idea/copyright/profiles_settings.xml diff --git a/desktop_clients/stFlashClient/.idea/misc.xml b/car_srv/clients/flash/.idea/misc.xml similarity index 100% rename from desktop_clients/stFlashClient/.idea/misc.xml rename to car_srv/clients/flash/.idea/misc.xml diff --git a/desktop_clients/stFlashClient/.idea/modules.xml b/car_srv/clients/flash/.idea/modules.xml similarity index 100% rename from desktop_clients/stFlashClient/.idea/modules.xml rename to car_srv/clients/flash/.idea/modules.xml diff --git a/desktop_clients/stFlashClient/build.gradle b/car_srv/clients/flash/build.gradle similarity index 100% rename from desktop_clients/stFlashClient/build.gradle rename to car_srv/clients/flash/build.gradle diff --git a/desktop_clients/CarCtl/gradlew b/car_srv/clients/flash/gradlew similarity index 100% rename from desktop_clients/CarCtl/gradlew rename to car_srv/clients/flash/gradlew diff --git a/desktop_clients/CarCtl/gradlew.bat b/car_srv/clients/flash/gradlew.bat similarity index 100% rename from desktop_clients/CarCtl/gradlew.bat rename to car_srv/clients/flash/gradlew.bat diff --git a/desktop_clients/stFlashClient/run.sh b/car_srv/clients/flash/run.sh similarity index 100% rename from desktop_clients/stFlashClient/run.sh rename to car_srv/clients/flash/run.sh diff --git a/desktop_clients/stFlashClient/settings.gradle b/car_srv/clients/flash/settings.gradle similarity index 100% rename from desktop_clients/stFlashClient/settings.gradle rename to car_srv/clients/flash/settings.gradle diff --git a/desktop_clients/stFlashClient/src/main/java/Main.kt b/car_srv/clients/flash/src/main/java/Main.kt similarity index 100% rename from desktop_clients/stFlashClient/src/main/java/Main.kt rename to car_srv/clients/flash/src/main/java/Main.kt diff --git a/desktop_clients/stFlashClient/src/main/java/client/Client.kt b/car_srv/clients/flash/src/main/java/client/Client.kt similarity index 100% rename from desktop_clients/stFlashClient/src/main/java/client/Client.kt rename to car_srv/clients/flash/src/main/java/client/Client.kt diff --git a/desktop_clients/stFlashClient/src/main/java/client/ClientHandler.kt b/car_srv/clients/flash/src/main/java/client/ClientHandler.kt similarity index 100% rename from desktop_clients/stFlashClient/src/main/java/client/ClientHandler.kt rename to car_srv/clients/flash/src/main/java/client/ClientHandler.kt diff --git a/desktop_clients/CarCtl/src/main/java/client/ClientInitializer.kt b/car_srv/clients/flash/src/main/java/client/ClientInitializer.kt similarity index 100% rename from desktop_clients/CarCtl/src/main/java/client/ClientInitializer.kt rename to car_srv/clients/flash/src/main/java/client/ClientInitializer.kt diff --git a/desktop_clients/stFlashClient/src/main/java/proto/Carkot.java b/car_srv/clients/flash/src/main/java/proto/Carkot.java similarity index 100% rename from desktop_clients/stFlashClient/src/main/java/proto/Carkot.java rename to car_srv/clients/flash/src/main/java/proto/Carkot.java diff --git a/desktop_clients/stFlashClient/.gitignore b/car_srv/clients/rc/.gitignore similarity index 100% rename from desktop_clients/stFlashClient/.gitignore rename to car_srv/clients/rc/.gitignore diff --git a/desktop_clients/CarCtl/build.gradle b/car_srv/clients/rc/build.gradle similarity index 100% rename from desktop_clients/CarCtl/build.gradle rename to car_srv/clients/rc/build.gradle diff --git a/desktop_clients/CarCtl/gradle/wrapper/gradle-wrapper.jar b/car_srv/clients/rc/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from desktop_clients/CarCtl/gradle/wrapper/gradle-wrapper.jar rename to car_srv/clients/rc/gradle/wrapper/gradle-wrapper.jar diff --git a/desktop_clients/CarCtl/gradle/wrapper/gradle-wrapper.properties b/car_srv/clients/rc/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from desktop_clients/CarCtl/gradle/wrapper/gradle-wrapper.properties rename to car_srv/clients/rc/gradle/wrapper/gradle-wrapper.properties diff --git a/desktop_clients/stFlashClient/gradlew b/car_srv/clients/rc/gradlew similarity index 100% rename from desktop_clients/stFlashClient/gradlew rename to car_srv/clients/rc/gradlew diff --git a/desktop_clients/stFlashClient/gradlew.bat b/car_srv/clients/rc/gradlew.bat similarity index 100% rename from desktop_clients/stFlashClient/gradlew.bat rename to car_srv/clients/rc/gradlew.bat diff --git a/desktop_clients/CarCtl/run.sh b/car_srv/clients/rc/run.sh similarity index 100% rename from desktop_clients/CarCtl/run.sh rename to car_srv/clients/rc/run.sh diff --git a/desktop_clients/CarCtl/settings.gradle b/car_srv/clients/rc/settings.gradle similarity index 100% rename from desktop_clients/CarCtl/settings.gradle rename to car_srv/clients/rc/settings.gradle diff --git a/desktop_clients/CarCtl/src/main/java/CarControl.kt b/car_srv/clients/rc/src/main/java/CarControl.kt similarity index 100% rename from desktop_clients/CarCtl/src/main/java/CarControl.kt rename to car_srv/clients/rc/src/main/java/CarControl.kt diff --git a/desktop_clients/CarCtl/src/main/java/Main.kt b/car_srv/clients/rc/src/main/java/Main.kt similarity index 100% rename from desktop_clients/CarCtl/src/main/java/Main.kt rename to car_srv/clients/rc/src/main/java/Main.kt diff --git a/desktop_clients/CarCtl/src/main/java/client/Client.kt b/car_srv/clients/rc/src/main/java/client/Client.kt similarity index 100% rename from desktop_clients/CarCtl/src/main/java/client/Client.kt rename to car_srv/clients/rc/src/main/java/client/Client.kt diff --git a/desktop_clients/CarCtl/src/main/java/client/ClientHandler.kt b/car_srv/clients/rc/src/main/java/client/ClientHandler.kt similarity index 100% rename from desktop_clients/CarCtl/src/main/java/client/ClientHandler.kt rename to car_srv/clients/rc/src/main/java/client/ClientHandler.kt diff --git a/desktop_clients/stFlashClient/src/main/java/client/ClientInitializer.kt b/car_srv/clients/rc/src/main/java/client/ClientInitializer.kt similarity index 100% rename from desktop_clients/stFlashClient/src/main/java/client/ClientInitializer.kt rename to car_srv/clients/rc/src/main/java/client/ClientInitializer.kt diff --git a/desktop_clients/CarCtl/src/main/java/proto/car/RouteP.java b/car_srv/clients/rc/src/main/java/proto/car/RouteP.java similarity index 100% rename from desktop_clients/CarCtl/src/main/java/proto/car/RouteP.java rename to car_srv/clients/rc/src/main/java/proto/car/RouteP.java diff --git a/car_net/stFlashServer/.gitignore b/car_srv/src/.gitignore similarity index 100% rename from car_net/stFlashServer/.gitignore rename to car_srv/src/.gitignore diff --git a/car_net/stFlashServer/.idea/misc.xml b/car_srv/src/.idea/misc.xml similarity index 100% rename from car_net/stFlashServer/.idea/misc.xml rename to car_srv/src/.idea/misc.xml diff --git a/car_net/stFlashServer/.idea/modules.xml b/car_srv/src/.idea/modules.xml similarity index 100% rename from car_net/stFlashServer/.idea/modules.xml rename to car_srv/src/.idea/modules.xml diff --git a/car_net/stFlashServer/.idea/stFlashServer.iml b/car_srv/src/.idea/stFlashServer.iml similarity index 100% rename from car_net/stFlashServer/.idea/stFlashServer.iml rename to car_srv/src/.idea/stFlashServer.iml diff --git a/car_net/stFlashServer/handlers.js b/car_srv/src/handlers.js similarity index 92% rename from car_net/stFlashServer/handlers.js rename to car_srv/src/handlers.js index b08e2c095bc..efd48acd99e 100644 --- a/car_net/stFlashServer/handlers.js +++ b/car_srv/src/handlers.js @@ -58,33 +58,33 @@ function control(httpContent, response) { switch (directionObject.command) { case directionClass.Command.stop : { - resultByte = 0; + resultByte = "0"; break; } case directionClass.Command.forward : { - resultByte = 1; + resultByte = "1"; break; } case directionClass.Command.backward : { - resultByte = 2; + resultByte = "2"; break; } case directionClass.Command.right : { - resultByte = 4; + resultByte = "3"; break; } case directionClass.Command.left : { - resultByte = 3; + resultByte = "4"; break; } } console.log("byte for car: " + resultByte); - fs.writeFile(main.transportFilePath, resultByte, "binary", function (error) { + fs.appendFile(main.transportFilePath, resultByte, "binary", function (error) { if (error) { console.log(error); } diff --git a/car_net/stFlashServer/main.js b/car_srv/src/main.js similarity index 66% rename from car_net/stFlashServer/main.js rename to car_srv/src/main.js index 277ed9b2c3e..71e0f37c17d 100644 --- a/car_net/stFlashServer/main.js +++ b/car_srv/src/main.js @@ -10,9 +10,9 @@ const fs = require("fs"); commander .version('1.0.0') - .option('-p, --protopath [path]', 'path to dir with proto files. need here carkot.proto and route.proto. default ./proto/') - .option('-b, --binfile [path]', 'path to save bin file with name f.bin. default ./') - .option('-t, --transportfile [path]', 'path to trasport file for connect to mcu default ./mcu') + .option('-p, --proto [path]', 'path to dir with proto files. need here carkot.proto and route.proto. default ./proto/') + .option('-f, --flash [path]', 'path to save bin file with name f.bin. default ./') + .option('-s, --serial [path]', 'path to file that represents MCU serial port default ./serial') .parse(process.argv); //add slash to end of paths if need @@ -21,9 +21,9 @@ if (commander.protopath) { commander.protopath = commander.protopath + "/"; } } -if (commander.binfile) { - if (commander.binfile.substr(commander.binfile.length - 1) != "/") { - commander.binfile = commander.binfile + "/"; +if (commander.flash) { + if (commander.flash.substr(commander.flash.length - 1) != "/") { + commander.flash = commander.flash + "/"; } } @@ -34,8 +34,8 @@ var executeShell = "./st-flash"; exports.protoConstructorCarkot = builderCarkot.build("carkot"); exports.protoConstructorControl = builderControl.build("carkot"); exports.commandPrefix = executeShell + " write"; -exports.binFilePath = (commander.binfile ? commander.binfile : "./") + "f.bin"; -exports.transportFilePath = (commander.transportfile ? commander.transportfile : "./mcu"); +exports.binFilePath = (commander.flash ? commander.flash : "./") + "st-flash"; +exports.transportFilePath = (commander.serial ? commander.serial : "./serial"); var handlers = require("./handlers.js"); var handle = {}; @@ -44,10 +44,11 @@ handle["/loadBin"] = handlers.loadBin; handle["/control"] = handlers.control; handle["/other"] = handlers.other; -fs.access(executeShell, fs.F_OK, function (error) { +/*fs.access(executeShell, fs.F_OK, function (error) { if (!error) { server.start(router.route, handle); } else { console.log("file " + executeShell + " not found. Copy this file to server root dir"); } -}); +});*/ +server.start(router.route, handle); diff --git a/car_net/stFlashServer/package.json b/car_srv/src/package.json similarity index 100% rename from car_net/stFlashServer/package.json rename to car_srv/src/package.json diff --git a/car_net/stFlashServer/proto/carkot.proto b/car_srv/src/proto/carkot.proto similarity index 100% rename from car_net/stFlashServer/proto/carkot.proto rename to car_srv/src/proto/carkot.proto diff --git a/car_net/stFlashServer/proto/route.proto b/car_srv/src/proto/route.proto similarity index 100% rename from car_net/stFlashServer/proto/route.proto rename to car_srv/src/proto/route.proto diff --git a/car_net/stFlashServer/router.js b/car_srv/src/router.js similarity index 100% rename from car_net/stFlashServer/router.js rename to car_srv/src/router.js diff --git a/car_net/stFlashServer/server.js b/car_srv/src/server.js similarity index 100% rename from car_net/stFlashServer/server.js rename to car_srv/src/server.js