19.12.2010 - variables and structs, fixed consoleand interfaces

This commit is contained in:
peri4
2010-12-19 22:00:21 +03:00
parent 8926fe2f69
commit a32edb1fef
12 changed files with 291 additions and 35 deletions

View File

@@ -31,7 +31,7 @@ class PISerial: public PIThread
{
public:
// slot is any function format "bool <func>(void*, char*)"
PISerial(PIString name, void * data, SerialFunc slot = 0);
PISerial(PIString name = "serial", void * data = 0, SerialFunc slot = 0);
~PISerial();
enum Parameters {IgnoreParityControl = 0x01, TwoStopBits = 0x02};
@@ -42,6 +42,7 @@ public:
void setInSpeed(int speed) {ispeed = speed;}
void setDevice(const PIString & dev) {devName = dev;}
void setParameters(Flags<PISerial::Parameters> parameters) {params = parameters;}
void setData(void * d) {data = d;}
void setReadData(void * headerPtr, int headerSize, int dataSize) {this->headerPtr = headerPtr;
this->headerSize = headerSize;
this->dataSize = dataSize;}
@@ -49,6 +50,7 @@ public:
bool send(char * data, int size);
bool init();
bool initialized() const {return fd != -1;}
void terminate();
private:
void begin();
@@ -61,7 +63,7 @@ private:
DWORD readed, mask;
#else
termios desc, sdesc;
int readed;
uint readed;
#endif
int fd, ospeed, ispeed;
PIString devName;