diff --git a/src/console/piscreen.h b/src/console/piscreen.h index e92635e5..f315561d 100644 --- a/src/console/piscreen.h +++ b/src/console/piscreen.h @@ -34,7 +34,7 @@ class PIP_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase public: //! Constructs %PIScreen with key handler "slot" and if "startNow" start it - PIScreen(bool startNow = true, PIKbdListener::KBFunc slot = 0); + PIScreen(bool startNow = false, PIKbdListener::KBFunc slot = 0); ~PIScreen(); diff --git a/src/io/pifile.cpp b/src/io/pifile.cpp index 857c4ad8..84e11c46 100755 --- a/src/io/pifile.cpp +++ b/src/io/pifile.cpp @@ -373,7 +373,7 @@ int PIFile::write(const void * data, int max_size) { } -PIFile & PIFile::writeToBinLog(ushort id, const void * data, int size) { +PIFile & PIFile::writeToBinLog(ushort id, const void * data, int size) { /// DEPRECATED if (!isWriteable() || fd == 0) return *this; writeBinary(id).writeBinary((ushort)size); write(data, size); diff --git a/src/io/pifile.h b/src/io/pifile.h index 573ee1b5..823e98b0 100755 --- a/src/io/pifile.h +++ b/src/io/pifile.h @@ -153,8 +153,11 @@ public: //! Write to file "data" with size "max_size" and return written bytes count int write(const void * data, int max_size); + + //! Write "data" to device + int write(const PIByteArray & data) {return write(data.data(), data.size_s());} - PIFile & writeToBinLog(ushort id, const void * data, int size); + PIFile & writeToBinLog(ushort id, const void * data, int size); /// DEPRECATED //! Write to file binary content of "v" diff --git a/src/io/piiodevice.h b/src/io/piiodevice.h index 22414558..5ed0b498 100755 --- a/src/io/piiodevice.h +++ b/src/io/piiodevice.h @@ -184,7 +184,7 @@ public: //! Write "data" to device int write(const PIByteArray & data) {return write(data.data(), data.size_s());} - + //! Add task to threaded write queue and return task ID ullong writeThreaded(const void * data, int max_size) {return writeThreaded(PIByteArray(data, uint(max_size)));} diff --git a/src/io/pimultiprotocol.cpp b/src/io/pimultiprotocol.cpp index 422263cf..5ba7e968 100755 --- a/src/io/pimultiprotocol.cpp +++ b/src/io/pimultiprotocol.cpp @@ -18,4 +18,4 @@ */ #include "pimultiprotocol.h" - + /// DEPRECATED diff --git a/src/io/pimultiprotocol.h b/src/io/pimultiprotocol.h index fed89c6e..5c33dcbb 100755 --- a/src/io/pimultiprotocol.h +++ b/src/io/pimultiprotocol.h @@ -22,10 +22,10 @@ #include "piprotocol.h" -class PIMultiProtocol: public PIMultiProtocolBase +class PIMultiProtocol: public PIMultiProtocolBase /// DEPRECATED { public: - PIMultiProtocol() {;} + PIMultiProtocol() {;} /// DEPRECATED virtual ~PIMultiProtocol() {clear();} void addProtocol(PIProtocol & prot) {prots.push_back(&prot); prot.setMultiProtocolOwner(this); prot.new_mp_prot = false;} @@ -59,9 +59,9 @@ private: }; -class PIRepeater: public PIMultiProtocol { +class PIRepeater: public PIMultiProtocol { /// DEPRECATED public: - PIRepeater(const PIString & config, const PIString & name_) { + PIRepeater(const PIString & config, const PIString & name_) { /// DEPRECATED PIConfig conf(config, PIIODevice::ReadOnly); if (!conf.isOpened()) { piCoutObj << "[PIRepeater \"" << name_ << "\"] Can`t open \"" << config << "\"!"; diff --git a/src/io/piprotocol.cpp b/src/io/piprotocol.cpp index 87df9700..23b8ae31 100755 --- a/src/io/piprotocol.cpp +++ b/src/io/piprotocol.cpp @@ -29,7 +29,7 @@ * * */ - + /// DEPRECATED PIProtocol::PIProtocol(const PIString & config, const PIString & name_, void * recHeaderPtr, int recHeaderSize, void * recDataPtr, int recDataSize, void * sendDataPtr_, int sendDataSize_): PIObject() { init(); protName = name_; diff --git a/src/io/piprotocol.h b/src/io/piprotocol.h index 31966036..0fef7b21 100755 --- a/src/io/piprotocol.h +++ b/src/io/piprotocol.h @@ -31,14 +31,14 @@ #include "pifile.h" #include "math.h" -class PIProtocol; +class PIProtocol; /// DEPRECATED -class PIP_EXPORT PIMultiProtocolBase: protected PIObject +class PIP_EXPORT PIMultiProtocolBase: protected PIObject /// DEPRECATED { PIOBJECT_SUBCLASS(PIMultiProtocolBase, PIObject) friend class PIProtocol; public: - PIMultiProtocolBase() {;} + PIMultiProtocolBase() {;} /// DEPRECATED virtual ~PIMultiProtocolBase() {;} protected: @@ -70,7 +70,7 @@ typedef void (*ReceiveFunc)(void * ); /// void stop() /// void send() /// void send(const void * data, int size, bool direct = false) -class PIP_EXPORT PIProtocol: public PIObject +class PIP_EXPORT PIProtocol: public PIObject /// DEPRECATED { PIOBJECT_SUBCLASS(PIProtocol, PIObject) friend class PIMultiProtocolBase; @@ -79,7 +79,7 @@ class PIP_EXPORT PIProtocol: public PIObject public: //! Contructs an empty unconfigured protocol - PIProtocol(): PIObject() {init();} + PIProtocol(): PIObject() {init();} /// DEPRECATED //! Contructs protocol configured from file "config", config file section "name" PIProtocol(const PIString & config, const PIString & name, void * recHeaderPtr = 0, int recHeaderSize = 0,