Compare commits
42 Commits
codeblocks
...
master
Author | SHA1 | Date | |
---|---|---|---|
e023a5c628
|
|||
054c39105f
|
|||
eb4eb715bb
|
|||
8ab5a3c79a
|
|||
27396fd908
|
|||
7d9022633b
|
|||
6af72d9970
|
|||
06ca1f40e6
|
|||
558b69109b
|
|||
c24884a5c7
|
|||
50ad7576f5
|
|||
f423c9fc0b
|
|||
8577413417
|
|||
9d0481928c
|
|||
a57101aa42
|
|||
c417aaa8a2
|
|||
3fc91c9de8
|
|||
af148f46f5
|
|||
274822d4fa
|
|||
0e4fcbb175
|
|||
59ebc8a67f
|
|||
cfeaac86cf
|
|||
552110f88e
|
|||
8d7d9eed82
|
|||
efffcde96e
|
|||
78a397ddc1
|
|||
ac942e4e0b
|
|||
d014bc21f6
|
|||
50c4692657
|
|||
9b5003e4d2
|
|||
278e44acbb
|
|||
fd077ebb77
|
|||
461a5084a9
|
|||
04bfdc77bb
|
|||
1c0fd8b84f
|
|||
ada8e51a99
|
|||
d94a719640
|
|||
020107c689
|
|||
6f89905e85
|
|||
5b7ef96428
|
|||
578f728786
|
|||
55797c8baf
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1,5 @@
|
|||||||
|
*~
|
||||||
|
.*~
|
||||||
*.o
|
*.o
|
||||||
*.elf
|
*.elf
|
||||||
core
|
core
|
||||||
|
48
.gitlab-ci.yml
Normal file
48
.gitlab-ci.yml
Normal 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
|
||||||
|
|
4
Makefile
4
Makefile
@ -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
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
|
|
||||||
uint8_t temperature = 21;
|
uint8_t temperature = 21;
|
||||||
const uint8_t TEMPERATURE_THRESHOLD = 21;
|
const uint8_t TEMPERATURE_THRESHOLD = 25;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user