Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
bioloid_stm32_fw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
humanoides
bioloid_stm32_fw
Merge requests
!1
Revert "Changes to use the new momory data structures to handle the devices modules memory."
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Revert "Changes to use the new momory data structures to handle the devices modules memory."
revert-59fde70f
into
master
Overview
0
Commits
1
Pipelines
0
Changes
21
Merged
Sergi Hernandez
requested to merge
revert-59fde70f
into
master
7 years ago
Overview
0
Commits
1
Pipelines
0
Changes
21
Expand
This reverts commit
59fde70f
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
2741aab9
1 commit,
7 years ago
21 files
+
803
−
648
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
21
Search (e.g. *.vue) (Ctrl+P)
include/adc_dma.h
+
4
−
3
Options
@@ -6,13 +6,11 @@ extern "C" {
#endif
#include
"stm32f4xx.h"
#include
"adc_dma_registers.h"
#include
"memory.h"
typedef
enum
{
ADC_CH1
,
ADC_CH2
,
ADC_CH3
,
ADC_CH4
,
ADC_CH6
,
ADC_CH8
}
adc_ch_t
;
// public functions
uint8_t
adc_init
(
TMemory
*
memory
);
void
adc_init
(
void
);
void
adc_start
(
void
);
void
adc_set_period
(
uint8_t
period_ms
);
inline
uint8_t
adc_get_period
(
void
);
@@ -20,6 +18,9 @@ unsigned short adc_get_channel(adc_ch_t channel);
unsigned
short
adc_get_channel_raw
(
adc_ch_t
channel
);
unsigned
short
adc_get_temperature
(
void
);
void
adc_stop
(
void
);
// operation functions
uint8_t
adc_in_range
(
unsigned
short
int
address
,
unsigned
short
int
length
);
void
adc_process_write_cmd
(
unsigned
short
int
address
,
unsigned
short
int
length
,
unsigned
char
*
data
);
#ifdef __cplusplus
}
Loading