Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Skyward Boardcore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Avionics
Software Development
Skyward Boardcore
Commits
833dd18f
Commit
833dd18f
authored
3 years ago
by
Alberto Nidasio
Browse files
Options
Downloads
Patches
Plain Diff
[AnalogSensors] Implemented offset for load cell and pressure sensors
parent
51bf642e
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/shared/sensors/analog/AnalogLoadCell.h
+12
-1
12 additions, 1 deletion
src/shared/sensors/analog/AnalogLoadCell.h
src/shared/sensors/analog/pressure/AnalogPressureSensor.h
+10
-3
10 additions, 3 deletions
src/shared/sensors/analog/pressure/AnalogPressureSensor.h
with
22 additions
and
4 deletions
src/shared/sensors/analog/AnalogLoadCell.h
+
12
−
1
View file @
833dd18f
...
@@ -45,6 +45,11 @@ public:
...
@@ -45,6 +45,11 @@ public:
bool
selfTest
()
override
{
return
true
;
};
bool
selfTest
()
override
{
return
true
;
};
/**
* @brief Sets the offset that will be removed from the measured load.
*/
void
setOffset
(
const
float
offset
)
{
this
->
offset
=
offset
;
}
AnalogLoadCellData
sampleImpl
()
override
AnalogLoadCellData
sampleImpl
()
override
{
{
ADCData
adcData
=
getVoltage
();
ADCData
adcData
=
getVoltage
();
...
@@ -53,14 +58,20 @@ public:
...
@@ -53,14 +58,20 @@ public:
data
.
loadTimestamp
=
adcData
.
voltageTimestamp
;
data
.
loadTimestamp
=
adcData
.
voltageTimestamp
;
data
.
voltage
=
adcData
.
voltage
;
data
.
voltage
=
adcData
.
voltage
;
data
.
load
=
data
.
voltage
/
conversionCoeff
;
if
(
data
.
voltage
!=
0
)
data
.
load
=
data
.
voltage
/
conversionCoeff
-
offset
;
else
data
.
load
=
-
offset
;
return
data
;
return
data
;
}
}
private
:
private
:
///< Function that returns the sensor voltage.
std
::
function
<
ADCData
()
>
getVoltage
;
std
::
function
<
ADCData
()
>
getVoltage
;
const
float
conversionCoeff
;
const
float
conversionCoeff
;
float
offset
=
0
;
};
};
}
// namespace Boardcore
}
// namespace Boardcore
This diff is collapsed.
Click to expand it.
src/shared/sensors/analog/pressure/AnalogPressureSensor.h
+
10
−
3
View file @
833dd18f
...
@@ -52,7 +52,11 @@ public:
...
@@ -52,7 +52,11 @@ public:
bool
selfTest
()
override
{
return
true
;
}
bool
selfTest
()
override
{
return
true
;
}
///< Converts the voltage value to pressure
/**
* @brief Sets the offset that will be removed from the measured pressure.
*/
void
setOffset
(
const
float
offset
)
{
this
->
offset
=
offset
;
}
AnalogPressureData
sampleImpl
()
override
AnalogPressureData
sampleImpl
()
override
{
{
AnalogPressureData
pressure
;
AnalogPressureData
pressure
;
...
@@ -70,19 +74,22 @@ public:
...
@@ -70,19 +74,22 @@ public:
else
if
(
pressure
.
pressure
>
maxPressure
)
else
if
(
pressure
.
pressure
>
maxPressure
)
pressure
.
pressure
=
maxPressure
;
pressure
.
pressure
=
maxPressure
;
pressure
.
pressure
-=
offset
;
return
pressure
;
return
pressure
;
}
}
protected
:
protected
:
///< Conversion function from volts to pascals
///< Conversion function from volts to pascals
.
virtual
float
voltageToPressure
(
float
voltage
)
=
0
;
virtual
float
voltageToPressure
(
float
voltage
)
=
0
;
///< Function that returns the sensor voltage
///< Function that returns the sensor voltage
.
std
::
function
<
ADCData
()
>
getVoltage
;
std
::
function
<
ADCData
()
>
getVoltage
;
const
float
supplyVoltage
;
const
float
supplyVoltage
;
const
float
maxPressure
;
const
float
maxPressure
;
const
float
minPressure
;
const
float
minPressure
;
float
offset
=
0
;
};
};
}
// namespace Boardcore
}
// namespace Boardcore
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment