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

speichern bevor bugsuche

Browse source
This commit is contained in:
Tristan Krause 2019-03-28 15:36:44 +01:00
parent e3b7d60e16
commit 0d439d97b8
6 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drv/b15f.cpp
View file

@ -278,8 +278,9 @@ bool B15F::analogEingabeSequenz(uint8_t channel_a, uint16_t* buffer_a, uint32_t
if(aw != MSG_OK) if(aw != MSG_OK)
{ {
discard(); throw std::runtime_error("Out of sync");
return analogEingabeSequenz(channel_a, buffer_a, offset_a, channel_b, buffer_b, offset_b, start, delta, count); //discard();
//return analogEingabeSequenz(channel_a, buffer_a, offset_a, channel_b, buffer_b, offset_b, start, delta, count);
} }
for(uint16_t i = 0; i < count; i++) for(uint16_t i = 0; i < count; i++)
@ -293,6 +294,7 @@ bool B15F::analogEingabeSequenz(uint8_t channel_a, uint16_t* buffer_a, uint32_t
std::cout << "fordere neu an" << std::endl; std::cout << "fordere neu an" << std::endl;
} }
while(!crc_ok); while(!crc_ok);
std::cout << "OK" << std::endl;
buffer_a[offset_a + i] = ((uint16_t) block[0]) | (((uint16_t) block[1]) << 8); buffer_a[offset_a + i] = ((uint16_t) block[0]) | (((uint16_t) block[1]) << 8);
buffer_b[offset_b + i] = ((uint16_t) block[2]) | (((uint16_t) block[3]) << 8); buffer_b[offset_b + i] = ((uint16_t) block[2]) | (((uint16_t) block[3]) << 8);
@ -382,8 +384,10 @@ bool B15F::readBlock(uint8_t* buffer, uint16_t offset)
std::cout << PRE << "n_ready code: " << code << std::endl; std::cout << PRE << "n_ready code: " << code << std::endl;
return false; return false;
} }
if(n_ready >= len + 1) if(n_ready >= len + 1)
break; break;
end = std::chrono::steady_clock::now(); end = std::chrono::steady_clock::now();
elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count(); elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
} }
@ -399,6 +403,8 @@ bool B15F::readBlock(uint8_t* buffer, uint16_t offset)
if(code != 1) if(code != 1)
{ {
std::cout << PRE << "read code: " << code << std::endl; std::cout << PRE << "read code: " << code << std::endl;
tcflush(usart, TCIFLUSH); // leere Eingangspuffer
writeByte(MSG_FAIL);
return false; return false;
} }
@ -419,6 +425,11 @@ bool B15F::readBlock(uint8_t* buffer, uint16_t offset)
crc >>= 1; crc >>= 1;
} }
if(TEST == 1)
crc = 1;
if(TEST > 100)
TEST = 0;
if (crc == 0) if (crc == 0)
{ {
writeByte(MSG_OK); writeByte(MSG_OK);

1
drv/b15f.h
View file

@ -55,6 +55,7 @@ private:
int usart = -1; int usart = -1;
uint16_t timeout = 200; // ms uint16_t timeout = 200; // ms
uint16_t block_timeout = 1; // ms uint16_t block_timeout = 1; // ms
int TEST = 0;
static B15F* instance; static B15F* instance;

BIN
drv/b15f.o
View file

Binary file not shown.

24
gnuplotscript.gp
View file

@ -9,24 +9,24 @@ set x2range [5:0]
set y2range [0:50] set y2range [0:50]
set yrange [0:50] set yrange [0:50]
set label at 2,32 'U_{DS} [V] = 300' right set label at 2,32 'U_{DS} [V] = 300' right
set label at 2,30 'U_{DS} [V] = 325' right set label at 2,31 'U_{DS} [V] = 325' right
set label at 2,33 'U_{DS} [V] = 350' right set label at 2,33 'U_{DS} [V] = 350' right
set label at 2,21 'U_{DS} [V] = 375' right set label at 2,35 'U_{DS} [V] = 375' right
set label at 2,21 'U_{DS} [V] = 400' right set label at 2,21 'U_{DS} [V] = 400' right
set label at 2,5 'U_{DS} [V] = 425' right set label at 2,22 'U_{DS} [V] = 425' right
set label at 2,22 'U_{DS} [V] = 450' right set label at 2,22 'U_{DS} [V] = 450' right
set label at 2,12 'U_{DS} [V] = 475' right set label at 2,22 'U_{DS} [V] = 475' right
set label at 2,23 'U_{DS} [V] = 500' right set label at 2,23 'U_{DS} [V] = 500' right
set label at 2,23 'U_{DS} [V] = 525' right set label at 2,12 'U_{DS} [V] = 525' right
set label at 2,2 'U_{DS} [V] = 550' right set label at 2,5 'U_{DS} [V] = 550' right
set label at 2,12 'U_{DS} [V] = 575' right set label at 2,12 'U_{DS} [V] = 575' right
set label at 2,13 'U_{DS} [V] = 600' right set label at 2,2 'U_{DS} [V] = 600' right
set label at 2,5 'U_{DS} [V] = 625' right set label at 2,12 'U_{DS} [V] = 625' right
set label at 2,6 'U_{DS} [V] = 650' right set label at 2,2 'U_{DS} [V] = 650' right
set label at 2,6 'U_{DS} [V] = 675' right set label at 2,2 'U_{DS} [V] = 650' right
set label at 2,2 'U_{DS} [V] = 700' right
set label at 2,2 'U_{DS} [V] = 700' right
set label at 2,2 'U_{DS} [V] = 700' right set label at 2,2 'U_{DS} [V] = 700' right
set label at 2,2 'U_{DS} [V] = 725' right
set label at 2,2 'U_{DS} [V] = 725' right
set y2tics set y2tics
unset ytics unset ytics
set ytics format '' set ytics format ''

BIN
main
View file

Binary file not shown.

BIN
test_plot
View file

Binary file not shown.