Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
On-Board Software
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
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
On-Board Software
Commits
7b7c3736
Commit
7b7c3736
authored
11 months ago
by
Federico Mandelli
Browse files
Options
Downloads
Patches
Plain Diff
[Sensors] Updated adc frequency to 1,6khz and fixed warning
parent
f7970bb3
No related branches found
No related tags found
No related merge requests found
Checking pipeline status
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/boards/MockupMain/Configs/SensorsConfig.h
+4
-3
4 additions, 3 deletions
src/boards/MockupMain/Configs/SensorsConfig.h
src/boards/MockupMain/PinHandler/PinHandler.h
+1
-2
1 addition, 2 deletions
src/boards/MockupMain/PinHandler/PinHandler.h
with
5 additions
and
5 deletions
src/boards/MockupMain/Configs/SensorsConfig.h
+
4
−
3
View file @
7b7c3736
/* Copyright (c) 2024 Skyward Experimental Rocketry
* Author: Angelo Prete
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
...
...
@@ -92,9 +93,9 @@ constexpr auto UBXGPS_PERIOD = 6_hz;
// ADS
constexpr
Boardcore
::
ADS131M08Defs
::
OversamplingRatio
ADS131M08_OVERSAMPLING_RATIO
=
Boardcore
::
ADS131M08Defs
::
OversamplingRatio
::
OSR_
1024
;
Boardcore
::
ADS131M08Defs
::
OversamplingRatio
::
OSR_
512
;
constexpr
bool
ADS131M08_GLOBAL_CHOP_MODE
=
true
;
constexpr
auto
ADS131M08_PERIOD
=
1
0
00
_hz
;
constexpr
auto
ADS131M08_PERIOD
=
1
6
00
_hz
;
// UNUSED - How many bytes go into the fifo each second
constexpr
unsigned
int
BMX160_FIFO_FILL_RATE
=
...
...
@@ -131,7 +132,7 @@ constexpr auto INTERNAL_ADC_SAMPLE_PERIOD = 1_hz;
constexpr
auto
INTERNAL_TEMP_SAMPLE_PERIOD
=
1
_hz
;
// LoadCell
constexpr
auto
LOAD_CELL_SAMPLE_PERIOD
=
1000
_hz
;
constexpr
auto
LOAD_CELL_SAMPLE_PERIOD
=
ADS131M08_PERIOD
;
constexpr
Boardcore
::
ADS131M08Defs
::
Channel
LOAD_CELL_ADC_CHANNEL
=
Boardcore
::
ADS131M08Defs
::
Channel
::
CHANNEL_0
;
// TODO set calibration
...
...
This diff is collapsed.
Click to expand it.
src/boards/MockupMain/PinHandler/PinHandler.h
+
1
−
2
View file @
7b7c3736
...
...
@@ -60,9 +60,8 @@ public:
private:
Boardcore
::
PrintLogger
logger
=
Boardcore
::
Logging
::
getLogger
(
"pinhandler"
);
Boardcore
::
PinObserver
pinObserver
;
std
::
atomic
<
bool
>
running
;
Boardcore
::
PinObserver
pinObserver
;
};
}
// namespace MockupMain
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