Revision 1:ab3c75cf5906, committed 2011-08-01
- Comitter:
- nucho
- Date:
- Mon Aug 01 14:45:42 2011 +0000
- Parent:
- 0:a70ea71286b6
- Commit message:
Changed in this revision
--- a/QEI.lib Fri Jul 29 11:20:55 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/aberk/code/QEI/#5c2ad81551aa
--- a/RTno/BasicDataType.h Fri Jul 29 11:20:55 2011 +0000
+++ b/RTno/BasicDataType.h Mon Aug 01 14:45:42 2011 +0000
@@ -69,7 +69,8 @@
class TimedDouble : public TimedData {
// Time timestamp;
public:
- double data;
+ //double data;
+ float data;
virtual void* GetBuffer() {
return &data;
}
--- a/RTno/OutPort.cpp Fri Jul 29 11:20:55 2011 +0000
+++ b/RTno/OutPort.cpp Mon Aug 01 14:45:42 2011 +0000
@@ -10,7 +10,7 @@
#include "OutPort.h"
#include "SendPacket.h"
#include "ReceivePacket.h"
-
+#include "Serial.h"
OutPort::OutPort(char* name, TimedBoolean& Data) :
OutPortBase(name)
@@ -132,7 +132,7 @@
{
int datalen = GetLength() * SizeofData();
int namelen = strlen(GetName());
- char packet_buffer[MAX_PACKET_SIZE];
+ char packet_buffer[MAX_PACKET_SIZE];;
packet_buffer[0] = namelen;
packet_buffer[1] = datalen;
memcpy(&(packet_buffer[2]), GetName(), namelen);
--- a/RTno/PortBase.h Fri Jul 29 11:20:55 2011 +0000
+++ b/RTno/PortBase.h Mon Aug 01 14:45:42 2011 +0000
@@ -28,12 +28,20 @@
int isSequenceType() {
switch(m_TypeCode) {
+ /*
case 'b':
case 'B':
case 'o':
case 'O':
case 'c':
case 'C':
+ */
+ case 'b':
+ case 'o':
+ case 'c':
+ case 'l':
+ case 'f':
+ case 'd':
return 0;
default:
return 1;
@@ -42,7 +50,7 @@
int GetLength() {
if(!isSequenceType()) {
- return 1;
+ return 1;
} else {
return ((TimedDataSeq*)m_pData)->GetBuffer()->length();
}
--- a/RTno/ReceivePacket.cpp Fri Jul 29 11:20:55 2011 +0000
+++ b/RTno/ReceivePacket.cpp Mon Aug 01 14:45:42 2011 +0000
@@ -15,7 +15,7 @@
//#include <WConstants.h>
int ReceivePacket(char* packet) {
- int counter = 0;
+ //int counter = 0;
unsigned char sum = 0;
/*
while (Serial.available() < PACKET_HEADER_SIZE) {
--- a/RTno/SequenceDataType.cpp Fri Jul 29 11:20:55 2011 +0000
+++ b/RTno/SequenceDataType.cpp Mon Aug 01 14:45:42 2011 +0000
@@ -7,9 +7,7 @@
#include <stdlib.h>
#include "SequenceDataType.h"
-#include "mbed.h"
-Serial pc3(p9,p10);
SequenceDataType::SequenceDataType(void** ptrptr)
{
@@ -25,9 +23,7 @@
void SequenceDataType::length(int size)
{
len = size;
- pc3.printf("len222\n\r");
free(*m_ptrptr);
- pc3.printf("len333\n\r");
*m_ptrptr = (void*)malloc(size * SizeofData());
//*m_ptrptr = (void*)malloc(size * 4);
}