Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@grodansparadis
grodansparadis committed May 17, 2024
1 parent 6346d12 commit 33c4797
Show file tree
Hide file tree
Showing 33 changed files with 133 additions and 131 deletions.
64 changes: 32 additions & 32 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,46 +657,46 @@ add_executable(${PROJECT_NAME}
$ENV{VSCP_ROOT}/src/vscp/common/canaldlldef.h
$ENV{VSCP_ROOT}/src/vscp/common/vscpcanaldeviceif.h
$ENV{VSCP_ROOT}/src/vscp/common/vscpcanaldeviceif.cpp
$ENV{VSCP_ROOT}/src/vscp/common/canal_xmlconfig.h
$ENV{VSCP_ROOT}/src/vscp/common/canal_xmlconfig.cpp
$ENV{VSCP_ROOT}/src/vscp/common/canal-xmlconfig.h
$ENV{VSCP_ROOT}/src/vscp/common/canal-xmlconfig.cpp
$ENV{VSCP_ROOT}/src/vscp/common/register.h
$ENV{VSCP_ROOT}/src/vscp/common/register.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_base.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_base.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_canal.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_canal.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_mqtt.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_mqtt.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_tcp.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_tcp.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_socketcan.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_socketcan.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_ws1.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_ws1.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_ws2.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_ws2.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_udp.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_udp.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_multicast.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_multicast.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_rawcan.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_rawcan.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_rawmqtt.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_client_rawmqtt.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_bootdevice.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_bootdevice.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_bootdevice_pic1.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_bootdevice_pic1.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp_bootdevice_vscp.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp_bootdevice_vscp.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-base.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-base.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-canal.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-canal.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-mqtt.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-mqtt.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-tcp.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-tcp.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-socketcan.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-socketcan.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws1.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws1.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws2.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws2.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-udp.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-udp.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-multicast.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-multicast.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-rawcan.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-rawcan.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-rawmqtt.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-client-rawmqtt.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-pic1.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-pic1.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-vscp.h
$ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-vscp.cpp
$ENV{VSCP_ROOT}/src/vscp/common/vscpunit.h
$ENV{VSCP_ROOT}/src/vscp/common/vscpunit.cpp
$ENV{VSCP_ROOT}/src/common/sockettcp.h
$ENV{VSCP_ROOT}/src/common/sockettcp.c
$ENV{VSCP_ROOT}/src/common/vscpbase64.h
$ENV{VSCP_ROOT}/src/common/vscpbase64.c
$ENV{VSCP_ROOT}/src/common/vscp_aes.h
$ENV{VSCP_ROOT}/src/common/vscp_aes.c
$ENV{VSCP_ROOT}/src/common/vscp-aes.h
$ENV{VSCP_ROOT}/src/common/vscp-aes.c
$ENV{VSCP_ROOT}/src/common/crc.h
$ENV{VSCP_ROOT}/src/common/crc.c
$ENV{VSCP_ROOT}/src/common/crc8.h
Expand Down
4 changes: 2 additions & 2 deletions src/bootloaderwizard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <mdf.h>
#include <register.h>
#include <vscp.h>
#include <vscp_client_base.h>
#include <vscp-client-base.h>

#include "cdlgselectbootalgorithm.h"
#include "filedownloader.h"
Expand All @@ -61,7 +61,7 @@
#include "cdlgconnsettingsws2.h"
#include "cdlgknownguid.h"
#include "version.h"
#include "vscp_bootdevice_pic1.h"
#include "vscp-bootdevice-pic1.h"

#include <curl/curl.h>

Expand Down
4 changes: 2 additions & 2 deletions src/bootloaderwizard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#include <vscphelper.h>
#include <mdf.h>
#include <vscp_client_base.h>
#include <vscp_bootdevice.h>
#include <vscp-client-base.h>
#include <vscp-bootdevice.h>

#include <QCheckBox>
#include <QFormLayout>
Expand Down
4 changes: 2 additions & 2 deletions src/canalconfigwizard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#ifndef CANALCONFIGWIZARD_H
#define CANALCONFIGWIZARD_H

#include <canal_xmlconfig.h>
#include "vscp_client_canal.h"
#include <canal-xmlconfig.h>
#include "vscp-client-canal.h"

#include <QWizard>

Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingscanal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "cdlglevel1filter.h"

#include "canal_xmlconfig.h"
#include "canal-xmlconfig.h"
#include "canalconfigwizard.h"
#include "vscphelper.h"

Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingscanal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define CDLGCONNSETTINGSCANAL_H

#include "canalconfigwizard.h"
#include "vscp_client_canal.h"
#include "vscp-client-canal.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsmqtt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CDLGCONNSETTINGSMQTT_H
#define CDLGCONNSETTINGSMQTT_H

#include "vscp_client_mqtt.h"
#include "vscp-client-mqtt.h"
#include "vscphelper.h"

#include <QDialog>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsmulticast.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CDLGCONNSETTINGSMULTICAST_H
#define CDLGCONNSETTINGSMULTICAST_H

#include "vscp_client_multicast.h"
#include "vscp-client-multicast.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsrawcan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef WIN32

#include <vscphelper.h>
#include <vscp_client_socketcan.h>
#include <vscp-client-socketcan.h>

#include "cdlglevel1filter.h"
#include "cdlgsocketcanflags.h"
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsrawcan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#ifndef WIN32

#include "vscp_client_socketcan.h"
#include "vscp-client-socketcan.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsrawmqtt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define CDLGCONNSETTINGSRAWMQTT_H

#include "vscphelper.h"
#include "vscp_client_mqtt.h"
#include "vscp-client-mqtt.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingssocketcan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef WIN32

#include <vscphelper.h>
#include <vscp_client_socketcan.h>
#include <vscp-client-socketcan.h>

#include "cdlglevel1filter.h"
#include "cdlgsocketcanflags.h"
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingssocketcan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#ifndef WIN32

#include "vscp_client_socketcan.h"
#include "vscp-client-socketcan.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingstcpip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#define WIN32_LEAN_AND_MEAN
#endif

#include "vscp_client_tcp.h"
#include "vscp-client-tcp.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsudp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CDLGCONNSETTINGSUDP_H
#define CDLGCONNSETTINGSUDP_H

#include "vscp_client_udp.h"
#include "vscp-client-udp.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsws1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CDLGCONNSETTINGSWS1_H
#define CDLGCONNSETTINGSWS1_H

#include "vscp_client_ws1.h"
#include "vscp-client-ws1.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgconnsettingsws2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CDLGCONNSETTINGSWS2_H
#define CDLGCONNSETTINGSWS2_H

#include "vscp_client_ws2.h"
#include "vscp-client-ws2.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgnewconnection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef CDLGNEWCONNECTION_H
#define CDLGNEWCONNECTION_H

#include "vscp_client_base.h"
#include "vscp-client-base.h"

#include <QDialog>
#include <QListWidgetItem>
Expand Down
2 changes: 1 addition & 1 deletion src/cdlgselectmqtttopics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#endif

#include <vscp.h>
#include <vscp_client_mqtt.h>
#include <vscp-client-mqtt.h>

#include "cdlgselectmqtttopics.h"
#include "ui_cdlgselectmqtttopics.h"
Expand Down
2 changes: 1 addition & 1 deletion src/cfrmmdf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <mdf.h>
#include <register.h>
#include <vscp.h>
#include <vscp_client_base.h>
#include <vscp-client-base.h>

#include "cdlgmdfcontact.h"

Expand Down
24 changes: 12 additions & 12 deletions src/cfrmnodeconfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@

// #include <curl/curl.h>

#include <vscp_client_canal.h>
#include <vscp_client_mqtt.h>
#include <vscp_client_multicast.h>
#include <vscp_client_rawcan.h>
#include <vscp_client_rawmqtt.h>
#include <vscp-client-canal.h>
#include <vscp-client-mqtt.h>
#include <vscp-client-multicast.h>
#include <vscp-client-rawcan.h>
#include <vscp-client-rawmqtt.h>
#ifndef WIN32
#include <vscp_client_socketcan.h>
#include <vscp-client-socketcan.h>
#endif
#include <vscp_client_tcp.h>
#include <vscp_client_udp.h>
#include <vscp_client_ws1.h>
#include <vscp_client_ws2.h>
#include <vscp-client-tcp.h>
#include <vscp-client-udp.h>
#include <vscp-client-ws1.h>
#include <vscp-client-ws2.h>

#include "cdlgeditdm.h"
#include "cdlgknownguid.h"
Expand Down Expand Up @@ -93,7 +93,7 @@
#include <expat.h>
#include <maddy/parser.h> // Markdown -> HTML
#include <mustache.hpp>
#include <nlohmann/json.hpp> // Needs C++11 -std=c++11
#include <nlohmann/json.hpp>

#define XML_BUFF_SIZE 0xffff

Expand Down Expand Up @@ -160,7 +160,7 @@ CMdfFileWidgetItem::~CMdfFileWidgetItem()
// ----------------------------------------------------------------------------

///////////////////////////////////////////////////////////////////////////////
// vscp_client_ack
// vscp-client-ack
//

// void CVscpClientCallback::eventReceived(vscpEvent *pev)
Expand Down
2 changes: 1 addition & 1 deletion src/cfrmnodeconfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <mdf.h>
#include <register.h>
#include <vscp.h>
#include <vscp_client_base.h>
#include <vscp-client-base.h>

#include <QDialog>
#include <QObject>
Expand Down
22 changes: 11 additions & 11 deletions src/cfrmnodescan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@

#include <mustache.hpp>

#include <vscp_client_canal.h>
#include <vscp_client_mqtt.h>
#include <vscp_client_multicast.h>
#include <vscp_client_rawcan.h>
#include <vscp_client_rawmqtt.h>
#include <vscp-client-canal.h>
#include <vscp-client-mqtt.h>
#include <vscp-client-multicast.h>
#include <vscp-client-rawcan.h>
#include <vscp-client-rawmqtt.h>
#ifndef WIN32
#include <vscp_client_socketcan.h>
#include <vscp-client-socketcan.h>
#endif
#include <vscp_client_tcp.h>
#include <vscp_client_udp.h>
#include <vscp_client_ws1.h>
#include <vscp_client_ws2.h>
#include <vscp-client-tcp.h>
#include <vscp-client-udp.h>
#include <vscp-client-ws1.h>
#include <vscp-client-ws2.h>

#include "cfrmnodeconfig.h"

Expand Down Expand Up @@ -98,7 +98,7 @@ CFoundNodeWidgetItem::~CFoundNodeWidgetItem()
// ----------------------------------------------------------------------------

///////////////////////////////////////////////////////////////////////////////
// vscp_client_ack
// vscp-client-ack
//

// void CVscpClientCallback::eventReceived(vscpEvent *pev)
Expand Down
2 changes: 1 addition & 1 deletion src/cfrmnodescan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <mdf.h>
#include <register.h>
#include <vscp.h>
#include <vscp_client_base.h>
#include <vscp-client-base.h>

#include <set>

Expand Down
Loading

0 comments on commit 33c4797

Please sign in to comment.