Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
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
card10
firmware
Commits
2c343717
Commit
2c343717
authored
5 years ago
by
schneider
Browse files
Options
Downloads
Patches
Plain Diff
fix(max30001): Remove some old bhi stuff
parent
1f89a75f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!225
MAX30001 support for epicardium
Pipeline
#3231
passed
5 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
epicardium/modules/max30001.c
+3
-3
3 additions, 3 deletions
epicardium/modules/max30001.c
epicardium/modules/modules.h
+0
-1
0 additions, 1 deletion
epicardium/modules/modules.h
with
3 additions
and
4 deletions
epicardium/modules/max30001.c
+
3
−
3
View file @
2c343717
...
...
@@ -32,10 +32,10 @@ static const gpio_cfg_t analog_switch = {
/* clang-format on */
/*
BHI160
Task ID */
/*
MAX30001
Task ID */
static
TaskHandle_t
max30001_task_id
=
NULL
;
/*
BHI160
Mutex */
/*
MAX30001
Mutex */
static
StaticSemaphore_t
max30001_mutex_data
;
static
SemaphoreHandle_t
max30001_mutex
=
NULL
;
...
...
@@ -383,7 +383,7 @@ void vMAX30001Task(void *pvParameters)
/* Take Mutex during initialization, just in case */
if
(
xSemaphoreTake
(
max30001_mutex
,
0
)
!=
pdTRUE
)
{
LOG_CRIT
(
"max30001"
,
"Failed to acquire
BHI160
mutex!"
);
LOG_CRIT
(
"max30001"
,
"Failed to acquire
MAX30001
mutex!"
);
vTaskDelay
(
portMAX_DELAY
);
}
...
...
This diff is collapsed.
Click to expand it.
epicardium/modules/modules.h
+
0
−
1
View file @
2c343717
...
...
@@ -90,7 +90,6 @@ void disp_forcelock();
#define BHI160_MUTEX_WAIT_MS 50
void
vBhi160Task
(
void
*
pvParameters
);
#define MAX30001_FIFO_SIZE 128
#define MAX30001_MUTEX_WAIT_MS 50
void
vMAX30001Task
(
void
*
pvParameters
);
...
...
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