eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Jakob Meier
2021-03-26 12:30:24 +01:00
parent 887a47f7f5 fed2d56e20
commit 1492d168d8
59 changed files with 1403 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
View File

@ -72,7 +72,7 @@ public:
COIL_Z_CURRENT_A, this);
/** All temperatures in [<5B>C] */
lp_var_t<uint16_t> coilXTemperature = lp_var_t<uint16_t>(sid.objectId,
COIL_X_TEMPEARTURE, this);
COIL_X_TEMPERATURE, this);
lp_var_t<uint16_t> coilYTemperature = lp_var_t<uint16_t>(sid.objectId,
COIL_Y_TEMPERATURE, this);
lp_var_t<uint16_t> coilZTemperature = lp_var_t<uint16_t>(sid.objectId,