lauchmelder/b15f
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make it volatile

Browse source
This commit is contained in:
Tristan Krause 2019-04-03 08:40:14 +02:00
parent 4d2ea6013c
commit de7143887d
25 changed files with 368 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

19
driver/drv/b15f.cpp
View file

@ -136,13 +136,12 @@ std::vector<std::string> B15F::getBoardInfo(void)
while(n--)
{
uint8_t len = usart.readByte();
std::cout << (int) len << std::endl;
std::string str;
while(len--)
while(len--) {
str += static_cast<char>(usart.readByte());
std::cout << str << std::endl;
}
info.push_back(str);
}
@ -215,7 +214,7 @@ uint16_t B15F::analogRead(uint8_t channel)
return usart.readInt();
}
bool B15F::analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset_a, uint8_t channel_b, uint16_t* buffer_b, uint32_t offset_b, uint16_t start, int16_t delta, uint16_t count)
void B15F::analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset_a, uint8_t channel_b, uint16_t* buffer_b, uint32_t offset_b, uint16_t start, int16_t delta, uint16_t count)
{
buffer_a += offset_a;
buffer_b += offset_b;
@ -239,13 +238,15 @@ bool B15F::analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset
{
buffer_a[i] = usart.readInt();
buffer_b[i] = usart.readInt();
if(buffer_a[i] > 1023 || buffer_b[i] > 1023)
std::cout << PRE << "bad data detected" << std::endl;
}
uint8_t aw = usart.readByte();
if(aw == MSG_OK)
return aw;
throw DriverException("Sequenz unterbrochen");
if(aw != MSG_OK)
throw DriverException("Sequenz unterbrochen");
delay_us(1);
}
void B15F::delay_ms(uint16_t ms)

2
driver/drv/b15f.h
View file

@ -162,7 +162,7 @@ public:
* \param count Anzahl an Inkrementierungen
* \throws DriverException
*/
bool analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset_a, uint8_t channel_b, uint16_t* buffer_b, uint32_t offset_b, uint16_t start, int16_t delta, uint16_t count);
void analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset_a, uint8_t channel_b, uint16_t* buffer_b, uint32_t offset_b, uint16_t start, int16_t delta, uint16_t count);
/*************************/

BIN
driver/drv/b15f.o
View file

Binary file not shown.

2
driver/drv/usart.h
View file

@ -132,7 +132,7 @@ private:
int file_desc = -1; // Linux Dateideskriptor
uint32_t baudrate = 9600;
int TEST = 0;
uint8_t timeout = 10; // in Dezisekunden
uint8_t timeout = 5; // in Dezisekunden
uint8_t block_buffer[MAX_BLOCK_SIZE + 3];
// debug statistics