Compare commits

42 Commits

Author SHA1 Message Date
e023a5c628 use better builder image 2019-02-16 23:35:07 +01:00
054c39105f trigger ci script 2019-02-16 23:09:40 +01:00
eb4eb715bb fix ci script partly ? 2019-02-16 23:02:22 +01:00
8ab5a3c79a break ci script ? 2019-02-16 22:55:01 +01:00
27396fd908 change ci script 2019-02-16 22:53:25 +01:00
7d9022633b disable debug stuff 2019-02-16 22:46:30 +01:00
6af72d9970 change ci script 2019-02-16 22:41:59 +01:00
06ca1f40e6 increase temperature threshold 2019-02-16 22:38:03 +01:00
558b69109b Merge branch 'master' of gitlab.com:wolutator/blinky1 2019-02-12 20:40:50 +01:00
c24884a5c7 fix resistor calculation 2019-02-12 20:40:22 +01:00
50ad7576f5 disable debugging 2019-02-12 20:39:57 +01:00
f423c9fc0b 18. fix use ssh in ci script 2019-02-12 17:57:04 +01:00
8577413417 17. fix use ssh in ci script 2019-02-12 17:36:08 +01:00
9d0481928c 16. fix use ssh in ci script 2019-02-12 17:16:59 +01:00
a57101aa42 15. fix use ssh in ci script 2019-02-12 17:14:53 +01:00
c417aaa8a2 14. fix use ssh in ci script 2019-02-12 17:13:49 +01:00
3fc91c9de8 13. fix use ssh in ci script 2019-02-12 17:08:28 +01:00
af148f46f5 12. fix use ssh in ci script 2019-02-12 17:07:16 +01:00
274822d4fa 11. fix use ssh in ci script 2019-02-12 17:03:34 +01:00
0e4fcbb175 10. fix use ssh in ci script 2019-02-12 17:01:01 +01:00
59ebc8a67f 9. fix use ssh in ci script 2019-02-12 16:58:50 +01:00
cfeaac86cf 8. fix use ssh in ci script 2019-02-12 16:55:42 +01:00
552110f88e 7. fix use ssh in ci script 2019-02-12 16:50:45 +01:00
8d7d9eed82 6. fix use ssh in ci script 2019-02-12 16:47:41 +01:00
efffcde96e 5. fix use ssh in ci script 2019-02-12 16:40:29 +01:00
78a397ddc1 4. fix use ssh in ci script 2019-02-12 16:39:15 +01:00
ac942e4e0b 3. fix use ssh in ci script 2019-02-12 16:34:50 +01:00
d014bc21f6 2. fix use ssh in ci script 2019-02-12 16:33:28 +01:00
50c4692657 fix use ssh in ci script 2019-02-12 16:31:19 +01:00
9b5003e4d2 use ssh in ci script 2019-02-12 16:28:21 +01:00
278e44acbb test variable in ci script 2019-02-12 16:23:41 +01:00
fd077ebb77 test variable in ci script 2019-02-12 16:21:17 +01:00
461a5084a9 add tags to ci script 2019-02-12 16:02:12 +01:00
04bfdc77bb fix build script 2019-02-12 15:49:32 +01:00
1c0fd8b84f fix build script 2019-02-12 15:48:31 +01:00
ada8e51a99 ignore more ~ files 2019-02-12 15:38:48 +01:00
d94a719640 remove ~ files 2019-02-12 15:38:22 +01:00
020107c689 ignore ~ files 2019-02-12 15:37:31 +01:00
6f89905e85 add real build job 2019-02-12 14:57:21 +01:00
5b7ef96428 extend ci script 2019-02-12 14:49:32 +01:00
578f728786 fix ci script 2019-02-12 14:45:29 +01:00
55797c8baf add ci script 2019-02-12 14:38:02 +01:00
6 changed files with 56 additions and 5 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
*~
.*~
*.o *.o
*.elf *.elf
core core

48
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,48 @@
stages:
- hello
- build
job1:
stage: hello
image: debian:latest
tags:
- hottis
- linux
- docker
script:
- echo "Hallo"
- echo "Welt"
- whoami
build:
stage: build
image: registry.gitlab.com/wolutator/build-env-msp430:latest
tags:
- hottis
- linux
- docker
only:
refs:
- master
variables:
GIT_SUBMODULE_STRATEGY: none
before_script:
- echo "Prepare ssh environment"
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- ssh-keyscan gitlab.com >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
- ssh git@gitlab.com
- echo "Preparing ssh environment done"
script:
- git submodule init
- git submodule update
- whoami
- pwd
- make clean
- make all

View File

@ -1,10 +1,10 @@
CC=msp430-gcc CC=msp430-gcc
# regular # regular
# CFLAGS=-Wall -mmcu=msp430g2553 -std=gnu99 -I hottislib -O3 -g0 CFLAGS=-Wall -mmcu=msp430g2553 -std=gnu99 -I hottislib -O3 -g0
# for debugging # for debugging
CFLAGS=-Wall -mmcu=msp430g2553 -std=gnu99 -I hottislib -g3 -ggdb -gdwarf-2 # CFLAGS=-Wall -mmcu=msp430g2553 -std=gnu99 -I hottislib -g3 -ggdb -gdwarf-2
LDFLAGS=-mmcu=msp430g2553 LDFLAGS=-mmcu=msp430g2553

View File

@ -55,9 +55,9 @@ void measureCollectAndProcessConversion() {
} else if (nAvg == N_MAX) { } else if (nAvg == N_MAX) {
r = FLT_MAX; r = FLT_MAX;
} else { } else {
r = R_REF / ((((float)N_MAX) / ((float)nAvg)) - 1.0); r = ((((float)N_MAX) / ((float)nAvg)) - 1.0) * R_REF;
} }
float t = (r / PT1000_R0 - 1) / PT1000_Coeff; float t = ((r / PT1000_R0) - 1) / PT1000_Coeff;
uint8_t temperature = (t < 0) ? 0 : ((uint8_t)t); uint8_t temperature = (t < 0) ? 0 : ((uint8_t)t);

View File

@ -7,7 +7,7 @@
uint8_t temperature = 21; uint8_t temperature = 21;
const uint8_t TEMPERATURE_THRESHOLD = 21; const uint8_t TEMPERATURE_THRESHOLD = 25;

View File

@ -10,3 +10,4 @@ Debugger:
* ddd --debugger msp430-gdb * ddd --debugger msp430-gdb
* for every code change upload using Makefile and restart both mspdebug and ddd (or fine a way to reset the both) * for every code change upload using Makefile and restart both mspdebug and ddd (or fine a way to reset the both)