From 64a612b8ae9e47fd9871e4b8c799340072199b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=BE=D0=BA=D1=80=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 31 Jan 2019 18:30:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=2019013118?= =?UTF-8?q?30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KSM-Line-2.2.tprusr | 22 +++++++++++----------- README.md | 19 ++++++++++++++++++- command.tc | 9 +++++++++ command.th | 1 + global.th | 9 ++++++++- make.cmd | 6 +----- net.tc | 8 ++++++++ net.th | 3 ++- premake.js | 22 +++++++++++++++++++--- relay.tc | 3 +++ 10 files changed, 80 insertions(+), 22 deletions(-) diff --git a/KSM-Line-2.2.tprusr b/KSM-Line-2.2.tprusr index 25756fc..fc18314 100644 --- a/KSM-Line-2.2.tprusr +++ b/KSM-Line-2.2.tprusr @@ -7,7 +7,7 @@ opened=yes breakpoints= [file2] line=68 -cursor=1100 +cursor=1487 opened=yes breakpoints= [file3] @@ -26,19 +26,19 @@ cursor=161 opened=no breakpoints= [file6] -line=108 -cursor=1395 +line=45 +cursor=2144 opened=yes breakpoints= [file7] -line=0 -cursor=2450 +line=106 +cursor=2777 opened=yes breakpoints= [file8] line=0 -cursor=172 -opened=no +cursor=407 +opened=yes breakpoints= [file9] line=0 @@ -81,12 +81,12 @@ opened=no breakpoints= [file17] line=0 -cursor=20 -opened=no +cursor=293 +opened=active breakpoints= [file18] line=0 -cursor=295 +cursor=500 opened=yes breakpoints= [file19] @@ -97,7 +97,7 @@ breakpoints= [file20] line=48 cursor=2344 -opened=active +opened=yes breakpoints= [file21] line=0 diff --git a/README.md b/README.md index 6966ce2..94543d1 100644 --- a/README.md +++ b/README.md @@ -1 +1,18 @@ -"# tibbo_line" +# tibbo_line + +Команды реализованные + +systeminfo - возвращает информацию о версии текущей прошивки и время прошедшее с момента включения контроллера Tibbo +reset или reboot - перезагрузка контроллера +ip - установка ip адреса контроллера. Изменения вступают в силу после перезагрузки. Формат - ip=192.168.123.10 +setbraker - настройка брокиратора +setencoder - настройка энкодера +enc_calibrate_start - запуск процедуры калибровки. Параметер - режим работы энкодера. пока только "1" +enc_calibrate_end - остановка процедуры калибровки +enc_set_windows - установка размера разрешенного окна энкодера. Параметер от 0 до 100. по умолчанию - 40 + +# команды отладки +debug_enc_level - уровени вывода сообщений отладки энкодера. Параметер от 0 до 4. По умолчанию - 0 +debug_relay_reply - Вывод ответного сообщения при включении реле. Параметер - 0/1. По умолчанию - 0 +debug_sensors - Вывод информации об отправке сигнала датчика в порт диагностики. Параметер - 0/1. По умолчанию - 0 +debug_showtime - Показ в сообщении диагностики времени с момента включения. Параметер - 0/1. По умолчанию - 0 diff --git a/command.tc b/command.tc index 1460799..0624051 100644 --- a/command.tc +++ b/command.tc @@ -40,6 +40,8 @@ void on_sock_inband() // обработка поступивших команд cmd_replay(cmd_enc_set_windows(params)); }else if (cmd == "debug_enc_level"){ cmd_replay(cmd_debug_enc_level(params)); + }else if (cmd == "debug_relay_reply"){ + cmd_replay(cmd_debug_relay_reply(params)); }else if (cmd == "debug_sensors"){ cmd_replay(cmd_debug_sensors(params)); }else if (cmd == "debug_showtime"){ @@ -59,6 +61,13 @@ string cmd_debug_sensors(string params){ config.debug.SensorsLook = val(pars[0])>0; return "Debug sensors SET="+(config.debug.SensorsLook? "TRUE":"FALSE"); } + +string cmd_debug_relay_reply(string params){ + getParams(params); + config.debug.RelayReply = val(pars[0])>0; + return "Debug sensors SET="+(config.debug.RelayReply? "TRUE":"FALSE"); +} + string cmd_debug_enc_level(string params){ getParams(params); config.debug.EncoderDebug= val(pars[0]); diff --git a/command.th b/command.th index ffecf54..8c613b5 100644 --- a/command.th +++ b/command.th @@ -11,3 +11,4 @@ string cmd_debug_enc_level(string params); string cmd_debug_sensors(string params); string cmd_debug_showtime(string params); void getParams(string params); +string cmd_debug_relay_reply(string params); diff --git a/global.th b/global.th index cd022fe..136a54e 100644 --- a/global.th +++ b/global.th @@ -9,7 +9,7 @@ #message "link global not defined" #endif -#define VERSION "2.0b" +#define VERSION "2.0b_1901311830" #define MAX_FIFO_SIZE 20 #define BRAKER_COUNT 3 @@ -80,6 +80,7 @@ typedef struct DebugConf{ bool SensorsLook; bool ShowTime; int EncoderDebug; + bool RelayReply; }; typedef struct Configuration{ @@ -109,3 +110,9 @@ extern unsigned char state[SENSORS]; extern BrakerProcess brakers[BRAKER_COUNT]; + + + + + + diff --git a/make.cmd b/make.cmd index 4376cee..f0ce48f 100644 --- a/make.cmd +++ b/make.cmd @@ -1,13 +1,9 @@ @echo off -node premake.js echo Y|del up\*.* +node premake.js set dat=%date:~8,2%%date:~3,2%%date:~0,2%%time:~0,2%%time:~3,2% git commit -a -m "ઠ %dat%" git push "C:\Program Files (x86)\Tibbo\TIDE\Bin\tmake.exe" -r -p "C:\Program Files (x86)\Tibbo\TIDE\Platforms" KSM-Line-2.2_tpp2.tpr -rem ren KSM-Line-2.0.tpc KSM-Line-2.0.tpp2.%dat%.tpc -rem copy KSM-Line-2.0.tpp2.%dat%.tpc up\KSM-Line-2.0.tpp2.%dat%.tpc.zip "C:\Program Files (x86)\Tibbo\TIDE\Bin\tmake.exe" -r -p "C:\Program Files (x86)\Tibbo\TIDE\Platforms" KSM-Line-2.2_tpp3.tpr -rem ren KSM-Line-2.0.tpc KSM-Line-2.0.tpp3.%dat%.tpc -rem copy KSM-Line-2.0.tpp3.%dat%.tpc up\KSM-Line-2.0.tpp3.%dat%.tpc.zip call postmake.cmd \ No newline at end of file diff --git a/net.tc b/net.tc index f552f00..ec3eeba 100644 --- a/net.tc +++ b/net.tc @@ -123,6 +123,14 @@ void send_sensor(int number, bool state){ sock.send(); } } + +void net_send_data(int sock_num,string data){ + int n = sock.num; + sock.num = sock_num; + sock.setdata(data); + sock.send(); + sock.num = n; +} void on_sock_data_arrival() { switch (sock.num){ diff --git a/net.th b/net.th index 6deb665..7171de0 100644 --- a/net.th +++ b/net.th @@ -6,4 +6,5 @@ void net_relay_handle(string message); void net_diag_handle(string message); void net_config_handle(string message); void net_sensor_handle(string message); -void send_sensor(int number, bool state); \ No newline at end of file +void send_sensor(int number, bool state); +void net_send_data(int sock_num,string data); \ No newline at end of file diff --git a/premake.js b/premake.js index 976b729..a972770 100644 --- a/premake.js +++ b/premake.js @@ -41,12 +41,28 @@ for (line in lines){ fs.writeFile("KSM-Line-2.2_tpp2.tpr", out1 , function(err){ console.log("tpp2")}); fs.writeFile("KSM-Line-2.2_tpp3.tpr", out2 , function(err){ console.log("tpp3")}); +file = getFile("global.th"); +lines = file.toString().split("\n") +out1 = ''; +for (line in lines){ + var l = lines[line]; + if (l.includes("#define VERSION ")){ +// var ver = l.replace("#define VERSION",'').trim().trim('"').split("_")[0]; + var ver = l.replace("#define VERSION",'').trim().replace('\"','').replace('\"','').split("_")[0]; + l = '#define VERSION "'+ver+'_'+dt+'"\r'; + } + out1 += l+"\n"; +} +fs.writeFile("global.th", out1 , function(err){ console.log("global.th")}); + var postmake = ""; postmake += "copy KSM-Line-2.0.tpp2."+dt+".tpc up\\KSM-Line-2.0.tpp2."+dt+".tpc.zip\r\n"; postmake += "copy KSM-Line-2.0.tpp3."+dt+".tpc up\\KSM-Line-2.0.tpp3."+dt+".tpc.zip\r\n"; postmake += "move KSM-Line-2.0.tpp2."+dt+".tpc bin\\KSM-Line-2.0.tpp2."+dt+".tpc\r\n"; postmake += "move KSM-Line-2.0.tpp3."+dt+".tpc bin\\KSM-Line-2.0.tpp3."+dt+".tpc\r\n"; -postmake += "echo wget -c -O ./KSM-Line-2.0.tpp2."+dt+".tpc http://available-we.azurewebsites.net/tibbo/KSM-Line-2.0.tpp2."+dt+".tpc.zip >up\\app.sh\r\n"; -postmake += "echo wget -c -O ./KSM-Line-2.0.tpp3."+dt+".tpc http://available-we.azurewebsites.net/tibbo/KSM-Line-2.0.tpp3."+dt+".tpc.zip >>up\\app.sh\r\n"; +fs.writeFile("postmake.cmd", postmake , function(err){ console.log("postmake")}); + +postmake = "wget -c -O ./KSM-Line-2.0.tpp2."+dt+".tpc http://available-we.azurewebsites.net/tibbo/KSM-Line-2.0.tpp2."+dt+".tpc.zip\n"; +postmake += "wget -c -O ./KSM-Line-2.0.tpp3."+dt+".tpc http://available-we.azurewebsites.net/tibbo/KSM-Line-2.0.tpp3."+dt+".tpc.zip\n"; +fs.writeFile("up/app.sh", postmake , function(err){ console.log("postmake")}); -fs.writeFile("postmake.cmd", postmake , function(err){ console.log("postmake")}); \ No newline at end of file diff --git a/relay.tc b/relay.tc index cc08f4c..64a68c5 100644 --- a/relay.tc +++ b/relay.tc @@ -13,6 +13,9 @@ void relay_init(){ void relay_set(int number, bool state) { + if (config.debug.RelayReply){ + net_send_data(1,"+"+str(number)+str((state? 1:0))+"\r\n"); + } #if PLATFORM_ID != SIMULATOR io.lineset(OUTPIN[number-1],!state ); #endif