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 !36
This commit is contained in:
tkl 2016-09-16 10:24:57 +00:00
commit 9425d132b0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,7 +1,7 @@
variables: variables:
SW_KERNEL: "0" SW_KERNEL: "0"
SW_MAJOR: "1" SW_MAJOR: "1"
SW_MINOR: "7" SW_MINOR: "8"
before_script: before_script:
- "echo $CI_BUILD_ID" - "echo $CI_BUILD_ID"

4
source/firmware/arch/stm32f4xx/driver/stm32f4_rng.c
View File

@ -7,7 +7,9 @@
#include <stddef.h> #include <stddef.h>
#include "board.h" #include "rng.h"
#include "stm32f4xx.h"
#include "stm32f4_rng.h"
int stm32f4_rng_open(const void *this) int stm32f4_rng_open(const void *this)
{ {