Skip to content

Commit 13eae69

Browse files
Merge pull request #188 from ThomasWaldmann/travis-ci
integrating travis-ci for automated compile/style checks
2 parents 1d4e8a9 + a562d56 commit 13eae69

File tree

3 files changed

+43
-16
lines changed

3 files changed

+43
-16
lines changed

.travis.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
language: cpp
2-
dist: xenial
2+
dist: bionic
33
os: linux
44

55
matrix:
66
include:
77

88
- env:
99
- TEST="Astyle Format"
10+
1011
addons:
1112
apt:
1213
packages:
1314
- astyle
15+
1416
script:
17+
- astyle --version
1518
- astyle --options=.astylerc 'multigeiger/*'
1619
- |
1720
if [[ -n $(git diff) ]]; then
@@ -21,3 +24,22 @@ matrix:
2124
exit -1
2225
fi
2326
27+
- env:
28+
- TEST="PlatformIO builds"
29+
30+
language: python
31+
python: 3.6
32+
33+
cache:
34+
directories:
35+
- "~/.platformio"
36+
37+
install:
38+
- cp multigeiger/userdefines-example.h multigeiger/userdefines.h
39+
- cp platformio-example.ini platformio.ini
40+
- pip install -U platformio
41+
- platformio update
42+
43+
script:
44+
- platformio run --environment wifi --environment stick
45+

multigeiger/multigeiger.ino

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@ void setup() {
463463
log(INFO, "%s, Version %s", Serial_Logging_Name, revString);
464464
log(INFO, dashes);
465465
log(INFO, Serial_Logging_Header,
466-
"GMC_counts", "Time_difference", "Count_Rate", "Dose_Rate", "HV Pulses", "Accu_GMC", "Accu_Time", "Accu_Rate", "Accu_Dose");
466+
"GMC_counts", "Time_difference", "Count_Rate", "Dose_Rate", "HV Pulses", "Accu_GMC", "Accu_Time", "Accu_Rate", "Accu_Dose");
467467
log(INFO, Serial_Logging_Header,
468-
"[Counts]", "[ms]", "[cps]", "[uSv/h]", "[-]", "[Counts]", "[ms]", "[cps]", "[uSv/h]");
468+
"[Counts]", "[ms]", "[cps]", "[uSv/h]", "[-]", "[Counts]", "[ms]", "[cps]", "[uSv/h]");
469469
log(INFO, dashes);
470470
}
471471

@@ -474,9 +474,9 @@ void setup() {
474474
log(INFO, "%s, Version %s", Serial_Logging_Name, revString);
475475
log(INFO, dashes);
476476
log(INFO, Serial_One_Minute_Log_Header,
477-
"Time", "Count_Rate", "Counts");
477+
"Time", "Count_Rate", "Counts");
478478
log(INFO, Serial_One_Minute_Log_Header,
479-
"[s]", "[cpm]", "[Counts per last measurement]");
479+
"[s]", "[cpm]", "[Counts per last measurement]");
480480
log(INFO, dashes);
481481
}
482482

@@ -585,8 +585,8 @@ void loop() {
585585

586586
if (Serial_Print_Mode == Serial_Logging) { // Report all
587587
log(INFO, Serial_Logging_Body,
588-
GMC_counts, time_difference, Count_Rate, Dose_Rate, HV_pulse_count,
589-
accumulated_GMC_counts, accumulated_time, accumulated_Count_Rate, accumulated_Dose_Rate);
588+
GMC_counts, time_difference, Count_Rate, Dose_Rate, HV_pulse_count,
589+
accumulated_GMC_counts, accumulated_time, accumulated_Count_Rate, accumulated_Dose_Rate);
590590
}
591591

592592
if (Serial_Print_Mode == Serial_One_Minute_Log) { // 1 Minute Log active?
@@ -596,9 +596,9 @@ void loop() {
596596
lastMinuteLogCountRate++; // Rounding
597597
}
598598
log(INFO, Serial_One_Minute_Log_Body,
599-
(current_ms / 1000),
600-
lastMinuteLogCountRate, // = *60 /1000 +0.5: to reduce rounding errors
601-
lastMinuteLogCounts);
599+
(current_ms / 1000),
600+
lastMinuteLogCountRate, // = *60 /1000 +0.5: to reduce rounding errors
601+
lastMinuteLogCounts);
602602
lastMinuteLogCounts = 0;
603603
lastMinuteLog = current_ms;
604604
}

platformio-example.ini

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,28 @@ src_dir = multigeiger
2020
[env:wifi]
2121
board = heltec_wifi_kit_32
2222
platform = espressif32
23-
framework = arduino
2423
src_filter = +<*> -<.git/> -<loraWan*>
2524
build_flags = -DCPU=WIFI
25+
framework = arduino
2626
monitor_speed = ${common.monitor_speed}
27-
lib_deps = ${common.lib_deps}
27+
lib_deps =
28+
${common.lib_deps}
2829

2930
[env:stick]
3031
board = heltec_wireless_stick
3132
build_flags = -DCPU=STICK
3233
platform = espressif32
33-
lib_deps =
34-
${common.lib_deps}, MCCI LoRaWAN LMIC library@>=3.0.99
3534
framework = arduino
3635
monitor_speed = ${common.monitor_speed}
36+
lib_deps =
37+
${common.lib_deps}
38+
MCCI LoRaWAN LMIC library
3739

3840
[common]
3941
monitor_speed=115200
40-
lib_deps= U8g2@>=2.16.14, Adafruit BME280 Library@>=1.0.7, Adafruit Unified Sensor@>=1.0.2,
41-
IotWebConf@>=2.3.0
42+
lib_deps=
43+
U8g2
44+
Adafruit BME280 Library
45+
Adafruit Unified Sensor
46+
IotWebConf
4247

0 commit comments

Comments
 (0)