SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@219 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-15 09:03:31 +00:00
parent 4febbcddfe
commit acb2e04472
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/piinit.cpp
View File

@@ -85,7 +85,9 @@ void android_thread_exit_handler(int sig) {
PIInit::PIInit() { PIInit::PIInit() {
PISystemInfo * sinfo = PISystemInfo::instance(); PISystemInfo * sinfo = PISystemInfo::instance();
sinfo->execDateTime = PIDateTime::current(); sinfo->execDateTime = PIDateTime::current();
file_charset = 0; file_charset = new char[1024];
memset(file_charset, 0, 1024);
strcpy(file_charset, "UTF-8");
#ifndef ANDROID #ifndef ANDROID
PISignals::setSlot(__sighandler__); PISignals::setSlot(__sighandler__);
PISignals::grabSignals(PISignals::UserDefined1); PISignals::grabSignals(PISignals::UserDefined1);

2
src/io/piiostring.cpp
View File

@@ -83,7 +83,7 @@ int PIIOString::write(const void * data, int max_size) {
if (!canWrite() || !str) return -1; if (!canWrite() || !str) return -1;
//piCout << "write" << data; //piCout << "write" << data;
if (pos > str->size_s()) pos = str->size_s(); if (pos > str->size_s()) pos = str->size_s();
PIString rs = PIString((const char *)data); PIString rs = PIString::fromUTF8((const char *)data);
if (rs.size_s() > max_size) rs.resize(max_size); if (rs.size_s() > max_size) rs.resize(max_size);
str->insert(pos, rs); str->insert(pos, rs);
pos += rs.size_s(); pos += rs.size_s();

7
src/io/piserial.h
View File

@@ -173,9 +173,10 @@ public:
//! \returns \b true if sended bytes count = "size" //! \returns \b true if sended bytes count = "size"
bool send(const void * data, int size, bool wait = false) {return (write(data, size, wait) == size);} bool send(const void * data, int size, bool wait = false) {return (write(data, size, wait) == size);}
//! \brief Write to device string "data" and wait for data written if "wait" is \b true. /// NOTE: no reason to use this function, use PIString::toUtf8() or PIString::dataAscii(),lengthAscii() instead
//! \returns \b true if sended bytes count = size of string // //! \brief Write to device string "data" and wait for data written if "wait" is \b true.
bool send(const PIString & data, bool wait = false) {return (write(data.data(), data.lengthAscii(), wait) == data.size_s());} // //! \returns \b true if sended bytes count = size of string
// bool send(const PIString & data, bool wait = false) {return (write(data.data(), data.lengthAscii(), wait) == data.size_s());}
//! \brief Write to device byte array "data" and wait for data written if "wait" is \b true. //! \brief Write to device byte array "data" and wait for data written if "wait" is \b true.
//! \returns \b true if sended bytes count = size of string //! \returns \b true if sended bytes count = size of string