Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ACPS (E-24)
public
ahoi
firmware
Compare revisions
b599c4c71d41fdcc9b4bf0bd840afca660b1e1e3 to 17f90e50b15d7328a647336879ecbd817268ce9b
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
e-24/public/ahoi/firmware
Select target project
No results found
17f90e50b15d7328a647336879ecbd817268ce9b
Select Git revision
Swap
Target
e-24/public/ahoi/firmware
Select target project
e-24/public/ahoi/firmware
1 result
b599c4c71d41fdcc9b4bf0bd840afca660b1e1e3
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
fixed potential bug causing very delay in ADDA switching
· 3283eb2d
Bernd-Christian Renner
authored
2 years ago
3283eb2d
modified LICENSE file
· 17f90e50
Bernd-Christian Renner
authored
2 years ago
17f90e50
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
LICENSE
+1
-1
1 addition, 1 deletion
LICENSE
src/hal/mcu/mcu_adda.c
+6
-4
6 additions, 4 deletions
src/hal/mcu/mcu_adda.c
with
7 additions
and
5 deletions
LICENSE
View file @
17f90e50
BSD 3-Clause License
Copyright (c) 20
19, smartport / public / ahoi
Copyright (c) 20
22, Hamburg University of Technology (TUHH).
All rights reserved.
Redistribution and use in source and binary forms, with or without
...
...
This diff is collapsed.
Click to expand it.
src/hal/mcu/mcu_adda.c
View file @
17f90e50
...
...
@@ -272,8 +272,9 @@ adda_activateSampling(void)
spi_transmit
((
void
*
)
&
SPI_TX_ShdnSample
);
// wait remaining time
if
(
adda_getTimerTicks
()
-
start
<
TXRX_TURNAROUND_TICKS
)
{
adda_wait
(
TXRX_TURNAROUND_TICKS
-
(
adda_getTimerTicks
()
-
start
));
sample_time_t
dt
=
adda_getTimerTicks
()
-
start
;
if
(
dt
<
TXRX_TURNAROUND_TICKS
)
{
adda_wait
(
TXRX_TURNAROUND_TICKS
-
dt
);
}
}
else
{
txamp_disconnectOutput
();
...
...
@@ -322,8 +323,9 @@ adda_activateTransmission()
txEnabled
=
true
;
// wait remaining time
if
(
adda_getTimerTicks
()
-
start
<
RXTX_TURNAROUND_TICKS
)
{
adda_wait
(
RXTX_TURNAROUND_TICKS
-
(
adda_getTimerTicks
()
-
start
));
sample_time_t
dt
=
adda_getTimerTicks
()
-
start
;
if
(
dt
<
RXTX_TURNAROUND_TICKS
)
{
adda_wait
(
RXTX_TURNAROUND_TICKS
-
dt
);
}
// connect hydrophone to TX circuitry (and disconnect RX) after
...
...
This diff is collapsed.
Click to expand it.