From 848ee3b5b10d306abf015741b1b5e935f284916e Mon Sep 17 00:00:00 2001 From: tkl Date: Wed, 10 Aug 2016 17:39:39 +0200 Subject: [PATCH 1/4] error correction of wrong pwm channel usage in board cfg --- .../board/stm32f4-discovery/include/stm32f4-discovery.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h b/source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h index ea87330..31d080c 100755 --- a/source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h +++ b/source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h @@ -160,7 +160,7 @@ const struct driver pwm_2 = { &pwm_ch2, }; -// PWM Channel 2 +// PWM Channel 1 static const GPIO_InitTypeDef port_cfg_D12 = { .GPIO_Pin = GPIO_Pin_12, .GPIO_Mode = GPIO_Mode_AF, @@ -190,7 +190,7 @@ static const struct driver pwm_1 = { const struct driver pwm_1 = { #endif DRIVER_TYPE_PWM, - &pwm_ch3, + &pwm_ch1, }; // UART 1 From bcc294dafc65a866340cb7323a2ae84b14e8b876 Mon Sep 17 00:00:00 2001 From: tkl Date: Wed, 10 Aug 2016 16:33:42 +0000 Subject: [PATCH 2/4] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00627ca..08ed231 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: SW_KERNEL: "0" SW_MAJOR: "0" - SW_MINOR: "2" + SW_MINOR: "3" before_script: - "echo $CI_BUILD_ID" From 671fd1c7bec924785ce3c5e7f8d592f8ba91eee6 Mon Sep 17 00:00:00 2001 From: tkl Date: Wed, 10 Aug 2016 16:34:54 +0000 Subject: [PATCH 3/4] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08ed231..f87b6ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,7 @@ deploy_job: script: - "source/scripts/release_number.py" - "make deploy BOARD=stm32f4-discovery" + - "make deploy BOARD=stm32f4-discovery DEBUG=y" artifacts: paths: - ./*.xz From 56ff8d3c099a73fdc2854c188f6ab57fda1356e7 Mon Sep 17 00:00:00 2001 From: tkl Date: Wed, 10 Aug 2016 16:35:53 +0000 Subject: [PATCH 4/4] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f87b6ba..1d76d20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,12 +18,14 @@ build_job: - "make all BOARD=stm32f4-discovery" stage: build except: - - /^release/.*$/ + - tags check_job: script: - "make check BOARD=stm32f4-discovery" stage: check + except: + - tags deploy_job: stage: deploy