Изменение скриптов сборки, исправление ошибки вывода сообщения команды 1901312239

KSM-Line-2.2.tprusr

@@ -6,8 +6,8 @@ cursor=465
 opened=yes
 breakpoints=
 [file2]
-line=68
+line=0
-cursor=1487
+cursor=213
 opened=yes
 breakpoints=
 [file3]
@@ -26,9 +26,9 @@ cursor=161
 opened=no
 breakpoints=
 [file6]
-line=45
+line=53
-cursor=2144
+cursor=2281
-opened=yes
+opened=active
 breakpoints=
 [file7]
 line=106
@@ -45,7 +45,7 @@ line=0
 cursor=0
 opened=no
 [file10]
-line=168
+line=126
 cursor=5269
 opened=yes
 breakpoints=
@@ -82,11 +82,11 @@ breakpoints=
 [file17]
 line=0
 cursor=293
-opened=active
+opened=yes
 breakpoints=
 [file18]
 line=0
-cursor=500
+cursor=456
 opened=yes
 breakpoints=
 [file19]

command.tc

@@ -65,7 +65,7 @@ string cmd_debug_sensors(string params){
 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");
+	return "Debug relay reply SET="+(config.debug.RelayReply? "TRUE":"FALSE");
 }
 
 string cmd_debug_enc_level(string params){

global.th

@@ -9,7 +9,7 @@
 	#message "link global not defined"
 #endif
 
-#define VERSION "2.0b_1901311830"
+#define VERSION "2.0b_1901312239"
 #define MAX_FIFO_SIZE 20
 #define BRAKER_COUNT 3
 
@@ -116,3 +116,5 @@ extern BrakerProcess brakers[BRAKER_COUNT];
 
 
 
+
+

make.cmd

@@ -2,7 +2,14 @@
 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%"
+set comment=‘¡®àª  %dat%
+set /p comment2="‚¢¥¤¨â¥ ®¯¨á ­¨¥ ᡮન ['%comment%'] "
+if "%comment2%"=="" (
+	set comment2=%comment%
+) ELSE (
+	set comment2=%comment2% %dat%
+)
+git commit -a -m "%comment2%"
 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 
 "C:\Program Files (x86)\Tibbo\TIDE\Bin\tmake.exe" -r -p "C:\Program Files (x86)\Tibbo\TIDE\Platforms" KSM-Line-2.2_tpp3.tpr 

premake.js

@@ -16,21 +16,17 @@ for (line in lines){
 	var sect = "";
 	if (l.startsWith("[")){
 		sect = l;
-//		console.log(l);
 	}
 	if (sect.trim().localeCompare("[project]")){
 		if (l.startsWith("platform=")){
 			o1 = "platform=TPP2W(G2)";
 			o2 = "platform=TPP3W(G2)";
-//			console.log(o1);
 		}else if (l.startsWith("name=")){
 			o1 = "name=KSM-Line-2.0_"+dt
 			o1 = "name=KSM-Line-2.0_"+dt
-//			console.log(o1);
 		}else if (l.startsWith("output=")){
 			o1 = "output=KSM-Line-2.0.tpp2."+dt+".tpc";
 			o2 = "output=KSM-Line-2.0.tpp3."+dt+".tpc";
-//			console.log(o1);
 		}
 
 	}
@@ -38,8 +34,8 @@ for (line in lines){
 	out2 +=	o2 +"\n";
 }
 
-fs.writeFile("KSM-Line-2.2_tpp2.tpr", out1 , function(err){ console.log("tpp2")});
+fs.writeFile("KSM-Line-2.2_tpp2.tpr", out1 , function(err){ console.log("Prepare project for TPP2")});
-fs.writeFile("KSM-Line-2.2_tpp3.tpr", out2 , function(err){ console.log("tpp3")});
+fs.writeFile("KSM-Line-2.2_tpp3.tpr", out2 , function(err){ console.log("Prepare project for TPP3")});
 
 file = getFile("global.th");
 lines = file.toString().split("\n")
@@ -47,22 +43,21 @@ 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")});
+fs.writeFile("global.th", out1 , function(err){ console.log("Prepare 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";
-fs.writeFile("postmake.cmd", postmake , function(err){ console.log("postmake")});
+fs.writeFile("postmake.cmd", postmake , function(err){ console.log("Prepare postmake.cmd")});
 
 postmake = "wget --show-progress -q -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 --show-progress -q -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("up/app.sh", postmake , function(err){ console.log("Prepare app.sh")});