Narvaling
/
OliviaAddInPro
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Buscando fallo conexión oliviaTasks

Elena/develop
Elena 2022-03-27 13:14:38 +02:00
parent 7a768e20e9
commit 1f50e37fe1
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Conexion/Cstr_socket.cs
View File

@ -116,25 +116,25 @@ namespace OliviaAddIn
} }
} }
//funciones auxiliares------------------------------ //funciones auxiliares------------------------------
[DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern IntPtr str_socket_crea(); unsafe public static extern IntPtr str_socket_crea();
[DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto); unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto);
[DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern int str_socket_envia(IntPtr soc, String txt); unsafe public static extern int str_socket_envia(IntPtr soc, String txt);//solo este
[DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern int str_socket_recive(IntPtr soc); unsafe public static extern int str_socket_recive(IntPtr soc);
[DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern void str_socket_dame_buf(IntPtr soc, StringBuilder buf); unsafe public static extern void str_socket_dame_buf(IntPtr soc, StringBuilder buf);
[DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern void str_socket_dame_error(IntPtr soc, StringBuilder error);//llamar con 1024 de espacio unsafe public static extern void str_socket_dame_error(IntPtr soc, StringBuilder error);//llamar con 1024 de espacio
[DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern void str_socket_borra(IntPtr soc); unsafe public static extern void str_socket_borra(IntPtr soc);
} }
} }

2
Services/LanzaSrv/LanzaOlvServ.cs
View File

@ -105,7 +105,7 @@ namespace OliviaAddInPro.Services.LanzaSrv
GeneralDef.EjecGeoParamSep + GeneralDef.GG_port + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.Puerto + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_port + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.Puerto + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_tout + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.TiempoOutSocket + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_tout + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.TiempoOutSocket + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pt + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathTemp + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_pt + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathTemp + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + " "; GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + "D:\\Proyectos\\Olivia\\Instal2.0\\cfg.ini";
pfi = new ProcessStartInfo(OliviaGlob.Paths.PathExeOlivia, args); pfi = new ProcessStartInfo(OliviaGlob.Paths.PathExeOlivia, args);
System.Diagnostics.Process.Start(pfi); System.Diagnostics.Process.Start(pfi);

10
Services/ProcesoEjecServ.cs
View File

@ -13,9 +13,9 @@ namespace OliviaAddInPro.Services
public class ProcesoEjecServ public class ProcesoEjecServ
{ {
Cstr_socket soc = null; Cstr_socket soc = null;
int m_out; int m_out=0;
int m_miliseconds; int m_miliseconds=200;
int m_tm_progr; int m_tm_progr=1000;
int modo_fin = 0; int modo_fin = 0;
bool cancela = false; bool cancela = false;
bool cancela_fin = false; bool cancela_fin = false;
@ -66,7 +66,7 @@ namespace OliviaAddInPro.Services
private Respuesta<TiposEjecucion> run() private Respuesta<TiposEjecucion> run()
{ {
int nint = 0; int nint = 0;
int nint_max = 10; int nint_max = 5;
bool sal = false; bool sal = false;
bool first_send_cfg = true; bool first_send_cfg = true;
bool fin = false; bool fin = false;
@ -87,7 +87,7 @@ namespace OliviaAddInPro.Services
if (nint >= nint_max) if (nint >= nint_max)
{ {
res.Error.Add("Error en la comunicación con OliviaTask"); res.Error.Add("Error en la comunicación con OliviaTask");
var act = new Respuesta<TiposActu>() { Value = TiposActu.ActuMal }; var act = new Respuesta<TiposActu>() { Value = TiposActu.ActuFinNOk };
act.Error.AddRange(res.Error); act.Error.AddRange(res.Error);
actualiza(act); actualiza(act);
sal = true; sal = true;

2
ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs
View File

@ -23,7 +23,7 @@ namespace OliviaAddInPro
{ {
numPtosCtrl = numSect = 3; numPtosCtrl = numSect = 3;
checkAjustSect = checkSectAuto = false; checkAjustSect = checkSectAuto = false;
checkIgnoAis = true; checkIgnoAis = false;
enableNSect = true; enableNSect = true;
} }