diff --git a/IOB-WIN/DATA/CONF/IOB.ini b/IOB-WIN/DATA/CONF/IOB.ini
index 6453d00b..b712436d 100644
--- a/IOB-WIN/DATA/CONF/IOB.ini
+++ b/IOB-WIN/DATA/CONF/IOB.ini
@@ -36,3 +36,8 @@ MAX_COUNTER_BLINK = 15
;bit7 = 0
BLINK_FILT=0
;BLINK_FILT=28
+
+[OPTPAR]
+;COUNTMODE=STD|BIT
+COUNTMODE=BIT
+COUNTMEMADDR=X7.1
\ No newline at end of file
diff --git a/IOB-WIN/IobConfiguration.cs b/IOB-WIN/IobConfiguration.cs
index 830a8ec3..34b1f4ad 100644
--- a/IOB-WIN/IobConfiguration.cs
+++ b/IOB-WIN/IobConfiguration.cs
@@ -20,7 +20,6 @@ namespace IOB_WIN
[Serializable]
public class IobConfiguration
{
-
///
/// Codice univoco IOB
///
@@ -53,7 +52,10 @@ namespace IOB_WIN
/// Valore intero corrispondente ai BIT da filtrare x blinking
///
public int BLINK_FILT;
-
+ ///
+ /// Dizionario dei parametri opzionali
+ ///
+ public Dictionary optPar;
///
/// Avvio configurazione DUMMY
///
@@ -67,6 +69,7 @@ namespace IOB_WIN
serverData = new serverMapo("127.0.0.1", "/", "/IOB/input/", "/IOB/flog/", "/IOB", "/IOB/enabled/", "/sendReboot.aspx?idxMacchina=");
MAX_COUNTER_BLINK = 10;
BLINK_FILT = 0;
+ optPar = new Dictionary();
}
}
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index 151bb573..bb2a8b86 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -278,21 +278,6 @@ namespace IOB_WIN
public override string getPrgName()
{
string prgName = "";
- // vecchia versione con prg corrente...
-#if false
- CncLib.Focas1.ODBEXEPRG answ = FANUC_ref.getPrgName();
- try
- {
- // nome prg bonificato!
- string nome = utils.purgedChar2String(answ.name);
- //string nome = new string(answ.name.Where(c => char.IsLetter(c) || char.IsDigit(c)).ToArray());
- prgName = string.Format("{0}|{1}", answ.o_num, nome);
- }
- catch (Exception exc)
- {
- lg.Error(exc, "Errore in getPrgName");
- }
-#endif
// recupero NUOVO prgName...
try
{
@@ -305,6 +290,20 @@ namespace IOB_WIN
{
lg.Error(string.Format("Eccezione in recupero PRG NAME MAIN:{0}{1}", Environment.NewLine, exc));
}
+ // vecchia versione con prg corrente...
+#if false
+ CncLib.Focas1.ODBEXEPRG answ = FANUC_ref.getPrgName();
+ try
+ {
+ // nome prg bonificato!
+ string nome = utils.purgedChar2String(answ.name);
+ prgName = string.Format("{0}|{1}", answ.o_num, nome);
+ }
+ catch (Exception exc)
+ {
+ lg.Error(exc, "Errore in getPrgName");
+ }
+#endif
return prgName;
}
@@ -346,10 +345,11 @@ namespace IOB_WIN
///
public override void processContapezzi()
{
-
- //base.processContapezzi();
if (utils.CRB("enableContapezzi"))
{
+ // verifico quale modalità sia richiesta: STD (6711) oppure BIT (CUstom, con indicazione area)
+
+
try
{
object output = new object();
diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs
index 01cc8c1e..c811f979 100644
--- a/IOB-WIN/MainForm.cs
+++ b/IOB-WIN/MainForm.cs
@@ -540,7 +540,18 @@ namespace IOB_WIN
displayTaskAndLog(string.Format("Loading iniConfFile: {0}", iniConfFile));
IniFile fIni = new IniFile(iniConfFile);
+ // verifico tipo adapter
tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO"));
+ // carivo vettore parametri opzionai
+ Dictionary optPar = new Dictionary();
+ string[] optParRaw = fIni.ReadSection("OPTPAR");
+ lg.Info("------------OPT PAR------------");
+ foreach (var item in optParRaw)
+ {
+ lg.Info(item);
+ }
+ lg.Info("------------OPT PAR------------");
+ // inizializzio conf IOB
IOBConf = new IobConfiguration
{
tipoIob = tipoScelto,
diff --git a/IOB-WIN/Resources/ChangeLog.html b/IOB-WIN/Resources/ChangeLog.html
index 88e7df34..a4cb88f7 100644
--- a/IOB-WIN/Resources/ChangeLog.html
+++ b/IOB-WIN/Resources/ChangeLog.html
@@ -17,6 +17,7 @@
FIX visualizzazione dati FluxLog e URL inviati
FIX MAIN program da FANUC (non il current)
Inserita modalità DUMP memoria (iniziale full + periodica)
+ Inserimento gestione contapezzi standard/checkBit in IOB.cfg