Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Rogallina 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
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Old Rockets
Rogallina On-Board Software
Commits
ba5864db
Commit
ba5864db
authored
6 years ago
by
Luca Erbetta
Browse files
Options
Downloads
Patches
Plain Diff
Final config
parent
33b1b76a
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/boards/HeliTest/config.h
+3
-3
3 additions, 3 deletions
src/boards/HeliTest/config.h
src/shared/SharedConfig.h
+3
-3
3 additions, 3 deletions
src/shared/SharedConfig.h
with
6 additions
and
6 deletions
src/boards/HeliTest/config.h
+
3
−
3
View file @
ba5864db
...
...
@@ -35,7 +35,7 @@ namespace RogallinaBoard
/* CUTTER */
static
const
PWMChannel
CUTTER_PWM_CHANNEL
=
PWMChannel
::
CH2
;
static
const
int
CUTTER_PWM_FREQ
=
450
;
static
const
float
CUTTER_PWM_DUTY
=
0.
25
;
static
const
float
CUTTER_PWM_DUTY
=
0.
07
;
static
const
int
CUTTER_PWM_DUTY_RESOLUTION
=
1024
;
static
const
PWM
::
Timer
CUTTER_TIM
{
...
...
@@ -51,7 +51,7 @@ using CUTTER_CSENSE = miosix::Gpio<GPIOC_BASE, 4>;
*/
// Time from pin detachment to cutter activation in ms
static
const
unsigned
int
FREEFALL_TIME_MS
=
3
*
1000
;
static
const
unsigned
int
FREEFALL_TIME_MS
=
2.9
*
1000
;
static
const
unsigned
int
TIMEOUT_STOP_CUTTING
=
15
*
1000
;
static
const
unsigned
int
BRIDGE_DISCHARGE_TIME_MS
=
30
;
...
...
@@ -69,6 +69,6 @@ static constexpr unsigned char DETACHMENT_PIN_NUM = pin1_num;
static
const
PinObserver
::
Transition
DETACHMENT_PIN_TRANSITION
=
PinObserver
::
Transition
::
RISING_EDGE
;
static
constexpr
unsigned
int
DETACHMENT_PIN_THRESHOLD
=
3
;
static
constexpr
unsigned
int
DETACHMENT_PIN_THRESHOLD
=
5
;
}
// namespace RogallinaBoard
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/shared/SharedConfig.h
+
3
−
3
View file @
ba5864db
...
...
@@ -46,7 +46,7 @@
*/
static
const
int
IMU_SAMPLE_RATE
=
150
;
static
const
int
GPS_SAMPLE_RATE
=
5
;
static
const
int
PRESS_SAMPLE_RATE
=
5
0
;
static
const
int
PRESS_SAMPLE_RATE
=
2
0
;
static
constexpr
int
ADC_SAMPLE_RATE
=
20
;
...
...
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