Version 6.20

ricardolo · ricardolo · commit a034f89b14c1 · 2020-11-10T11:27:16.000-03:00
diff --git a/db/db_cold/create_hist.sql b/db/db_cold/create_hist.sql
@@ -4,7 +4,8 @@ CREATE TABLE "hist" (
    "VALOR" Real NOT NULL,
    "FLAGS" Integer NOT NULL,
    "DATA" Integer NOT NULL,
-   PRIMARY KEY (NPONTO, DATA)
+   "FIELDTS" Integer DEFAULT 0,
+   PRIMARY KEY (NPONTO, DATA, FIELDTS)
    );
 -- CREATE INDEX ind_data on "hist" ( DATA );
 
diff --git a/db/pragmas_hist.sql b/db/pragmas_hist.sql
@@ -1,5 +1,5 @@
 .timeout 9000
 PRAGMA temp_store = MEMORY;
-PRAGMA synchronous = NORMAL;
+PRAGMA synchronous = OFF;
 PRAGMA journal_mode = WAL;
 
diff --git a/docs/oshmi_configuration_manual-en_us.odt b/docs/oshmi_configuration_manual-en_us.odt
diff --git a/htdocs/annotation.php b/htdocs/annotation.php
@@ -91,7 +91,7 @@
       {
       $pdo = new PDO( 'sqlite:../db/notes.sl3','','', [
         PDO::ATTR_TIMEOUT => ($filtag!="" || $filcontent!="")?0:5,
-        PDO::SQLITE_ATTR_OPEN_FLAGS => PDO::SQLITE_OPEN_READONLY,
+        // PDO::SQLITE_ATTR_OPEN_FLAGS => PDO::SQLITE_OPEN_READONLY, // THIS FLAG CAUSES ERRORS
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
         ] );
       $pdo->exec ( "PRAGMA query_only=TRUE" );
diff --git a/htdocs/annotation_readonly.php b/htdocs/annotation_readonly.php
@@ -91,7 +91,7 @@
       {
       $pdo = new PDO( 'sqlite:../db/notes.sl3','','', [
         PDO::ATTR_TIMEOUT => ($filtag!="" || $filcontent!="")?0:5,
-        PDO::SQLITE_ATTR_OPEN_FLAGS => PDO::SQLITE_OPEN_READONLY,
+        // PDO::SQLITE_ATTR_OPEN_FLAGS => PDO::SQLITE_OPEN_READONLY, // THIS FLAG CAUSES ERRORS
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
         ] );
       $pdo->exec ( "PRAGMA query_only=TRUE" );
diff --git a/i18n/go-uk_ua.bat b/i18n/go-uk_ua.bat
@@ -0,0 +1,5 @@
+cd c:\oshmi\i18n
+copy messages_i18n-uk_ua.ini messages_i18n.ini
+copy messages_i18n-uk_ua.js  messages_i18n.js
+cd c:\oshmi\docs
+copy oshmi_operation_manual-en_us.pdf oshmi_operation_manual.pdf
diff --git a/i18n/messages_i18n-en_us.js b/i18n/messages_i18n-en_us.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: 'OSHMI',
-VersaoProduto: '6.18',
+VersaoProduto: '6.20',
 
 NomeVisorTelas:       'Screen Viewer',
 NomeVisorEventos:     'Events Viewer',
diff --git a/i18n/messages_i18n-pt_br.js b/i18n/messages_i18n-pt_br.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: 'OSHMI',
-VersaoProduto: '6.18',
+VersaoProduto: '6.20',
 
 NomeVisorTelas:       'Visor de Telas',
 NomeVisorEventos:     'Visor de Eventos',
diff --git a/i18n/messages_i18n-uk_ua.js b/i18n/messages_i18n-uk_ua.js
@@ -4,7 +4,7 @@
 var Msg =
 {
     NomeProduto: 'OSHMI',
-    VersaoProduto: '6.18',
+    VersaoProduto: '6.20',
 
     NomeVisorTelas: 'Перегляд ',
     NomeVisorEventos: 'Події',
diff --git a/i18n/messages_i18n.js b/i18n/messages_i18n.js
@@ -4,7 +4,7 @@
 var Msg =
 {
 NomeProduto: 'OSHMI',
-VersaoProduto: '6.18',
+VersaoProduto: '6.20',
 
 NomeVisorTelas:       'Visor de Telas',
 NomeVisorEventos:     'Visor de Eventos',
diff --git a/installer/oshmi.nsi b/installer/oshmi.nsi
@@ -11,8 +11,8 @@ RequestExecutionLevel user
 
 ;--------------------------------
 
-!define VERSION "v.6.18"
-!define VERSION_ "6.18.0.0"
+!define VERSION "v.6.20"
+!define VERSION_ "6.20.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(i 0, i 0, t "MutexOshmiInstall") i .r1 ?e'
diff --git a/installer/release_notes.txt b/installer/release_notes.txt
@@ -186,6 +186,34 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 6.20:
+
+WARNING! Due to hist.sl3 table format change, old hist.sl3 tables must be replaced by the table with new format!
+After upgrading version, replace c:\oshmi\db\hist.sl3 by c:\oshmi\db\db_cold\hist.sl3.
+Alternatively delete c:\oshmi\db\hist.sl3 before upgrading to 6.20 version.
+
+Webserver:
+ - Updated to version 6.20.
+ - Changed hist.sl3 table format to add FIELDTS column to record field timestamp.
+
+Screen Viewer:
+ - Fixed PHP/SQLite error related to documental annotations.
+
+-------------------------------------------------------------------
+
+Notes for version 6.19:
+
+DNP3 Client Driver:
+ - Updated to version 0.77.
+ - Send timestamp data for analog points when available (via I104M).
+
+Webserver:
+ - Updated to version 6.19.
+ - Added formula 56 (ON for 2 single points for a double state ok and valid).
+ - Added formula 57 (ON for a double state point ok and valid).
+
+-------------------------------------------------------------------
+
 Notes for version 6.18:
 
 DNP3 Client Driver:
diff --git a/webserver/bcolocal.cpp b/webserver/bcolocal.cpp
@@ -4,7 +4,7 @@
 //---------------------------------------------------------------------------
 /*
 OSHMI - Open Substation HMI
-	Copyright 2008-2019 - Ricardo L. Olsen
+	Copyright 2008-2020 - Ricardo L. Olsen
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1515,7 +1515,7 @@ if ( !((*it).second).EventoDigital )
 
     if ( grava )
       {
-      fmHist->PushVal( nponto, ((*it).second).Valor, ((*it).second).Qual.Byte, ((*it).second).TagTempo );
+      fmHist->PushVal( nponto, ((*it).second).Valor, ((*it).second).Qual.Byte, ((*it).second).TagTempo, ((*it).second).TagTempoEvento );
       ((*it).second).ValorHist = ((*it).second).Valor;
       ((*it).second).TickHist = tick;
       }
@@ -2415,7 +2415,7 @@ try
            {
            q.Duplo = ESTDUP_INDETERMINADO;
            r = FA_ESTFASIM_OFF;
-           }    
+           }
 
         q.Falha =  Pontos[(*it).second.Parcelas[0]].Qual.Falha | Pontos[(*it).second.Parcelas[1]].Qual.Falha;
 
@@ -2467,6 +2467,137 @@ try
                    Pontos[(*it).second.Parcelas[1]].Qual.Falha;
          q.Tipo = TIPO_ANALOGICO;
         break;
+    case COD_FORMULA_2SINGVALID:
+        {
+         // double bit from 2 single bit VALID
+        double tag;
+
+        r = Pontos[(*it).second.Parcelas[0]].Valor;
+        q.Byte = Pontos[(*it).second.Parcelas[0]].Qual.Byte;
+
+        if (Pontos[(*it).second.Parcelas[0]].Qual.Duplo == ESTDUP_ON &&
+            Pontos[(*it).second.Parcelas[1]].Qual.Duplo == ESTDUP_OFF)
+           {
+           q.Duplo = ESTDUP_ON;
+           r = FA_ESTFASIM_ON;
+           }
+        else
+        if (Pontos[(*it).second.Parcelas[0]].Qual.Duplo == ESTDUP_OFF &&
+            Pontos[(*it).second.Parcelas[1]].Qual.Duplo == ESTDUP_ON)
+           {
+           q.Duplo = ESTDUP_ON;
+           r = FA_ESTFASIM_ON;
+           }
+        else
+        if (Pontos[(*it).second.Parcelas[0]].Qual.Duplo == ESTDUP_ON &&
+            Pontos[(*it).second.Parcelas[1]].Qual.Duplo == ESTDUP_ON)
+           {
+           q.Duplo = ESTDUP_OFF;
+           r = FA_ESTFASIM_OFF;
+           }
+        else
+        if (Pontos[(*it).second.Parcelas[0]].Qual.Duplo == ESTDUP_OFF &&
+            Pontos[(*it).second.Parcelas[1]].Qual.Duplo == ESTDUP_OFF)
+           {
+           q.Duplo = ESTDUP_OFF;
+           r = FA_ESTFASIM_OFF;
+           }
+
+        q.Falha =  Pontos[(*it).second.Parcelas[0]].Qual.Falha | Pontos[(*it).second.Parcelas[1]].Qual.Falha;
+        if (q.Falha)
+           {
+           q.Duplo = ESTDUP_OFF;
+           r = FA_ESTFASIM_OFF;
+           }
+
+        // get time from latest
+        if (Pontos[(*it).second.Parcelas[0]].TagTempoEvento > Pontos[(*it).second.Parcelas[1]].TagTempoEvento)
+          tag = Pontos[(*it).second.Parcelas[0]].TagTempoEvento;
+        else
+          tag = Pontos[(*it).second.Parcelas[1]].TagTempoEvento;
+
+        // changed state: insert timstamp from source
+        if ( (*it).second.Qual.Duplo != q.Duplo )
+           if ( !(*it).second.AlarmeInibido() )
+              {
+              TDateTime dt=tag;
+
+              unsigned short year; unsigned short month; unsigned short day;
+              unsigned short hour; unsigned short min; unsigned short sec; unsigned short msec;
+              dt.DecodeDate(&year, &month, &day);
+              dt.DecodeTime(&hour, &min, &sec, &msec);
+
+              IncluiEvento( nponto,
+                            SDE_UTREVGERADO,
+                            q.Byte,
+                            year,
+                            month,
+                            day,
+                            hour,
+                            min,
+                            sec,
+                            msec
+                            );
+              temtagtmp = 1;
+              }
+        }
+        break;
+    case COD_FORMULA_DUPVALID:
+        {
+         // double bit from 2 single bit VALID
+        double tag;
+
+        r = Pontos[(*it).second.Parcelas[0]].Valor;
+        q.Byte = Pontos[(*it).second.Parcelas[0]].Qual.Byte;
+
+        if (Pontos[(*it).second.Parcelas[0]].Qual.Duplo == ESTDUP_ON ||
+            Pontos[(*it).second.Parcelas[1]].Qual.Duplo == ESTDUP_OFF)
+           {
+           q.Duplo = ESTDUP_ON;
+           r = FA_ESTFASIM_ON;
+           }
+        else
+           {
+           q.Duplo = ESTDUP_OFF;
+           r = FA_ESTFASIM_OFF;
+           }
+
+        q.Falha =  Pontos[(*it).second.Parcelas[0]].Qual.Falha;
+        if (q.Falha)
+           {
+           q.Duplo = ESTDUP_OFF;
+           r = FA_ESTFASIM_OFF;
+           }
+
+        // get time
+        tag = Pontos[(*it).second.Parcelas[0]].TagTempoEvento;
+
+        // changed state: insert timstamp from source
+        if ( (*it).second.Qual.Duplo != q.Duplo )
+           if ( !(*it).second.AlarmeInibido() )
+              {
+              TDateTime dt=tag;
+
+              unsigned short year; unsigned short month; unsigned short day;
+              unsigned short hour; unsigned short min; unsigned short sec; unsigned short msec;
+              dt.DecodeDate(&year, &month, &day);
+              dt.DecodeTime(&hour, &min, &sec, &msec);
+
+              IncluiEvento( nponto,
+                            SDE_UTREVGERADO,
+                            q.Byte,
+                            year,
+                            month,
+                            day,
+                            hour,
+                            min,
+                            sec,
+                            msec
+                            );
+              temtagtmp = 1;
+              }
+        }
+        break;
     default:
         q.Tipo = TIPO_ANALOGICO;
         q.Byte|=QUAL_FALHA;
@@ -2640,6 +2771,8 @@ TPonto &pt = BL.GetRefPonto( nponto, found );
 if ( !found )
   return -2;
 
+pt.TagTempoEvento = 0; // erase old field timestamp
+
 // se foi definida uma UTR na base para o ponto, s� atualiza o ponto se vier desta UTR
 if ( ( pt.UTR !=  0 ) &&
      ( pt.UTR != (signed) sec ) )
@@ -2747,6 +2880,23 @@ try
       case 35: // scaled c/ tag
           {
           analogico_seq * ana = (analogico_seq *) ptinfo;
+
+          if ( tipo == 34 || tipo == 35 )
+            { // trata tag de tempo longa
+            analogico_w_time7_seq * at7 = (analogico_w_time7_seq *) ptinfo;
+            TDateTime dtev;
+            try
+              {
+              dtev = EncodeDate( 2000 + ( at7->ano & 0x7f ), at7->mes & 0x0f, at7->dia & 0x1f ) +
+                     EncodeTime( at7->hora & 0x1f, at7->min & 0x3f, at7->ms / 1000, at7->ms % 1000 );
+              pt.TagTempoEvento = dtev;
+              }
+            catch ( Exception &E )
+              {
+              pt.TagTempoEvento = 0;
+              }
+            }
+
           double div;
           if ( tipo == 9 || tipo == 34 )
             div = 32767;
@@ -2782,6 +2932,22 @@ try
           {
           flutuante_seq * flut = (flutuante_seq *) ptinfo;
 
+          if ( tipo == 36 )
+            { // trata tag de tempo longa
+            flutuante_w_time7_seq * ft7 = (flutuante_w_time7_seq *) ptinfo;
+            TDateTime dtev;
+            try
+              {
+              dtev = EncodeDate( 2000 + ( ft7->ano & 0x7f ), ft7->mes & 0x0f, ft7->dia & 0x1f ) +
+                     EncodeTime( ft7->hora & 0x1f, ft7->min & 0x3f, ft7->ms / 1000, ft7->ms % 1000 );
+              pt.TagTempoEvento = dtev;
+              }
+            catch ( Exception &E )
+              {
+              pt.TagTempoEvento = 0;
+              }
+            }
+
           /*
           // do not update non-numeric values
           feclearexcept(FE_ALL_EXCEPT);
diff --git a/webserver/bcolocal.h b/webserver/bcolocal.h
@@ -105,6 +105,8 @@ using namespace std;
 #define COD_FORMULA_DISTMAXMIN  53
 #define COD_FORMULA_DUPLO       54
 #define COD_FORMULA_DIV         55
+#define COD_FORMULA_2SINGVALID  56
+#define COD_FORMULA_DUPVALID    57
 
 #define RGLIM_NORMAL 0
 #define RGLIM_ALMINF 1
@@ -575,6 +577,17 @@ typedef struct {
         unsigned char qds; // qualificador do ponto
 } analogico_seq;
 
+typedef struct {
+        short sva;         // valor analogico
+        unsigned char qds; // qualificador do ponto
+        unsigned short ms;    // milisegundos
+        unsigned char min;    // minuto
+        unsigned char hora;   // hora
+        unsigned char dia;    // dia
+        unsigned char mes;
+        unsigned char ano;
+} analogico_w_time7_seq;
+
 typedef struct {
         unsigned short nponto; // numero do ponto
         unsigned char nponto3; // 3 byte do numero do ponto
@@ -599,6 +612,17 @@ typedef struct {
         unsigned char qds; 	// qualificador do ponto
 } flutuante_seq;
 
+typedef struct {
+        float fr;      		// valor em ponto flutuante
+        unsigned char qds; 	// qualificador do ponto
+        unsigned short ms;    // milisegundos
+        unsigned char min;    // minuto
+        unsigned char hora;   // hora
+        unsigned char dia;    // dia
+        unsigned char mes;
+        unsigned char ano;
+} flutuante_w_time7_seq;
+
 typedef struct {
 	unsigned short nponto; // numero do ponto
 	unsigned char nponto3; // 3 byte do numero do ponto
diff --git a/webserver/config.h b/webserver/config.h
@@ -3,7 +3,7 @@
 
 // Par�metros e constantes de configura��o do sistema
 
-#define VERSAO "6.17"
+#define VERSAO "6.20"
 
 extern int IEC104_PORT;
 extern int IEC104_1_SEC; // endere�o secund�rio da utr 1
diff --git a/webserver/historico_u.cpp b/webserver/historico_u.cpp
diff --git a/webserver/historico_u.h b/webserver/historico_u.h
diff --git a/webserver/webserver.bpr b/webserver/webserver.bpr
diff --git a/webserver/webserver.res b/webserver/webserver.res

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`{`
`92`	`92`	`$pdo = new PDO( 'sqlite:../db/notes.sl3','','', [`
`93`	`93`	`PDO::ATTR_TIMEOUT => ($filtag!="" \|\| $filcontent!="")?0:5,`
`94`		`- PDO::SQLITE_ATTR_OPEN_FLAGS => PDO::SQLITE_OPEN_READONLY,`
	`94`	`+ // PDO::SQLITE_ATTR_OPEN_FLAGS => PDO::SQLITE_OPEN_READONLY, // THIS FLAG CAUSES ERRORS`
`95`	`95`	`PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION`
`96`	`96`	`] );`
`97`	`97`	`$pdo->exec ( "PRAGMA query_only=TRUE" );`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`var Msg =`
`5`	`5`	`{`
`6`	`6`	`NomeProduto: 'OSHMI',`
`7`		`-VersaoProduto: '6.18',`
	`7`	`+VersaoProduto: '6.20',`
`8`	`8`
`9`	`9`	`NomeVisorTelas: 'Screen Viewer',`
`10`	`10`	`NomeVisorEventos: 'Events Viewer',`