Skip to content

Commit

Permalink
Minor formatting fixes & corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
Nightwalker-87 committed May 24, 2020
1 parent 937f4d6 commit fd2a5c3
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 18 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@ Recent new features and bugfixes can be found in the [Changelog](CHANGELOG.md) o

#### License

The stlink library and tools are licensed under the **[BSD-3 License](LICENSE.md)**.<br />
The source files **stm32l0x.s** and **stm32lx.s** found in the subdirectory `/flashloaders/`
are licensed under the **General Public License (GPL v2+)**.
The stlink library and tools are licensed under the **[BSD-3 License](LICENSE.md)**.


## Introduction

STLink is an open source toolset to program and debug STM32 devices and boards manufactured by STMicroelectronics.
It supports several so called STLINK programmer boards (and clones thereof) which use a microcontroller chip
to translate commands from USB to JTAG/SWD. There are four generations available on the market:
It supports several so called STLINK programmer boards (and clones thereof) which use a microcontroller chip to translate commands from USB to JTAG/SWD. There are four generations available on the market which are _all_ supported by this toolset:

* **STLINK/v1** _(obsolete as of 21-11-2019)_
- transport layer: SCSI passthru commands over USB
Expand Down Expand Up @@ -59,7 +56,7 @@ Supported operating systems are listed in [version_support.md](doc/version_suppo

## Tutorial & HOWTO

Our [tutorial.md](doc/tutorial.md) may help you along with some advanced tasks and additional info.
Our [tutorial](doc/tutorial.md) may help you along with some advanced tasks and additional info.


## Installation
Expand Down
6 changes: 6 additions & 0 deletions contributors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Ethan Zonca
Fabien Chouteau
Florian Hars
Friedrich Beckmann
Gabriel Górski [Glaeqen]
Geoffrey Brown
George Talusan [gtalusan]
Georg von Zengen
Expand All @@ -60,6 +61,7 @@ Jerome Lambourg
Jim Paris
Jiří Netolický
Jerry Nosky [jnosky]
Jochen Wilhelmy [Jochen0x90h]
Johannes Taelman
Jonas Danielsson
Jonas Norling
Expand All @@ -68,6 +70,7 @@ Karl Palsson [karlp]
Kevlar Harness
Kyle Manna
Lari Lehtomäki
Lutz Freitag [nerdmaennchen]
Martin Nowak
Matteo Collina
Max Chen
Expand All @@ -76,6 +79,7 @@ Maxime Vincent
Michael Pratt [prattmic]
Michael Sparmann
Mike Szczys
Miklós Márton [martonmiklos]
Magnus Lundin [mlu]
mux <freelancer.c@gmail.com>
Ned Konz
Expand All @@ -89,6 +93,7 @@ orangeudav <orangeudav@gmail.com>
Pavel Kirienko
Pekka Nikander
Pete Nelson
Peter Torelli [petertorelli]
Peter Zotov
Petteri Aimonen
Piotr Haber
Expand All @@ -99,6 +104,7 @@ Rob Spanton
Rytis Karpuska
Sean Simmons
Sergey Alirzaev
Simon Derr [sderr]
Simon Wright
Stany Marcel
Stefan Misik
Expand Down
7 changes: 4 additions & 3 deletions doc/app-example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ cmake_minimum_required(VERSION 3.4.2)

project(st-hello)
set(PROJECT_VERSION 0.1)

set(SRCS main.c)

include_directories(${STLINK_INCLUDE_DIRS})

find_package(PkgConfig)
pkg_check_modules(STLINK REQUIRED stlink)

set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall -Werror")

include_directories(${STLINK_INCLUDE_DIRS})

add_executable(${PROJECT_NAME} ${SRCS})

target_link_libraries(${PROJECT_NAME} ${STLINK_LIBRARIES})

install(TARGETS ${PROJECT_NAME} DESTINATION bin)
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
2 changes: 1 addition & 1 deletion doc/app-example/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This is a simple standalone application example that uses libstlink.
You can use this as a boilerplate for your own app development
It can be used as a boilerplate for app development.
7 changes: 3 additions & 4 deletions doc/app-example/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
#include <stdlib.h>
#include <stlink.h>

static stlink_t *stlink_open_first(void)
{
static stlink_t *stlink_open_first(void) {
stlink_t* sl = NULL;
sl = stlink_v1_open(0, 1);
if (sl == NULL)
Expand All @@ -13,8 +12,7 @@ static stlink_t *stlink_open_first(void)
}


int main()
{
int main() {
stlink_t* sl = NULL;
sl = stlink_open_first();

Expand All @@ -25,5 +23,6 @@ int main()

fprintf(stderr, "STlink device opened, that's cool!\n");
stlink_close(sl);

return 0;
}
2 changes: 1 addition & 1 deletion doc/devices_boards.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Tested boards [incl. STLink programmers]:
| 0x430 | XL-Density | xF XG | | F101 | | F103 | |

Tested boards [incl. STLink programmers]:
* 32VL-Discovery (STM32F100RBT6) with STLink-v1 [v1, v2]
* STM32VL-Discovery (STM32F100RBT6) with STLink-v1 [v1, v2]
* STM32F103-Bluepill: C8Tx & R8xx [v2]
* Nucleo-F103RB [v2-1]
* HY-STM32 (STM32F103VETx) [v1, v2]
Expand Down
2 changes: 1 addition & 1 deletion doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Release

This document describes the necessary steps for developers to create a release:

1. Update `CHANGELOG.md` and `cmake/packaging/deb/changelog`
1. Update `CHANGELOG.md`
2. Update `.version` with semantic version: `x.x.x`
3. Update `README.md` with semantic version `x.x.x` in commits badge
4. Create and push git tag and commits `git tag x.x.x`
Expand Down
2 changes: 2 additions & 0 deletions doc/version_support.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Thus no user interaction regarding libusb is necessary.
| homebrew | 1.0.23 | 3.17.0 | 3.24.18<br />gtk+3 | 10.12 (Sierra)- 10.15 (Catalina) |
| MacPorts | 1.0.23 | 3.17.0 | 3.24.18<br />gtk3 | 10.6 (Snow Leopard) - 10.15 (Catalina) |

NOTE: In order to use a STLINK/v1 programmer on macOS, versions 10.13, 10.14 or 10.15 are required.


### Linux-/Unix-based:

Expand Down
5 changes: 3 additions & 2 deletions run_clang_analyze.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
# Run this hacky script in project root directory to start
# clang static analysis. Adjust ccc-analyzer path if nesesary
# Run this hacky script in project root directory to start clang static analysis.
# Adjust ccc-analyzer path if necessary

CCC_ANALYZER=/usr/share/clang/scan-build-3.5/ccc-analyzer
mkdir -p build-clang-analyze/reports
cd build-clang-analyze
Expand Down

0 comments on commit fd2a5c3

Please sign in to comment.