Skip to content

Commit 1db470f

Browse files
tenbahttenbaht
committed
Merge branch 'release-0.4.0'
2 parents ead12d8 + e0448a2 commit 1db470f

119 files changed

Lines changed: 6287 additions & 92 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[submodule "tools/stm8gal"]
2+
path = tools/stm8gal
3+
url = https://github.com/tenbaht/stm8gal.git
4+
branch = detectMode
5+
[submodule "tools/stm8flash"]
6+
path = tools/stm8flash
7+
url = [email protected]:tenbaht/stm8flash.git

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1111
- Support for Sduino-UNO board (s8uno)
1212
- Support for Sduino MB board (mb208)
1313
- Unlocking a MCU by using Tools->Burn Bootloader in the Arduino IDE
14+
- new library LiquidCrystal_pcf2119 for I2C text LCD based on the PCF2119
15+
- new library Wire for I2C communication
16+
- new library EEPROM
1417

1518
### Changed
1619
- completed I2C library, master transmit and master receive modes work
1720
- updated stm8flash to support more STM8 devices and the ST-Link/V2.1
1821
adapter found on STM8 Nucleo boards (and espstlink for Linux
1922
and OSX)
20-
- updated SDCC to version 3.8.0
23+
- updated SDCC to version 3.8.1
24+
- Arduino.h is automatically included now, no need for #include "Arduino.h"
25+
anymore
2126

2227
### Fixed
2328
- Serial_serial_print_sn()
29+
- object dependencies are calculated correctly for *.obj suffix
30+
- Include path for sduino.mk in all example Makefiles
2431

2532

2633

‎board-manager/Makefile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# the required versions for the new build
2-
COREVERSION=0.4.0-pre1
3-
SDCCVERSION=10088
4-
TOOLSVERSION=2017.11.13
2+
COREVERSION=0.4.0
3+
SDCCVERSION=10738
4+
TOOLSVERSION=2018.12.07
5+
6+
# default the tool version to be the current date as YYYY.MM.DD
7+
#TOOLSVERSION?=$(shell date '+%Y.%m.%d')
58

69
BASEURL=https://github.com/tenbaht/sduino/releases/download/v$(COREVERSION)
710

@@ -44,7 +47,7 @@ release:
4447
# update the version number in the changelog if not already done:
4548
grep -q "$(COREVERSION)" ../CHANGELOG.md || \
4649
sed "/^## \[Unreleased\]/ a\\\n\n## [$(COREVERSION) - $(DATE)]" ../CHANGELOG.md
47-
git add ../CHANGELOG.md
50+
git add ../CHANGELOG.md ../$(PACKAGEFILE)
4851
git add parts/tools-*-$(SDCCVERSION).txt parts/tools-*-$(TOOLSVERSION).txt parts/platform-*-$(COREVERSION).txt
4952
git commit
5053
git tag v$(COREVERSION)

‎board-manager/Makefile.core‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
NAME=sduino
2-
COREVERSION?=0.3.2
3-
SDCCVERSION?=10088
4-
TOOLSVERSION?=2017.11.06
2+
3+
ifndef COREVERSION
4+
$(error COREVERSION is not set)
5+
endif
6+
7+
ifndef SDCCVERSION
8+
$(error SDCCVERSION is not set)
9+
endif
10+
11+
ifndef TOOLSVERSION
12+
$(error TOOLSVERSION is not set)
13+
endif
14+
515

616
# where to put the generated files
717
COREDIR?=release/v$(COREVERSION)

‎board-manager/Makefile.sdcc‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
NAME=sdcc
2-
COREVERSION?=0.3.0
3-
SDCCVERSION?=10088
2+
ifndef COREVERSION
3+
$(error COREVERSION is not set)
4+
endif
5+
6+
ifndef SDCCVERSION
7+
$(error SDCCVERSION is not set)
8+
endif
9+
10+
# Makefile.sdcc
11+
#
12+
# Build the sdcc archive files.
13+
#
14+
# Targets:
15+
#
16+
# - (default):
17+
# build a new tools entry in the parts directory.
18+
# - repack SDCCVERSION=10738 COREVERSION=xx
19+
# repack the snapshot files in the Downloads directory into stipped
20+
# down SDunino minimal packages.
21+
# COREVERSION doesn't matter, but needs to be present.
22+
423

524
# where to look for the original SDCC snapshot files
625
#SNAPSHOTDIR=sdcc-snapshots
@@ -11,6 +30,8 @@ PARTSDIR=parts
1130

1231
VERSION=$(SDCCVERSION)
1332

33+
.PHONY: repack
34+
1435
#
1536
### No user serviceable part below here. Only generated content. ########
1637
#
@@ -28,3 +49,8 @@ TOOLS_ENTRY=$(PARTSDIR)/tools-entry-$(NAME)-$(VERSION).txt
2849

2950
$(TOOLS_ENTRY) : $(SDCC_TARS)
3051
./gen_tools_entry.sh "$(TOOLS_STEM)" "$(VERSION)" "$(COREVERSION)" > $@
52+
53+
repack:
54+
for i in ~/Downloads/sdcc*$(SDCCVERSION)*; do \
55+
./minimize-sdcc.sh $$i; \
56+
done

‎board-manager/Makefile.tools‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
NAME=sduino-tools
2-
COREVERSION?=0.3.2
3-
# default the tool version to be the current date as YYYY.MM.DD
4-
TOOLSVERSION?=$(shell date '+%Y.%m.%d')
2+
3+
ifndef COREVERSION
4+
$(error COREVERSION is not set)
5+
endif
6+
7+
ifndef SDCCVERSION
8+
$(error SDCCVERSION is not set)
9+
endif
10+
11+
ifndef TOOLSVERSION
12+
$(error TOOLSVERSION is not set)
13+
endif
14+
515

616
# Where to find the tools directory
717
BASEDIR=../sduino/hardware/sduino
@@ -59,7 +69,7 @@ $(TOOLS_MACOSX): | $(ARCHIVEDIR)
5969

6070
$(TOOLS_WINDOWS): | $(ARCHIVEDIR)
6171
@echo "Generating the tools archive file for Windows."
62-
tar cjf $@ $(EXCLUDES) -C $(BASEDIR) tools/wrapper tools/win
72+
tar cjhf $@ $(EXCLUDES) -C $(BASEDIR) tools/wrapper tools/win
6373

6474

6575
# make a new release directory if not present

‎board-manager/README.md‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ After testing, check in the newly generated files and update the Changelog:
3535
make release
3636

3737

38-
For testing purposes only (!!), it is possible to use the simpler systax
38+
For testing purposes only (!!), it is possible to use the simpler syntax
3939
using makefile variables on the command line:
4040

4141
make COREVERSION=0.3.2 core
@@ -44,6 +44,16 @@ will generate a fresh archive for the core files and update the package file
4444
accordingly.
4545

4646

47+
## Preparing the parts
48+
49+
### SDCC
50+
51+
First: Update the SDCC version number in Makefile and Makefile.sdcc
52+
53+
- Download snapshot files for all supported systems into ~/Downloads
54+
- `make repack` minimizes all archives into small SDunio minimal packages
55+
56+
4757
## Supporting tools
4858

4959
`assemble.sh`: Insert all objects from parts/ directory in the platform and
@@ -54,9 +64,8 @@ tools field of the json template file to assemble the final package file.
5464
`gen_tools_entry.sh`: Generate a tools entry for a sdcc or STM8Tools
5565
archive.
5666

57-
Makefile.core
58-
Makefile.sdcc
59-
Makefile.tools
67+
`Makefile.core`, `Makefile.sdcc`, `Makefile.tools`: Pack the archive for one
68+
component into release/ and generate the description in the parts/ directory.
6069

6170
`minimize-sdcc.sh`: Repack a [SDCC snapshot
6271
build](http://sdcc.sourceforge.net/snap.php) into a minimal compiler package

‎board-manager/minimize-sdcc.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ VERBOSE=
3030
NAME=$(basename "$FILE")
3131
NAME=${NAME/snapshot/stm8}
3232

33+
# remove all suffixes
34+
NAME=${NAME%%.t*}
35+
NAME=${NAME%%.z*}
36+
3337
# patterns to exclude all unneeded files from unpacking
3438
TAR_EXCLUDE='--exclude=doc --exclude=src --exclude=non-free
3539
--exclude=stlcs --exclude=ds80c390.h --exclude=pic*
@@ -54,8 +58,9 @@ else
5458
tar x${VERBOSE}${TARFLAG}f "$FILE" -C "$TMP" $TAR_EXCLUDE
5559
fi
5660

61+
# always repack into a tar.bz2 file, even if was a zip before.
5762
echo "Repacking into file $NAME"
58-
tar c${VERBOSE}${TARFLAG}f "$NAME" -C "$TMP" sdcc
63+
tar c${VERBOSE}jf "$NAME.tar.bz2" -C "$TMP" sdcc
5964

6065
echo "cleaning up temporary files"
6166
rm -rf "$TMP"

‎board-manager/parts/platform-entry-sduino-0.4.0.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"name": "Sduino STM8 plain C core (non-C++)",
3+
"architecture": "stm8",
4+
"version": "0.4.0",
5+
"category": "Contributed",
6+
"boards": [
7+
{"name": "STM8S103F3 Breakout Board"},
8+
{"name": "STM8S105C6 Discovery Board"},
9+
{"name": "STM8S105K4T6 Breakout Board"},
10+
{"name": "sduino UNO (STM8S105K6)"},
11+
{"name": "sduino MB (STM8S208MBT6B)"}
12+
],
13+
"toolsDependencies": [
14+
{
15+
"name": "STM8Tools",
16+
"version": "2018.12.07",
17+
"packager": "sduino"
18+
},
19+
{
20+
"name": "sdcc",
21+
"version": "build.10738",
22+
"packager": "sduino"
23+
}
24+
],
25+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.4.0/sduino-core-0.4.0.tar.bz2",
26+
"archiveFileName": "sduino-core-0.4.0.tar.bz2",
27+
"checksum": "SHA-256:a71dee029991653577c63c9cebe70095b2c08d5b55a9aa0af836f527daf44d8c",
28+
"size": "6110413"
29+
},

‎board-manager/parts/tools-entry-sdcc-10738.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"name": "sdcc",
3+
"version": "build.10738",
4+
"systems": [
5+
{
6+
"host": "x86_64-pc-linux-gnu",
7+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.4.0/sdcc-stm8-amd64-unknown-linux2.5-20181206-10738.tar.bz2",
8+
"archiveFileName": "sdcc-stm8-amd64-unknown-linux2.5-20181206-10738.tar.bz2",
9+
"checksum": "SHA-256:d5f3d1d1699c6edeb1db6b9a38f0b0c4c28d1ef1cd267dedb9b3f5a65e07a60e",
10+
"size": "2637159"
11+
},{
12+
"host": "i686-pc-linux-gnu",
13+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.4.0/sdcc-stm8-i386-unknown-linux2.5-20181205-10738.tar.bz2",
14+
"archiveFileName": "sdcc-stm8-i386-unknown-linux2.5-20181205-10738.tar.bz2",
15+
"checksum": "SHA-256:d25344d392707773712f71d6c3dd63b4b80ce92e7999664e78a7b186ae4485d6",
16+
"size": "2701297"
17+
},{
18+
"host": "i686-mingw32",
19+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.4.0/sdcc-stm8-i586-mingw32msvc-20181205-10738.tar.bz2",
20+
"archiveFileName": "sdcc-stm8-i586-mingw32msvc-20181205-10738.tar.bz2",
21+
"checksum": "SHA-256:eecfb34f085f0adc1b9544a5e32168907a88145a469f4733551b79b5ba91ad75",
22+
"size": "3063721"
23+
},{
24+
"host": "x86_64-apple-darwin",
25+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.4.0/sdcc-stm8-x86_64-apple-macosx-20181205-10738.tar.bz2",
26+
"archiveFileName": "sdcc-stm8-x86_64-apple-macosx-20181205-10738.tar.bz2",
27+
"checksum": "SHA-256:c0ece00b5f20411307b7a5e5bd527c127421e7df5b10946c45ad3305c46732c2",
28+
"size": "2877491"
29+
}
30+
]
31+
},

0 commit comments

Comments
 (0)