diff --git a/.gitignore b/.gitignore index bc1b61b23..b103abfc9 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,4 @@ src/vscp/drivers/level2/sim/linux/test /src/vscp/daemon/win32/service/vscpsrv.sdf /src/vscp/.vs/vscp_project/v14/*.suo /src/vscp/*.opendb +/config_examples/web/browse.VC.db diff --git a/config_examples/vscpd32.conf_windows_distro b/config_examples/vscpd32.conf_windows_distro index 373853209..ca0e32504 100644 --- a/config_examples/vscpd32.conf_windows_distro +++ b/config_examples/vscpd32.conf_windows_distro @@ -168,9 +168,9 @@ 1 2 - - 15,1604167 - 61,7441833 + + 15.1604167 + 61.7441833 diff --git a/config_examples/vscpd64.conf_windows_distro b/config_examples/vscpd64.conf_windows_distro index e8cdbcb07..f5a28c1ec 100644 --- a/config_examples/vscpd64.conf_windows_distro +++ b/config_examples/vscpd64.conf_windows_distro @@ -169,9 +169,9 @@ 1 2 - - 15,1604167 - 61,7441833 + + 15.1604167 + 61.7441833 diff --git a/config_examples/web/browse.VC.db b/config_examples/web/browse.VC.db deleted file mode 100644 index bda2ded0b..000000000 Binary files a/config_examples/web/browse.VC.db and /dev/null differ diff --git a/config_examples/web/web/index.html b/config_examples/web/web/index.html deleted file mode 100644 index f2cd2663f..000000000 --- a/config_examples/web/web/index.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - VSCP Daemon Administration. - - - - - - - - - - - - -
- - -
- - diff --git a/src/vscp/common/canalsuperwrapper.cpp b/src/vscp/common/canalsuperwrapper.cpp index 8ada7c974..45239554a 100644 --- a/src/vscp/common/canalsuperwrapper.cpp +++ b/src/vscp/common/canalsuperwrapper.cpp @@ -5248,7 +5248,12 @@ wxString CCanalSuperWrapper::getAbstractionValueAsString( wxWindow *pwnd, pdlg, bLevel2, bSilent ); - strValue = val.FormatISODate(); + if ( val.IsValid() ) { + strValue = val.FormatISODate(); + } + else { + strValue = _( "00-00-00T00:00:00" ); + } } break; diff --git a/src/vscp/common/mdf.cpp b/src/vscp/common/mdf.cpp index 6b5de8b5c..14810367e 100644 --- a/src/vscp/common/mdf.cpp +++ b/src/vscp/common/mdf.cpp @@ -2671,7 +2671,7 @@ uint32_t CMDF::getNumberOfRegisters( uint32_t page ) uint32_t CMDF::getPages( wxArrayLong& array ) { - bool bFound; + //bool bFound; MDF_REGISTER_LIST::iterator iterValue; for ( iterValue = m_list_register.begin(); diff --git a/src/vscp/common/vscpvariable.cpp b/src/vscp/common/vscpvariable.cpp index 9b9c1824d..7fbf936ce 100644 --- a/src/vscp/common/vscpvariable.cpp +++ b/src/vscp/common/vscpvariable.cpp @@ -352,9 +352,14 @@ bool CVSCPVariable::writeValueToString( wxString& strValueOut ) break; case VSCP_DAEMON_VARIABLE_CODE_DATETIME: - strValueOut = m_timestamp.FormatISODate(); - strValueOut += wxT("T"); - strValueOut += m_timestamp.FormatISOTime(); + if ( m_timestamp.IsValid() ) { + strValueOut = m_timestamp.FormatISODate(); + strValueOut += wxT( "T" ); + strValueOut += m_timestamp.FormatISOTime(); + } + else { + strValueOut = _("00-00-00T00:00:00"); + } break; case VSCP_DAEMON_VARIABLE_CODE_BASE64: @@ -362,11 +367,21 @@ bool CVSCPVariable::writeValueToString( wxString& strValueOut ) break; case VSCP_DAEMON_VARIABLE_CODE_DATE: - strValueOut = m_timestamp.FormatISODate(); + if ( m_timestamp.IsValid() ) { + strValueOut = m_timestamp.FormatISODate(); + } + else { + strValueOut = _( "00-00-00T00:00:00" ); + } break; case VSCP_DAEMON_VARIABLE_CODE_TIME: - strValueOut = m_timestamp.FormatISOTime(); + if ( m_timestamp.IsValid() ) { + strValueOut = m_timestamp.FormatISOTime(); + } + else { + strValueOut = _( "00-00-00T00:00:00" ); + } break; case VSCP_DAEMON_VARIABLE_CODE_UNASSIGNED: diff --git a/src/vscp/daemon/win32/vscpd.vcxproj b/src/vscp/daemon/win32/vscpd.vcxproj index f5c751d73..8114b81e5 100644 --- a/src/vscp/daemon/win32/vscpd.vcxproj +++ b/src/vscp/daemon/win32/vscpd.vcxproj @@ -358,7 +358,7 @@ true Level3 .\;$(OPENSSL64)\include;$(wxwin)\include\msvc;$(WXWIN)\include\;$(LUA64)\include;%(AdditionalIncludeDirectories) - MG_ENABLE_COAP;MG_ENABLE_MQTT_BROKER;_WINSOCK_DEPRECATED_NO_WARNINGS;NS_ENABLE_SSL;NOEMBED_NET_SKELETON;DEBUG;WIN32;_CONSOLE;WINVER=0x0601;_MT;wxUSE_GUI=0;__WXDEBUG__;WXDEBUG=0;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MG_ENABLE_COAP;MG_ENABLE_MQTT_BROKER;_WINSOCK_DEPRECATED_NO_WARNINGS;NS_ENABLE_SSL;NOEMBED_NET_SKELETON;NDEBUG;WIN32;_CONSOLE;WINVER=0x0601;_MT;wxUSE_GUI=0;WXDEBUG=0;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) $(IntDir) true $(OutDir)$(TargetName).pch