Alte Fehlerbehebung entfernt

This commit is contained in:
Tristan Krause 2019-03-29 11:42:52 +01:00
parent 17416f357c
commit 15ba2f5661
3 changed files with 70 additions and 149 deletions

View file

@ -104,11 +104,10 @@ bool B15F::testIntConv()
std::vector<std::string> B15F::getBoardInfo(void)
{
try
{
std::vector<std::string> info;
usart.writeByte(RQ_INFO);
uint8_t n = usart.readByte();
while(n--)
{
@ -122,140 +121,69 @@ std::vector<std::string> B15F::getBoardInfo(void)
}
uint8_t aw = usart.readByte();
if(aw != MSG_OK)
throw DriverException("Board Info fehlerhalft");
return info;
}
catch(DriverException& de)
{
reconnect();
return getBoardInfo();
}
}
bool B15F::digitalWrite0(uint8_t port)
{
try
{
usart.writeByte(RQ_BA0);
usart.writeByte(port);
uint8_t aw = usart.readByte();
return aw == MSG_OK;
}
catch(DriverException& de)
{
reconnect();
return digitalWrite0(port);
}
}
bool B15F::digitalWrite1(uint8_t port)
{
try
{
usart.writeByte(RQ_BA1);
usart.writeByte(port);
uint8_t aw = usart.readByte();
return aw == MSG_OK;
}
catch(DriverException& de)
{
reconnect();
return digitalWrite1(port);
}
}
uint8_t B15F::digitalRead0()
{
try
{
usart.writeByte(RQ_BE0);
return usart.readByte();
}
catch(DriverException& de)
{
reconnect();
return digitalRead0();
}
}
uint8_t B15F::digitalRead1()
{
try
{
usart.writeByte(RQ_BE1);
return usart.readByte();
}
catch(DriverException& de)
{
reconnect();
return digitalRead1();
}
}
bool B15F::analogWrite0(uint16_t value)
{
try
{
usart.writeByte(RQ_AA0);
delay_ms(1);
usart.writeInt(value);
delay_ms(1);
uint8_t aw = usart.readByte();
return aw == MSG_OK;
}
catch(DriverException& de)
{
reconnect();
return analogWrite0(value);
}
}
bool B15F::analogWrite1(uint16_t value)
{
try
{
usart.writeByte(RQ_AA1);
usart.writeInt(value);
uint8_t aw = usart.readByte();
return aw == MSG_OK;
}
catch(DriverException& de)
{
reconnect();
return analogWrite1(value);
}
}
uint16_t B15F::analogRead(uint8_t channel)
{
try
{
usart.writeByte(RQ_ADC);
delay_ms(1);
usart.writeByte(channel);
return usart.readInt();
}
catch(DriverException& de)
{
reconnect();
return analogRead(channel);
}
}
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)
{
discard();
try
{
usart.writeByte(RQ_ADC_DAC_STROKE);
usart.writeByte(channel_a);
usart.writeByte(channel_b);
@ -266,8 +194,7 @@ bool B15F::analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset
if(aw != MSG_OK)
{
std::cout << PRE << "Out of sync" << std::endl;
return analogSequence(channel_a, buffer_a, offset_a, channel_b, buffer_b, offset_b, start, delta, count);
throw DriverException("Out of sync");
}
uint8_t block[5]; // 4 Datenbyte + crc
@ -291,13 +218,7 @@ bool B15F::analogSequence(uint8_t channel_a, uint16_t* buffer_a, uint32_t offset
return aw;
std::cout << PRE << "Da ging etwas verloren" << std::endl;
return analogSequence(channel_a, buffer_a, offset_a, channel_b, buffer_b, offset_b, start, delta, count);
}
catch(DriverException& de)
{
reconnect();
return analogSequence(channel_a, buffer_a, offset_a, channel_b, buffer_b, offset_b, start, delta, count);
}
}
void B15F::delay_ms(uint16_t ms)

Binary file not shown.

BIN
main

Binary file not shown.