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

usart revised

Browse source
This commit is contained in:
Tristan Krause 2019-06-06 12:00:52 +02:00
parent 3f0fe49644
commit ff84de538a
7 changed files with 127 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
control/src/.idea/workspace.xml
View file

@ -12,7 +12,11 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d13a1bae-0fd7-48fc-b53c-d6dd1aaf95b9" name="Default Changelist" comment=""> <list default="true" id="d13a1bae-0fd7-48fc-b53c-d6dd1aaf95b9" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/cli.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/cli.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/drv/b15f.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/drv/b15f.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/drv/timeoutexception.h" beforeDir="false" afterPath="$PROJECT_DIR$/drv/timeoutexception.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/drv/usart.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/drv/usart.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/drv/usart.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/drv/usart.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/drv/usart.cpp.orig" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/drv/usart.h" beforeDir="false" afterPath="$PROJECT_DIR$/drv/usart.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/drv/usart.h" beforeDir="false" afterPath="$PROJECT_DIR$/drv/usart.h" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
@ -40,7 +44,7 @@
<entry file="file://$PROJECT_DIR$/drv/usart.h"> <entry file="file://$PROJECT_DIR$/drv/usart.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="396">
<caret line="125" column="8" selection-start-line="125" selection-start-column="8" selection-end-line="125" selection-end-column="8" /> <caret line="126" column="44" selection-start-line="126" selection-start-column="44" selection-end-line="126" selection-end-column="44" />
<folding> <folding>
<element signature="e#33#51#0" expanded="true" /> <element signature="e#33#51#0" expanded="true" />
</folding> </folding>
@ -48,13 +52,25 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drv/usart.cpp"> <entry file="file://$PROJECT_DIR$/drv/usartexception.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="291">
<caret line="83" column="80" selection-start-line="83" selection-start-column="80" selection-end-line="83" selection-end-column="80" /> <caret line="33" column="30" lean-forward="true" selection-start-line="33" selection-start-column="30" selection-end-line="33" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#20#0" expanded="true" /> <element signature="e#51#71#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drv/timeoutexception.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
<folding>
<element signature="e#55#75#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -63,7 +79,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drv/backup.cpp"> <entry file="file://$PROJECT_DIR$/drv/backup.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546"> <state relative-caret-position="780">
<caret line="52" selection-start-line="52" selection-end-line="52" /> <caret line="52" selection-start-line="52" selection-end-line="52" />
</state> </state>
</provider> </provider>
@ -72,7 +88,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drv/b15f.h"> <entry file="file://$PROJECT_DIR$/drv/b15f.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510"> <state relative-caret-position="285">
<caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" /> <caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
</state> </state>
</provider> </provider>
@ -81,8 +97,17 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp"> <entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546"> <state relative-caret-position="375">
<caret line="108" column="41" selection-start-line="108" selection-start-column="41" selection-end-line="108" selection-end-column="41" /> <caret line="154" selection-start-line="154" selection-end-line="154" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cli.cpp">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" selection-start-column="2" selection-end-column="2" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -110,10 +135,12 @@
<list> <list>
<option value="$PROJECT_DIR$/drv/backup.cpp" /> <option value="$PROJECT_DIR$/drv/backup.cpp" />
<option value="$PROJECT_DIR$/drv/usartexception.h" /> <option value="$PROJECT_DIR$/drv/usartexception.h" />
<option value="$PROJECT_DIR$/drv/b15f.cpp" />
<option value="$PROJECT_DIR$/Makefile" /> <option value="$PROJECT_DIR$/Makefile" />
<option value="$PROJECT_DIR$/drv/timeoutexception.h" />
<option value="$PROJECT_DIR$/drv/usart.h" /> <option value="$PROJECT_DIR$/drv/usart.h" />
<option value="$PROJECT_DIR$/drv/usart.cpp" /> <option value="$PROJECT_DIR$/drv/usart.cpp" />
<option value="$PROJECT_DIR$/drv/b15f.cpp" />
<option value="$PROJECT_DIR$/cli.cpp" />
</list> </list>
</option> </option>
</component> </component>
@ -197,18 +224,18 @@
<updated>1559118962147</updated> <updated>1559118962147</updated>
<workItem from="1559118964304" duration="1913000" /> <workItem from="1559118964304" duration="1913000" />
<workItem from="1559633658436" duration="5344000" /> <workItem from="1559633658436" duration="5344000" />
<workItem from="1559813060146" duration="1344000" /> <workItem from="1559813060146" duration="2140000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="8601000" /> <option name="totallyTimeSpent" value="9397000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="67" y="25" width="1853" height="1055" extended-state="6" /> <frame x="67" y="25" width="1853" height="1055" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.255119" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.255119" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -220,7 +247,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="7" /> <window_info anchor="bottom" id="Database Changes" order="7" />
<window_info anchor="bottom" id="Messages" order="8" weight="0.32937366" /> <window_info anchor="bottom" id="Messages" order="8" weight="0.32937366" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" sideWeight="0.4997233" visible="true" weight="0.32181427" /> <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.4997233" visible="true" weight="0.32181427" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5002767" side_tool="true" weight="0.32181427" /> <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5002767" side_tool="true" weight="0.32181427" />
<window_info anchor="bottom" id="Version Control" order="11" /> <window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="CMake" order="12" weight="0.33045357" /> <window_info anchor="bottom" id="CMake" order="12" weight="0.33045357" />
@ -235,13 +262,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/drv/usartexception.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="43">
<caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Makefile"> <entry file="file://$PROJECT_DIR$/Makefile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106"> <state relative-caret-position="106">
@ -256,46 +276,73 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/drv/b15f.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546">
<caret line="108" column="41" selection-start-line="108" selection-start-column="41" selection-end-line="108" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/drv/backup.cpp"> <entry file="file://$PROJECT_DIR$/drv/backup.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546"> <state relative-caret-position="780">
<caret line="52" selection-start-line="52" selection-end-line="52" /> <caret line="52" selection-start-line="52" selection-end-line="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/drv/usart.h"> <entry file="file://$PROJECT_DIR$/drv/usartexception.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="291">
<caret line="125" column="8" selection-start-line="125" selection-start-column="8" selection-end-line="125" selection-end-column="8" /> <caret line="33" column="30" lean-forward="true" selection-start-line="33" selection-start-column="30" selection-end-line="33" selection-end-column="30" />
<folding> <folding>
<element signature="e#33#51#0" expanded="true" /> <element signature="e#51#71#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/drv/timeoutexception.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
<folding>
<element signature="e#55#75#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/drv/b15f.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/drv/usart.cpp"> <entry file="file://$PROJECT_DIR$/drv/usart.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="306">
<caret line="83" column="80" selection-start-line="83" selection-start-column="80" selection-end-line="83" selection-end-column="80" /> <caret line="93" column="45" selection-start-line="93" selection-start-column="45" selection-end-line="93" selection-end-column="45" />
<folding> <folding>
<element signature="e#0#20#0" expanded="true" /> <element signature="e#0#20#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/drv/usart.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="126" column="44" selection-start-line="126" selection-start-column="44" selection-end-line="126" selection-end-column="44" />
<folding>
<element signature="e#33#51#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="154" selection-start-line="154" selection-end-line="154" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cli.cpp">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" selection-start-column="2" selection-end-column="2" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

2
control/src/cli.cpp
View file

@ -1,4 +1,4 @@
#define B15F_CLI_DEBUG //#define B15F_CLI_DEBUG
#include <stdio.h> #include <stdio.h>
#include <ncurses.h> // sudo apt-get install libncurses5-dev #include <ncurses.h> // sudo apt-get install libncurses5-dev

3
control/src/drv/b15f.cpp
View file

@ -143,7 +143,6 @@ std::vector<std::string> B15F::getBoardInfo(void)
uint8_t n; uint8_t n;
usart.receive(&n, 0, sizeof(n)); usart.receive(&n, 0, sizeof(n));
std::cout << "len: " << (int) n << std::endl << std::flush;
while (n--) while (n--)
{ {
uint8_t len; uint8_t len;
@ -153,8 +152,6 @@ std::vector<std::string> B15F::getBoardInfo(void)
str[len] = '\0'; str[len] = '\0';
usart.receive(reinterpret_cast<uint8_t *>(&str[0]), 0, len); usart.receive(reinterpret_cast<uint8_t *>(&str[0]), 0, len);
std::cout << &str[0] << std::endl;
info.push_back(std::string(str)); info.push_back(std::string(str));
} }

33
control/src/drv/timeoutexception.h
View file

@ -2,36 +2,45 @@
#define TIMEOUTEXCEPTION_H #define TIMEOUTEXCEPTION_H
#include <exception> #include <exception>
#include <string>
// SOURCE: https://stackoverflow.com/a/8152888
/*! Exception for USART related timeouts. */ /*! Exception for USART related timeouts. */
class TimeoutException: public std::exception class TimeoutException: public std::exception
{ {
public: public:
explicit TimeoutException(const char* message, int timeout) : TimeoutException(std::string(message), timeout) /**
* Constructor
* @param message as c-string
*/
explicit TimeoutException(const char* message) : msg(message)
{ {
} }
explicit TimeoutException(const std::string& message, int timeout) : msg(message), m_timeout(timeout) /**
{ * Constructor
if(!msg.length()) * @param message as c++-string
msg = "Timeout reached (" + std::to_string(m_timeout) + ")"; */
} explicit TimeoutException(const std::string& message) : msg(message)
virtual ~TimeoutException() throw ()
{ {
} }
/**
* Standard-destructor
*/
virtual ~TimeoutException() = default;
/**
* Get failure description
* @return error message as c-string
*/
virtual const char* what() const throw () virtual const char* what() const throw ()
{ {
return msg.c_str(); return msg.c_str();
} }
protected: protected:
std::string msg; std::string msg; //!< failure description
int m_timeout;
}; };
#endif // TIMEOUTEXCEPTION_H #endif // TIMEOUTEXCEPTION_H

14
control/src/drv/usart.cpp
View file

@ -75,15 +75,25 @@ void USART::flushOutputBuffer()
void USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len) void USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len)
{ {
int bytes_avail, code; int bytes_avail, code;
auto start = std::chrono::steady_clock::now();
auto end = std::chrono::steady_clock::now();
do do
{ {
code = ioctl(file_desc, FIONREAD, &bytes_avail); code = ioctl(file_desc, FIONREAD, &bytes_avail);
if(code) if (code)
throw USARTException( throw USARTException(
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) + std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
", " + strerror(code) + " (code " + std::to_string(code) + ")"); ", " + strerror(code) + " (code " + std::to_string(code) + ")");
end = std::chrono::steady_clock::now();
long elapsed =
std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 100; // in Dezisekunden
if (elapsed >= timeout)
throw TimeoutException(
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
", " + std::to_string(elapsed) + " / " + std::to_string(timeout) + " ds");
} }
while(bytes_avail < len); while (bytes_avail < len);
code = read(file_desc, buffer + offset, len); code = read(file_desc, buffer + offset, len);
if (code != len) if (code != len)

121
control/src/drv/usart.cpp.orig
View file

@ -1,121 +0,0 @@
#include <stdexcept>
#include "usart.h"
USART::~USART()
{
closeDevice();
}
void USART::openDevice(std::string device)
{
// Benutze blockierenden Modus
file_desc = open(device.c_str(), O_RDWR | O_NOCTTY);// | O_NDELAY
if (file_desc <= 0)
throw USARTException("Fehler beim Öffnen des Gerätes");
struct termios options;
int code = tcgetattr(file_desc, &options);
if (code)
throw USARTException("Fehler beim Lesen der Geräteparameter");
options.c_cflag = CS8 | CLOCAL | CREAD;
options.c_iflag = IGNPAR;
options.c_oflag = 0;
options.c_lflag = 0;
options.c_cc[VMIN] = 0;
options.c_cc[VTIME] = timeout;
code = cfsetspeed(&options, baudrate);
if (code)
throw USARTException("Fehler beim Setzen der Baudrate");
code = tcsetattr(file_desc, TCSANOW, &options);
if (code)
throw USARTException("Fehler beim Setzen der Geräteparameter");
code = fcntl(file_desc, F_SETFL, 0); // blockierender Modus
if (code)
throw USARTException("Fehler beim Aktivieren des blockierenden Modus'");
clearOutputBuffer();
clearInputBuffer();
}
void USART::closeDevice()
{
if (file_desc > 0)
{
int code = close(file_desc);
if (code)
throw USARTException("Fehler beim Schließen des Gerätes");
file_desc = -1;
}
}
void USART::clearInputBuffer()
{
int code = tcflush(file_desc, TCIFLUSH);
if (code)
throw USARTException("Fehler beim Leeren des Eingangspuffers");
}
void USART::clearOutputBuffer()
{
int code = tcflush(file_desc, TCOFLUSH);
if (code)
throw USARTException("Fehler beim Leeren des Ausgangspuffers");
}
void USART::flushOutputBuffer()
{
int code = tcdrain(file_desc);
if (code)
throw USARTException("Fehler beim Versenden des Ausgangspuffers");
}
void USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len)
{
int bytes_avail, code;
do
{
code = ioctl(file_desc, FIONREAD, &bytes_avail);
if(code)
throw USARTException(
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
", " + strerror(code) + " (code " + std::to_string(code) + ")");
} while(bytes_avail < len);
code = read(file_desc, buffer + offset, len);
if (code != len)
throw USARTException(
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
}
void USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len)
{
int code = write(file_desc, buffer + offset, len);
if (code != len)
throw USARTException(
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
}
uint32_t USART::getBaudrate()
{
return baudrate;
}
uint8_t USART::getTimeout()
{
return timeout;
}
void USART::setBaudrate(uint32_t baudrate)
{
this->baudrate = baudrate;
}
void USART::setTimeout(uint8_t timeout)
{
this->timeout = timeout;
}

5
control/src/drv/usart.h
View file

@ -2,13 +2,14 @@
#define USART_H #define USART_H
#include <cstdint> #include <cstdint>
#include <chrono>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <termios.h> #include <termios.h>
#include <iostream>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <string.h> #include <string.h>
#include "usartexception.h" #include "usartexception.h"
#include "timeoutexception.h"
/*! C++ Wrapper class for termios usart library. */ /*! C++ Wrapper class for termios usart library. */
@ -125,7 +126,7 @@ private:
int file_desc = -1; //!< Linux Dateideskriptor int file_desc = -1; //!< Linux Dateideskriptor
uint32_t baudrate = 9600; //!< Standard-Baudrate, sollte mit setBaudrate() überschrieben werden! uint32_t baudrate = 9600; //!< Standard-Baudrate, sollte mit setBaudrate() überschrieben werden!
uint8_t timeout = 100; //!< in Dezisekunden uint8_t timeout = 10; //!< in Dezisekunden
}; };
#endif // USART_H #endif // USART_H