Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
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
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
9220dc46
Commit
9220dc46
authored
Jul 8, 2015
by
Daniel Campora
Browse files
Options
Downloads
Patches
Plain Diff
cc3200: Correct udelay us to ticks calculation.
parent
d18ced9c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
cc3200/bootmgr/main.c
+4
-4
4 additions, 4 deletions
cc3200/bootmgr/main.c
cc3200/hal/cc3200_hal.c
+1
-3
1 addition, 3 deletions
cc3200/hal/cc3200_hal.c
cc3200/hal/cc3200_hal.h
+1
-1
1 addition, 1 deletion
cc3200/hal/cc3200_hal.h
with
6 additions
and
8 deletions
cc3200/bootmgr/main.c
+
4
−
4
View file @
9220dc46
...
...
@@ -64,11 +64,11 @@
#define BOOTMGR_HASH_SIZE 32
#define BOOTMGR_BUFF_SIZE 512
#define BOOTMGR_WAIT_SAFE_MODE_MS
1
200
#define BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS
2
00
#define BOOTMGR_WAIT_SAFE_MODE_MS 2
4
00
#define BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS
4
00
#define BOOTMGR_SAFE_MODE_ENTER_MS
8
00
#define BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS
8
0
#define BOOTMGR_SAFE_MODE_ENTER_MS
16
00
#define BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS
16
0
//*****************************************************************************
// Exported functions declarations
...
...
This diff is collapsed.
Click to expand it.
cc3200/hal/cc3200_hal.c
+
1
−
3
View file @
9220dc46
...
...
@@ -123,9 +123,7 @@ void HAL_Delay(uint32_t delay) {
#endif
}
else
{
for
(
int
ms
=
0
;
ms
<
delay
;
ms
++
)
{
// 500 instead of 1000 us to compensate the overhead of the for loop
// and the function call
UtilsDelay
(
UTILS_DELAY_US_TO_COUNT
(
500
));
UtilsDelay
(
UTILS_DELAY_US_TO_COUNT
(
1000
));
}
}
}
...
...
This diff is collapsed.
Click to expand it.
cc3200/hal/cc3200_hal.h
+
1
−
1
View file @
9220dc46
...
...
@@ -37,7 +37,7 @@
#define HAL_FCPU_MHZ 80U
#define HAL_FCPU_HZ (1000000U * HAL_FCPU_MHZ)
#define HAL_SYSTICK_PERIOD_US 1000U
#define UTILS_DELAY_US_TO_COUNT(us) (((us) * HAL_FCPU_MHZ) /
3
)
#define UTILS_DELAY_US_TO_COUNT(us) (((us) * HAL_FCPU_MHZ) /
6
)
#define HAL_NVIC_INT_CTRL_REG (*((volatile uint32_t *) 0xE000ED04 ) )
#define HAL_VECTACTIVE_MASK (0x1FUL)
...
...
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