r2maeh2/kosmos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Develop



See merge request !11
This commit is contained in:
tkl 2016-08-10 16:39:28 +00:00
commit 868086818c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -1,7 +1,7 @@
variables: variables:
SW_KERNEL: "0" SW_KERNEL: "0"
SW_MAJOR: "0" SW_MAJOR: "0"
SW_MINOR: "2" SW_MINOR: "3"
before_script: before_script:
- "echo $CI_BUILD_ID" - "echo $CI_BUILD_ID"
@ -18,18 +18,21 @@ build_job:
- "make all BOARD=stm32f4-discovery" - "make all BOARD=stm32f4-discovery"
stage: build stage: build
except: except:
- /^release/.*$/ - tags
check_job: check_job:
script: script:
- "make check BOARD=stm32f4-discovery" - "make check BOARD=stm32f4-discovery"
stage: check stage: check
except:
- tags
deploy_job: deploy_job:
stage: deploy stage: deploy
script: script:
- "source/scripts/release_number.py" - "source/scripts/release_number.py"
- "make deploy BOARD=stm32f4-discovery" - "make deploy BOARD=stm32f4-discovery"
- "make deploy BOARD=stm32f4-discovery DEBUG=y"
artifacts: artifacts:
paths: paths:
- ./*.xz - ./*.xz

4
source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h
View File

@ -160,7 +160,7 @@ const struct driver pwm_2 = {
&pwm_ch2, &pwm_ch2,
}; };
// PWM Channel 2 // PWM Channel 1
static const GPIO_InitTypeDef port_cfg_D12 = { static const GPIO_InitTypeDef port_cfg_D12 = {
.GPIO_Pin = GPIO_Pin_12, .GPIO_Pin = GPIO_Pin_12,
.GPIO_Mode = GPIO_Mode_AF, .GPIO_Mode = GPIO_Mode_AF,
@ -190,7 +190,7 @@ static const struct driver pwm_1 = {
const struct driver pwm_1 = { const struct driver pwm_1 = {
#endif #endif
DRIVER_TYPE_PWM, DRIVER_TYPE_PWM,
&pwm_ch3, &pwm_ch1,
}; };
// UART 1 // UART 1