Merge branch 'master' of github.com:Robocup-ssl-China/rocos

Robocup-ssl-China · Jul 14, 2022 · 8d9cac2 · 8d9cac2
2 parents 05bafc8 + 34b7873
commit 8d9cac2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Client/src/actionmodule_nan.cpp b/Client/src/actionmodule_nan.cpp
@@ -275,7 +275,7 @@ void encodeLegacy(const NJ_Command& command,QByteArray& tx,int num){
 
 
     // shoot power
-    quint8 p = std::max(10.0, std::min((double)power, 127.0));
+    quint8 p = command.power > 0.01 ? std::max(10.0, std::min((double)power, 127.0)) : 0;
     TXBuff[6*i + 8] = p;
 
 }

diff --git a/ZBin/lua_scripts/SelectPlay.lua b/ZBin/lua_scripts/SelectPlay.lua
@@ -24,7 +24,7 @@ function RunRefScript(name)
 end
 
 function SelectRefPlay()
-	local curRefMsg = vision:getLuaRefereeMsg()
+	local curRefMsg = vision:getCurrentRefereeMsg()
 	debugEngine:gui_debug_msg(CGeoPoint:new_local(1000,1000),curRefMsg)
 	if curRefMsg == "" then
 		gLastRefMsg = curRefMsg