~hp/chimaera_firmware

b7a2854b49588b37cd57956455917f6391d91249 — Hanspeter Portner 7 years ago 2de39eb 0.14.0 
add VERSION file.
patch browse .tar.gz 
4 files changed, 14 insertions(+), 49 deletions(-)

M .gitlab-ci.yml
M Makefile
A VERSION
D releasor

M .gitlab-ci.yml => .gitlab-ci.yml +6 -7
@@ 4,7 4,6 @@ stages:

variables:
  REVISION: "4"
  VERSION: "0.7.0"

.build_template: &build_definition
  stage: build


@@ 15,12 14,12 @@ variables:
  script:
    - make clean
    - make dfu
    - mkdir "chimaera-${VERSION}-${REVISION}"
    - cp "build/chimaera_S${SENSORS}-${VERSION}-${REVISION}.dfu" "chimaera-${VERSION}-${REVISION}/."
    - mkdir "chimaera_$(cat VERSION)-${REVISION}"
    - cp "build/chimaera_S${SENSORS}-$(cat VERSION)-${REVISION}.dfu" "chimaera_$(cat VERSION)-${REVISION}/."
  artifacts:
    name: "chimaera_S${SENSORS}-${VERSION}-${REVISION}"
    name: "chimaera_S${SENSORS}-$(cat VERSION)-${REVISION}"
    paths:
      - image "chimaera-${VERSION}-${REVISION}"
      - "chimaera_$(cat VERSION)-${REVISION}"

# building in docker
S16:


@@ 78,6 77,6 @@ pack:
  script:
    - echo 'packing up...'
  artifacts:
    name: "chimaera_${VERSION}-${REVISION}"
    name: "chimaera_$(cat VERSION)-${REVISION}"
    paths:
      - image "chimaera-${VERSION}-${REVISION}"
      - "chimaera_$(cat VERSION)-${REVISION}"


M Makefile => Makefile +7 -7
@@ 4,9 4,9 @@ export LIB_MAPLE_HOME := ./libmaple_F3
export SENSORS ?= 160

# set firmware version
export VERSION_MAJOR ?= 0
export VERSION_MINOR ?= 7
export VERSION_PATCH ?= 0
export VERSION_MAJOR ?= $(shell awk -F. '{print $$1}' VERSION)
export VERSION_MINOR ?= $(shell awk -F. '{print $$2}' VERSION)
export VERSION_PATCH ?= $(shell awk -F. '{print $$3}' VERSION)

# set revision of board design: 3, 4
export REVISION ?= 4


@@ 20,10 20,10 @@ export USER_MODULES := $(shell pwd)
export USB_VENDOR := 0x0483
export USB_PRODUCT := 0xdf11

RELEASE := 0x0004
VERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)-$(REVISION)
RELEASE := "0x$(shell echo 'obase=16;' $$(git rev-list --count HEAD) | bc)"
VERSION := $(shell cat VERSION)
BIN := build/$(BOARD).bin
DFU := build/chimaera_S$(SENSORS)-$(VERSION).dfu
DFU := build/chimaera_S$(SENSORS)-$(VERSION)-$(REVISION).dfu

.PHONY: dfu reset update download release
.DEFAULT_GOAL := sketch


@@ 43,7 43,7 @@ $(DFU): $(BIN)
		-f $(RELEASE) \
		-v $(USB_VENDOR) \
		-p $(USB_PRODUCT) \
			-n 'Chimaera S'$(SENSORS)' '$(VERSION)'. Copyright (c) 2015 Hanspeter Portner (dev@open-music-kontrollers.ch). Released under Artistic License 2.0. By Open Music Kontrollers (http://open-music-kontrollers.ch/chimaera/).' \
			-n 'Chimaera S'$(SENSORS)' '$(VERSION)'-'$(REVISION)'. Copyright (c) 2015 Hanspeter Portner (dev@open-music-kontrollers.ch). Released under Artistic License 2.0. By Open Music Kontrollers (http://open-music-kontrollers.ch/chimaera/).' \
			-m 0x08000000 -i $< \
			-a 0



A VERSION => VERSION +1 -0
@@ 0,0 1,1 @@
0.14.0


D releasor => releasor +0 -35
@@ 1,35 0,0 @@
#!/bin/bash

release=0x0004
major=0
minor=7
patch=0
version="${major}.${minor}.${patch}"

mkdir -p image

export VERSION_MAJOR=${major}
export VERSION_MINOR=${minor}
export VERSION_PATCH=${patch}

for revision in 4;
do
	export REVISION=${revision}

	for sensors in 16 32 48 64 80 96 112 128 144 160;
	do
		export SENSORS=${sensors}

		# build
		make clean
		make -j4

		# pack
		dfuse_pack \
			-o image/chimaera_S${sensors}-${version}-${revision}.dfu \
			-f ${release} \
				-m 0x08000000 -i build/F303CB.bin \
				-n 'Chimaera S'${sensors}' '${version}'-'${revision}'. Copyright (c) 2015 Hanspeter Portner (dev@open-music-kontrollers.ch). Released under Artistic License 2.0. By Open Music Kontrollers (http://open-music-kontrollers.ch/chimaera/).' \
				-a 0
	done
done