Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch develop #1099

Merged
merged 213 commits into from
Mar 11, 2021
Merged

Merge branch develop #1099

merged 213 commits into from
Mar 11, 2021

Conversation

Nightwalker-87
Copy link
Member

Merging branch develop into master to address the following points:

  • Resolve an existing merge-conflict between both branches.
  • Avoid further divergence between both branches.
  • Create a new unified codebase in order to address some current bugs.
  • First step for an upcoming release preparation.

Luca Boccassi and others added 30 commits March 16, 2018 15:58
Change format to non-native, set myself as maintainer
64ef6a8
Repack tarball to remove debian/ and stlinkv1_macosx_driver/
8488390
Remove breaks and replaces, not applicable to Debian
abdf4ce
Update changelog for 1.5.0+ds-1 release
ef9d527
Merge tag 'v1.5.1' into debian
4031f53
Mark packages as linux-any, other systems not supported.
66e5e3a
Update changelog for 1.5.1+ds-1 release
acd192f
Mark library packages as Multi-Arch: same.
8a07f12
Apply cross.patch to fix cross-compiling the GUI.
bc01701 
Thanks Helmut for the patch! (Closes: #941320)

Gbp-Dch: full
Vcs-Git: add -b debian
ecfb5be
Set Rules-Requires-Root: no
52189af
Bump Standards-Version to 4.4.0
4f29ef9
Update changelog for 1.5.1+ds-2 release
0b62960
Merge tag 'v1.6.0' into debian
7915663 
Release v1.6.0
Bump Standards-Version to 4.5.0, no changes.
14c2cbe
Add d/s/options to ignore repacked files
d3021e5 
Gbp-Dch: ignore
Update libstlink1 symbols file for 1.6.0.
0044113
Update changelog for 1.6.0+ds-1 release
f92878d
@rutgerhendriks
Create ccpp.yml
4337408
@nmeum
doc/man: Fix installation directory
2016590 
On Unix-like operating systems man pages are commonly installed to
`/usr/share/man` not `/usr/share/stlink/man`.
@Nightwalker-87
Merge pull request #970 from nmeum/fix-mandir
adb083c 
doc/man: Fixed installation directory
@Vascom
Fix installation path for desktop-file and icons.
e95b5ff 
This change fixes installation path for desktop-file and icons.
They should be installed directly to
```
/usr/share/applications/
/usr/share/icons/hicolor/scalable/apps/
```
@Nightwalker-87
Merge pull request #972 from Vascom/patch-1
60f8461 
Fixed installation path for desktop-file and icons.
@slyshykO
link ssp as static only for WIN32
c774dca
@slyshykO
link ssp as static only for WIN32
b1af21d
@Nightwalker-87
Merge pull request #974 from slyshykO/fix_static
b0dcb0c 
Fix for static linking of libssp
@Nightwalker-87
Moved unused pkg-config settings to /doc/dev
ade735d 
(Closes #971)
@Nightwalker-87
Deleted duplicated issue template
8f42f54
@Nightwalker-87
[regression] Fixed GTK3 detection
05f79e1
@Nightwalker-87
Reorganised project source directories
c7041cc 
(Closes #976)
Nightwalker-87 and others added 21 commits December 12, 2020 11:34
@Nightwalker-87
Merge pull request #1078 from simplerobot/st-trace
adbc18c 
Bugfixes for compilation with clang
@Nightwalker-87
General Project Update
95e9c36 
- Mention support for VS Code (Closes #1057)
- Compilation with GCC 11 fails (Closes #1077)
- Updated list of contributors
- Updated CHANGELOG.md
@Nightwalker-87
[doc] STM32F103 fake chips (Closes #1024)
a66557a
@slyshykO
fix msvc build
0b7b1f3
@slyshykO
use memset for init struct
ffbecc4
@Nightwalker-87
Merge pull request #1080 from slyshykO/fix-msvc-build
4918223 
[feature] Included ITM functionality for building with MSVC
correctly handle endianness without reference to host platform
e8c1e8a
@Nightwalker-87
Merge pull request #1081 from lvdlvd/develop
104940e 
Correctly handle endianness without reference to host platform
@Nightwalker-87
Minor formatting fixes
ddac731
@Nightwalker-87
Removed support for STLINK/v1 on macOS 10.13
4bfaab0
@seeseemelk
flash_loader: increase wait rounds for slow boards
9fd7e63
@slyshykO
check format string for log messages
1b29c65
@Nightwalker-87
Merge pull request #1093 from slyshykO/check-fmt-str
06fbed0 
check format string for log messages
@Nightwalker-87
Merge pull request #1085 from seeseemelk/develop
9923be6 
Flash_loader: increase wait rounds for slow boards
@Nightwalker-87
General Project Update
29be2cf 
- Updated CHANGELOG.md
- Minor formatting & spelling fix
- Minor corrections
@Nightwalker-87
Updated travis CI build settings.
70f68e1
@Nightwalker-87
Update and correction for compiling instructions
8429ac0
@Nightwalker-87
Updated travis CI build settings
dc6310b 
- covered active Ubuntu LTS version trees
- gcc: 5 / 6 / 10
- clang: 8 / 10
@Nightwalker-87
Updated changelog
8f9c543
@Nightwalker-87
[doc] Added note on gdb 'run' command
03793d4 
(Closes #267)
@Nightwalker-87
General Project Update
45e9b5e 
- Updated CHANGELOG.md
- Updated list of contributors
- Fixed travis CI build settings
@Nightwalker-87 Nightwalker-87 added this to the v1.6.2 milestone Mar 11, 2021
@Nightwalker-87 Nightwalker-87 self-assigned this Mar 11, 2021
@Nightwalker-87 Nightwalker-87 merged commit cc9bedd into master Mar 11, 2021
@Nightwalker-87 Nightwalker-87 deleted the develop branch March 11, 2021 15:59
@stlink-org stlink-org locked as resolved and limited conversation to collaborators Mar 24, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@Nightwalker-87 Nightwalker-87

Labels
code/compatibility code/refactoring status/resolved
Projects
No open projects
Release v1.7.0
Status: Done
Milestone
v1.7.0
Development

Successfully merging this pull request may close these issues.

None yet