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

Kommentare

Browse source
This commit is contained in:
devfix 2019-07-02 12:18:05 +02:00
parent a43c161091
commit 018bd1057d
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
control/src/commit_hash.h
View file

@ -1,4 +1,4 @@
#ifndef COMMIT_HASH_H
#define COMMIT_HASH_H
const char COMMIT_HASH[] = "e016a52459314099549511bb1fed60b3e8f58fa3";
const char COMMIT_HASH[] = "a43c1610917fa01cb5fb07edbb2090d01fb846f7";
#endif // COMMIT_HASH_H

2
control/src/drv/b15f.h
View file

@ -332,6 +332,7 @@ private:
/**
* Wirft eine Exception, falls der Code ungleich dem erwarteten Wert ist.
* Wird durch den Wrapper assertCode(code, expectation) aufgerufen.
* \throws DriverException
*/
template<typename CodeType, typename ExpectationType>
@ -343,6 +344,7 @@ private:
/**
* Wirft eine Exception, falls die Request die falsche Länge hat.
* Wird durch den Wrapper assertRequestLength(rq, rq_num) aufgerufen.
* \throws DriverException
*/
template<size_t RequestLength>

10
control/src/drv/dot.h
View file

@ -18,23 +18,23 @@ public:
Dot(uint16_t x, uint16_t y, uint8_t curve);
/**
* Returns the x coordinate.
* \return the x coordinate
*/
uint16_t getX(void) const;
/**
* Returns the y coordinate.
* \return the y coordinate
*/
uint16_t getY(void) const;
/**
* Returns the curve index.
* \return the curve index
*/
uint8_t getCurve(void) const;
private:
uint16_t x, y;
uint8_t curve;
const uint16_t x, y; //!< coordinates of this dot
const uint8_t curve; //!< curve index of this dot
};

16
control/src/drv/plottyfile.h
View file

@ -194,16 +194,16 @@ private:
uint16_t ref_y = 1023;
uint16_t para_first = 1;
uint16_t para_stepwidth = 1;
std::string unit_x;
std::string desc_x;
std::string unit_y;
std::string desc_y;
std::string unit_para;
std::string desc_para;
std::string unit_x; //!< unit name for x-axis
std::string desc_x; //!< description for x-axis
std::string unit_y; //!< unit name for y-axis
std::string desc_y; //!< description for y-axis
std::string unit_para; //!< unit name for parameter
std::string desc_para; //!< description for parameter
const uint8_t eof = 0xD;
constexpr static uint8_t STR_LEN_SHORT = 10;
constexpr static uint8_t STR_LEN_LARGE = 20;
constexpr static uint8_t STR_LEN_SHORT = 10; //!< string length for short string in header
constexpr static uint8_t STR_LEN_LARGE = 20; //!< string length for large string in header
};
#endif // PLOTTYFILE_H