diff --git a/scripts/lualogic.cs b/scripts/lualogic.cs index eba3192..5107a2a 100644 --- a/scripts/lualogic.cs +++ b/scripts/lualogic.cs @@ -123,5 +123,5 @@ function llr(){ //resetAllOpCallFunc(); exec("./lualogic.cs"); - schedule(3000, 0, lualogic_connect, 25000); + schedule(1000, 0, lualogic_connect, 25000); } diff --git a/scripts/tcp.cs b/scripts/tcp.cs index c1f5557..f56c967 100644 --- a/scripts/tcp.cs +++ b/scripts/tcp.cs @@ -95,7 +95,6 @@ function LuaLogicTCP::onLine(%this, %line) for(%i=0; %i<%argc; %i++){ %data = nextToken(%data, av, "\t"); %argv[%i] = lualogic_collapseescape(%av); - //talk("argv[" @ %i @ "] = " @ %argv[%i]); } if(isObject(%brick)){ diff --git a/scripts/utilities.cs b/scripts/utilities.cs index cf6f916..ab12707 100644 --- a/scripts/utilities.cs +++ b/scripts/utilities.cs @@ -5,14 +5,10 @@ function lualogic_registergatedefinition(%data){ //handled automatically now } -function lualogic_registergatedefinition_auto(%data) -{ +function lualogic_registergatedefinition_auto(%data){ if(!isObject(%data)) return; - //if(%data.luaLogic_isRegistered) - //return; - %id = %data.getID(); if((%idx = $LuaLogic::GateDefinitionIDX[%id]) $= "") @@ -21,25 +17,26 @@ function lualogic_registergatedefinition_auto(%data) $LuaLogic::GateDefinitionIDX[%id] = %idx; $LuaLogic::NumGateDefintions++; } - + + %numports = %data.numLogicPorts; + %def = %id @ ";" @ %data.logicUIName @ ";" @ %data.logicUIDesc @ ";" @ lualogic_expandescape(%data.logicInit) @ ";" @ lualogic_expandescape(%data.logicUpdate) @ ";" @ lualogic_expandescape(%data.logicInput) @ ";" @ - (%ports = %data.numLogicPorts) + lualogic_expandescape(%data.logicGlobal) @ ";" @ + %numports ; - for(%i = 0; %i < %ports; %i++) + for(%i = 0; %i < %numports; %i++) { - %def = %def @";"@ %data.logicPortType[%i] @";"@ %data.logicPortPos[%i] @";"@ %data.logicPortDir[%i] - @";"@ (%data.logicPortCauseUpdate[%i] == true) @";"@ %data.logicPortUIName[%i]; + %def = %def @ ";" @ %data.logicPortType[%i] @ ";" @ %data.logicPortPos[%i] @ ";" @ %data.logicPortDir[%i] + @ ";" @ (%data.logicPortCauseUpdate[%i] == true) @ ";" @ %data.logicPortUIName[%i]; } - - $LuaLogic::GateDefintion[%idx] = %def; - //%data.luaLogic_isRegistered = true; + $LuaLogic::GateDefintion[%idx] = %def; } function lualogic_registerAllGateDefinitions(){