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

7.12.2010 - bug fixes in PIString, all classes now based on PIString

Browse Source
This commit is contained in:
peri4
2010-12-07 19:13:15 +03:00
parent 08f214dbfa
commit 66d998f289
14 changed files with 194 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
piserial.h
View File

@@ -2,6 +2,7 @@
#define PISERIAL_H
#include "pithread.h"
#include "pistring.h"
#ifndef WINDOWS
#include <termios.h>
#include <fcntl.h>
@@ -30,7 +31,7 @@ class PISerial: public PIThread
{
public:
// slot is any function format "bool <func>(void*, char*)"
PISerial(string name, void * data, SerialFunc slot = 0);
PISerial(PIString name, void * data, SerialFunc slot = 0);
~PISerial();
enum Parameters {IgnoreParityControl = 0x01, TwoStopBits = 0x02};
@@ -39,7 +40,7 @@ public:
void setSpeed(int speed) {ospeed = ispeed = speed;}
void setOutSpeed(int speed) {ospeed = speed;}
void setInSpeed(int speed) {ispeed = speed;}
void setDevice(const string & dev) {devName = dev;}
void setDevice(const PIString & dev) {devName = dev;}
void setParameters(Flags<PISerial::Parameters> parameters) {params = parameters;}
void setReadData(void * headerPtr, int headerSize, int dataSize) {this->headerPtr = headerPtr;
this->headerSize = headerSize;
@@ -63,7 +64,7 @@ private:
int readed;
#endif
int fd, ospeed, ispeed;
string devName;
PIString devName;
SerialFunc ret_func;
char * buffer, * sbuffer, * hbuffer, * pbuffer;
void * headerPtr, * data;