Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
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
Package registry
Model registry
Operate
Environments
Terraform modules
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
d16d66f9
Commit
d16d66f9
authored
12 years ago
by
Lorenz Meier
Browse files
Options
Downloads
Patches
Plain Diff
Enabled UART3, added JTAG make target for IO, removed potentially problematic usleep
parent
20973d60
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+13
-2
13 additions, 2 deletions
Makefile
apps/drivers/px4io/px4io.cpp
+0
-1
0 additions, 1 deletion
apps/drivers/px4io/px4io.cpp
nuttx/configs/px4io/io/defconfig
+1
-1
1 addition, 1 deletion
nuttx/configs/px4io/io/defconfig
with
14 additions
and
4 deletions
Makefile
+
13
−
2
View file @
d16d66f9
...
...
@@ -114,10 +114,21 @@ endif
upload
:
$(FIRMWARE_BUNDLE) $(UPLOADER)
@
python
-u
$(
UPLOADER
)
--port
$(
SERIAL_PORTS
)
$(
FIRMWARE_BUNDLE
)
#
# JTAG firmware uploading with OpenOCD
#
ifeq
($(JTAGCONFIG),)
JTAGCONFIG
=
interface/olimex-jtag-tiny.cfg
endif
upload-jtag-px4fmu
:
@
echo
Attempting to flash PX4FMU board via JTAG
@
openocd
-f
interface/olimex-jtag-tiny.cfg
-f
../Bootloader/stm32f4x.cfg
-c
init
-c
"reset halt"
-c
"flash write_image erase nuttx/nuttx"
-c
"flash write_image erase ../Bootloader/px4fmu_bl.elf"
-c
"reset run"
-c
shutdown
@
openocd
-f
$(
JTAGCONFIG
)
-f
../Bootloader/stm32f4x.cfg
-c
init
-c
"reset halt"
-c
"flash write_image erase nuttx/nuttx"
-c
"flash write_image erase ../Bootloader/px4fmu_bl.elf"
-c
"reset run"
-c
shutdown
upload-jtag-px4io
:
all
@
echo
Attempting to flash PX4IO board via JTAG
@
openocd
-f
$(
JTAGCONFIG
)
-f
../Bootloader/stm32f1x.cfg
-c
init
-c
"reset halt"
-c
"flash write_image erase nuttx/nuttx"
-c
"flash write_image erase ../Bootloader/px4io_bl.elf"
-c
"reset run"
-c
shutdown
#
# Hacks and fixups
...
...
This diff is collapsed.
Click to expand it.
apps/drivers/px4io/px4io.cpp
+
0
−
1
View file @
d16d66f9
...
...
@@ -348,7 +348,6 @@ PX4IO::task_main()
/* this would be bad... */
if
(
ret
<
0
)
{
log
(
"poll error %d"
,
errno
);
usleep
(
1000000
);
continue
;
}
...
...
This diff is collapsed.
Click to expand it.
nuttx/configs/px4io/io/defconfig
+
1
−
1
View file @
d16d66f9
...
...
@@ -124,7 +124,7 @@ CONFIG_STM32_TIM7=n
CONFIG_STM32_WWDG=n
CONFIG_STM32_SPI2=n
CONFIG_STM32_USART2=y
CONFIG_STM32_USART3=
n
CONFIG_STM32_USART3=
y
CONFIG_STM32_I2C1=y
CONFIG_STM32_I2C2=n
CONFIG_STM32_BKP=n
...
...
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