Commit 388d2108 authored by Thomas Nadovich's avatar Thomas Nadovich 🌸
Browse files

Merge branch 'feature/fix-jlink-flash' into 'devel'

fixed gdb useage for jlink command (for real this time)

Closes #53

See merge request burt/software/burt-util!63
parents 1393c19e 4a0b9a77
Pipeline #15221 passed with stages
in 1 minute and 16 seconds
......@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [3.1.2]
- actually call gdb-multiarch correctly & specify arch when called (JLink only)
## [3.1.1]
- made gdb-multiarch recomended instead of required for install
## [3.1.0]
- Partial merge of shen yixin's devel branch from estun
- Added '-d' flag to elbow calibrate to support new 3.0.0 elbow firmware with dual encoder calibration based on yixin's changes
......
......@@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
PE_MULTILINK_JTAG_DEFAULT_SERVER = (
"/opt/Freescale/KDS_v3/eclipse/plugins/com.pemicro.debug"
".gdbjtag.pne_2.3.6.201602211227/lin/pegdbserver_console")
PE_MULTILINK_JTAG_DEFAULT_GDB = "gdb"
PE_MULTILINK_JTAG_DEFAULT_GDB = "gdb-multiarch"
PE_MULTILINK_JTAG_DEFAULT_DEVICE = "NXP_K6x_K64FN1M0M12"
@click.group(cls=AliasedGroup)
......@@ -81,6 +81,7 @@ def jlink_program(filename, gdb_server, gdb, device, port="2331", verbose=False)
'-ex', 'set width 0',
'-ex', 'set height 0',
'-ex', 'set verbose off',
'-ex', 'set architecture arm',
'-ex', 'target remote localhost:{0}'.format(port),
'-ex', 'load {0}'.format(filename),
'-ex', 'set confirm off',
......
#!/usr/bin/env python3
__version__ = "3.1.1"
__version__ = "3.1.2"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment