Klaus K Wilting
165f2813f5
testing
2018-11-25 12:49:49 +01:00
Klaus K Wilting
222dfb5a95
BSEC integration (experimental)
2018-11-25 11:48:03 +01:00
Klaus K Wilting
8f201e066f
BOSCH BSEC integration
2018-11-22 23:37:53 +01:00
Klaus K Wilting
34dfb6d1d1
sensor.cpp: move sensorbuffer
2018-11-21 11:12:39 +01:00
Klaus K Wilting
6463eeb415
bugfix rcommand.cpp in set_sensor()
2018-11-20 21:24:35 +01:00
Klaus K Wilting
b8e7b4bf48
OTA improvements
2018-11-20 21:03:03 +01:00
Klaus K Wilting
12ad60a0a8
sensor init
2018-11-20 16:48:35 +01:00
Klaus K Wilting
1a24689652
rcommand 0x13 user sensor on/off
2018-11-20 15:44:33 +01:00
Klaus K Wilting
467f6d70f8
created: usersensor, bme680 bsec, update arduino-esp32 core
2018-11-20 15:02:37 +01:00
Klaus K Wilting
4e6c2b8b38
Merge branch 'sensor-development' of https://github.com/cyberman54/ESP32-Paxcounter into sensor-development
2018-11-19 00:42:58 +01:00
Klaus K Wilting
26082740af
payloadmask
2018-11-19 00:41:15 +01:00
Verkehrsrot
42a30b622b
Merge pull request #203 from cyberman54/development
...
merge development v1.6.82
2018-11-18 21:03:47 +01:00
Klaus K Wilting
bf62d448ac
BME680: added cyclic sensor data transmit
2018-11-18 16:45:33 +01:00
Klaus K Wilting
8ba97afa83
BME680: removed altitude (makes no sence without calibration on node)
2018-11-18 16:04:40 +01:00
Klaus K Wilting
06dcad6484
payload decoder reworked for BME680 support
2018-11-18 15:50:57 +01:00
Klaus K Wilting
02b3f1e2d4
bugfix cayenne encoding
2018-11-18 12:09:18 +01:00
Klaus K Wilting
2e51071d87
bugfix payload port
2018-11-17 22:49:14 +01:00
Klaus K Wilting
ddd5764a8b
BME 680 support: payload converters addes
2018-11-17 21:39:49 +01:00
Klaus K Wilting
2b96f6e0bf
BME680 support (experimental)
2018-11-17 18:30:19 +01:00
Klaus K Wilting
889ffe3a51
cyclic.cpp, lorawan.cpp: code sanitization
2018-11-16 09:52:26 +01:00
Klaus K Wilting
3e5a0e4058
add time sync cycle (experimental)
2018-11-16 09:43:47 +01:00
Klaus K Wilting
9c66167303
BME680 support (experimental)
2018-11-14 23:10:59 +01:00
Klaus K Wilting
4ae4633a15
BME680 support (experimental); LoRa Time sync (experimental)
2018-11-14 22:11:23 +01:00
Verkehrsrot
80dd7310cc
Update comments in spislave.cpp
2018-11-12 13:16:23 +01:00
Christian Ambach
97c71428a6
spi_slave: run code formatter
...
Signed-off-by: Christian Ambach <christian.ambach@deutschebahn.com>
2018-11-12 11:37:10 +01:00
Christian Ambach
3cd43710e6
spi_slave: re-enable checksum for payload
...
Signed-off-by: Christian Ambach <christian.ambach@deutschebahn.com>
2018-11-12 11:34:26 +01:00
Christian Ambach
18b44f2208
spi_slave: fix calculation of buffer size
...
the previous calculation added 4 additional bytes to the buffers
when the length was already dividable by 4.
Signed-off-by: Christian Ambach <christian.ambach@deutschebahn.com>
2018-11-12 11:29:23 +01:00
Klaus K Wilting
96783826d8
rcommand.cpp: delay before restart
2018-11-10 18:32:16 +01:00
Klaus K Wilting
a66021a848
battery.cpp: bugfix compiler directives
2018-11-05 22:15:15 +01:00
Klaus K Wilting
22577ea92a
battery.cpp sanitized
2018-11-05 21:43:22 +01:00
Klaus K Wilting
b0fa5e9021
OTA battery check
2018-11-05 21:40:07 +01:00
Klaus K Wilting
8ae5b6e970
ota.cpp: improved software version comparision function
2018-11-05 21:27:28 +01:00
Klaus K Wilting
bfd91f4545
ota.cpp: wifi reconnect improved
2018-11-05 16:06:17 +01:00
Klaus K Wilting
af0f3a78fd
OTA improved (LED flashing, faster buffer closing at end of write)
2018-11-05 15:28:26 +01:00
Klaus K Wilting
9fa2f974c3
OTA timeout problem fixed by workaround
2018-11-05 13:13:31 +01:00
Klaus K Wilting
9c1be4c557
ota.cpp: bugfix
2018-11-05 00:32:38 +01:00
Klaus K Wilting
d17638ad90
ota.cpp: control flow
2018-11-05 00:30:32 +01:00
Klaus K Wilting
cbc846d30b
ota.cpp: fixed timeout
2018-11-05 00:03:47 +01:00
Klaus K Wilting
26f4bd8f09
ota.cpp: streaming timeout changed
2018-11-04 21:12:19 +01:00
Klaus K Wilting
f2513584e2
ota.cpp: stream timeout changed
2018-11-04 21:10:33 +01:00
Klaus K Wilting
4a9db7a4c0
ota.cpp: shortened log texts
2018-11-04 21:02:37 +01:00
Klaus K Wilting
c061f3f586
ota.cpp small fixes
2018-11-04 20:51:48 +01:00
Klaus K Wilting
3d93a44c96
further ota code sanitization (delete update.cpp/.h)
2018-11-04 20:30:03 +01:00
Klaus K Wilting
26ea8621c2
ota.cpp: bugfix
2018-11-04 19:54:09 +01:00
Klaus K Wilting
3aa8a88d3a
ota.cpp restructured; .h file sanitization
2018-11-04 19:25:11 +01:00
Klaus K Wilting
5793b3c811
paxcounter.conf: reduced WIFI_MAX_TRY
2018-11-04 15:12:39 +01:00
Klaus K Wilting
5d5531e3af
lorawan.cpp: bugfix logging
2018-11-04 14:55:30 +01:00
Klaus K Wilting
7ae82d1881
spislave.cpp: small fixes
2018-11-04 13:58:35 +01:00
Klaus K Wilting
577cdc9497
lolin32lite.h: LED pin corrected
2018-11-04 13:22:03 +01:00
Klaus K Wilting
e8afc10a93
lopy4.h sanitized
2018-11-04 12:25:50 +01:00
Klaus K Wilting
02b2bf2d4f
spislave.cpp: processing of rx data added
2018-11-04 11:55:25 +01:00
Klaus K Wilting
8e3805a63b
SPI slave integration (experimental)
2018-11-03 20:44:54 +01:00
Klaus K Wilting
0cc98a2e24
SPI slave integration
2018-11-03 20:29:02 +01:00
Christian Ambach
a3750ef01b
add SPI slave support
...
Set up SPI slave transactions for entries in the SPI send queue.
Add a header to each SPI datagram that includes a CRC16,
the type and the size of the message that follows.
Does not act on received bytes (yet).
Signed-off-by: Christian Ambach <christian.ambach@deutschebahn.com>
2018-11-02 17:10:59 +01:00
Christian Ambach
bf3516bf45
fix the build for devices without LoRa
...
Signed-off-by: Christian Ambach <christian.ambach@deutschebahn.com>
2018-11-02 12:10:32 +01:00
Christian Ambach
4cab5113ca
Revert "SPI code added (experimental)"
...
This reverts commit 16759c4dd5
.
2018-11-02 12:09:12 +01:00
Christian Ambach
3af348fb65
Revert "SPI wire interface (experimental)"
...
This reverts commit 00b1faab83
.
2018-11-02 12:09:06 +01:00
Klaus K Wilting
dbb91b1a40
heltecv2.h: pinout corrected
2018-11-02 08:39:45 +01:00
Klaus K Wilting
e8c5b1b478
payload.cpp: bugfix monitormode in config status
2018-10-31 19:49:01 +01:00
Klaus K Wilting
88c1dd4e0c
rcommand.cpp: bugfix set_countmode()
2018-10-27 22:40:17 +02:00
Klaus K Wilting
00b1faab83
SPI wire interface (experimental)
2018-10-27 21:38:08 +02:00
Klaus K Wilting
16759c4dd5
SPI code added (experimental)
2018-10-27 13:51:59 +02:00
Klaus K Wilting
b4cbf8bdd9
LED control improved
2018-10-24 18:07:41 +02:00
Klaus K Wilting
efaba3775b
main.cpp: added AU921 subband select
2018-10-23 08:56:34 +02:00
Klaus K Wilting
a1976368f8
lorawan.cpp: code sanitization
2018-10-22 19:42:27 +02:00
Klaus K Wilting
0cea410e37
lorawan.cpp: support added for switching SF worldwide
2018-10-22 19:38:26 +02:00
Klaus K Wilting
2be4721c68
added worlwide band support; modified join procedure
2018-10-22 14:06:47 +02:00
Klaus K Wilting
82eb2b5cff
display.cpp: SF texts for worldwide bands added
2018-10-22 13:43:19 +02:00
Klaus K Wilting
15d410b750
hal file comments edited
2018-10-21 22:24:45 +02:00
Klaus K Wilting
dff56b5bef
make SPI LORA pins configurable in hal-files
2018-10-21 22:16:29 +02:00
Klaus K Wilting
f670bc1f63
project migrated to arduino LMIC 1.6 MCCI
2018-10-21 19:00:20 +02:00
Klaus K Wilting
7b666b2737
eboxtube.h added; renamed GPS_QUECTEL_L76 to GPS_I2C
2018-10-20 09:58:53 +02:00
Klaus K Wilting
6d1d358a56
call LMIC_shutdown before ESP.restart
2018-10-17 07:10:37 +02:00
Klaus K Wilting
ebfc16219b
LED color change
2018-10-16 08:48:09 +02:00
Klaus K Wilting
32a42dda2d
fixed issue #160
2018-10-14 15:17:50 +02:00
Klaus K Wilting
a7c1d12eb2
Code Sanitization
2018-10-14 13:26:23 +02:00
Verkehrsrot
2cf6545c9c
Update ttgobeam.h
2018-10-14 09:54:37 +02:00
Klaus K Wilting
7b39044dc1
fix in GPS Sats display format
2018-10-06 22:45:35 +02:00
Klaus K Wilting
42172596e8
Merge branch 'master' of https://github.com/cyberman54/ESP32-Paxcounter
2018-10-06 21:37:33 +02:00
Klaus K Wilting
464db72198
heltecv2.h added; edits in lopy.h and lopy4.h
2018-10-06 21:37:27 +02:00
Fab-Lab.eu
c1bc56bdf9
Create octopus32.h
...
With this config you an run the paxcounter on a #IoT Octopus32 or an Adafruit ESP32 Feather
2018-10-06 20:55:17 +02:00
Klaus K Wilting
d587a8b874
code sanitization
2018-10-04 23:24:34 +02:00
Klaus K Wilting
a5797ad8c4
code sanitization
2018-10-04 23:00:47 +02:00
Klaus K Wilting
ae92bf377d
code sanitization
2018-10-04 22:59:02 +02:00
Klaus K Wilting
30d22aa896
irq handling reworked (using tasknotify instead of semaphores)
2018-10-04 22:08:54 +02:00
Klaus K Wilting
6e47a60f32
code sanitization
2018-10-03 23:07:22 +02:00
Klaus K Wilting
219f2347da
code sanitizations
2018-10-03 20:18:01 +02:00
Klaus K Wilting
1eceea2686
new lmic tasking
2018-10-03 16:24:45 +02:00
Klaus K Wilting
e5df1013b3
v1.5.18 (improved tasking, lmic has now core1 exclusive)
2018-10-03 00:25:05 +02:00
Klaus K Wilting
62d6d865b3
ota.cpp: text in display mask modified
2018-09-30 23:11:25 +02:00
Klaus K Wilting
15f7f2fd85
v1.5.13
2018-09-30 22:06:10 +02:00
Klaus K Wilting
16efbb0c90
edit ttgov21old.h
2018-09-30 19:39:58 +02:00
Klaus K Wilting
1c2fca392b
edit lopy4.h
2018-09-30 18:02:05 +02:00
Klaus K Wilting
7858270d94
edit lopy.h
2018-09-30 17:50:45 +02:00
Klaus K Wilting
52e4dbca28
edit lopy4.h
2018-09-30 17:48:51 +02:00
Klaus K Wilting
240212afb9
edit HAL file ttgov21old.h
2018-09-30 16:49:31 +02:00
Klaus K Wilting
4b80667f03
edit HAL ttgo21old.h (removied display flip)
2018-09-30 16:20:19 +02:00
Klaus K Wilting
afc464d3f7
improved wifi sniffing (use all frames not only mgmt)
2018-09-30 15:54:17 +02:00
Klaus K Wilting
43b4946252
timing improvements (separate mutexes for IRQ; Loraloop higher prio)
2018-09-30 15:08:00 +02:00
Klaus K Wilting
bad2331a6b
ota battery check disabled; v1.5.8
2018-09-30 11:54:45 +02:00
Klaus K Wilting
6ed5368098
edit HAL files lopy.h / lopy4.h
2018-09-29 19:26:24 +02:00
Klaus K Wilting
e18a78c360
edit hal/lopy4.h
2018-09-28 08:26:37 +02:00
Klaus K Wilting
a3f35a6eca
modified DEVEUI Generator & added Lmic PR #197
2018-09-27 22:04:51 +02:00
Klaus K Wilting
8125662753
ota battery check modified
2018-09-27 21:13:18 +02:00
Klaus K Wilting
b22fd808b8
task stack sizes tailored; semaphore controlled wifi task
2018-09-27 15:13:15 +02:00
Klaus K Wilting
cb4870bce5
testing
2018-09-27 14:01:23 +02:00
Klaus K Wilting
5d883e12f6
improvements to LoPy/LoPy4 HAL files (button+LED)
2018-09-24 22:49:55 +02:00
Klaus K Wilting
c7445f0a1e
make OTA selectable
2018-09-24 16:36:11 +02:00
Klaus K Wilting
8985ee3603
code sanitization (volatiles check)
2018-09-23 22:12:10 +02:00
Klaus K Wilting
d4d6a7ea07
battery check before ota
2018-09-23 18:45:46 +02:00
Klaus K Wilting
25d307e820
code sanitization
2018-09-23 18:07:40 +02:00
Klaus K Wilting
5323f82bee
code sanitization
2018-09-23 16:45:54 +02:00
Klaus K Wilting
9dd7a6279d
OTA.h -> ota.h
2018-09-23 15:21:56 +02:00
Klaus K Wilting
a411cac7fe
ota.cpp: showing update progress
2018-09-23 15:07:00 +02:00
Klaus K Wilting
cf3ec23ef9
code sanitization (statemachine.cpp)
2018-09-22 21:26:11 +02:00
Klaus K Wilting
7a53b724cb
ota.cpp: display dialog while updating
2018-09-22 19:39:31 +02:00
Klaus K Wilting
f1e3e8ffa1
update.h
2018-09-22 17:06:31 +02:00
Klaus K Wilting
2e38cda6ac
ota update stabilized
2018-09-22 17:05:09 +02:00
Klaus K Wilting
8e2ace3adf
main.cpp: moved LED control to loop()
2018-09-22 13:43:12 +02:00
Klaus K Wilting
e553dc70a2
comments in main.cpp
2018-09-22 12:25:03 +02:00
Klaus K Wilting
ff759e1533
restructured wifi channel rotation
2018-09-22 12:20:24 +02:00
Klaus K Wilting
5678a5b23c
v1.5.0
2018-09-21 19:30:02 +02:00
Klaus K Wilting
5b9327512b
tasking + statemachine restructured
2018-09-21 18:23:34 +02:00
Klaus K Wilting
67832da09d
Timer bugfix (issue #145 #148 )
2018-09-21 12:25:52 +02:00
Klaus K Wilting
ebc3aac991
gps-code restructured, i2c gps now working
2018-09-20 19:36:32 +02:00
Klaus K Wilting
bf30092f54
gps code bugfixed; new vendor filter data
2018-09-20 17:33:52 +02:00
Klaus K Wilting
a0377a315c
gps.cpp, lorawan.cpp: i2c bugfixes (issue #156 )
2018-09-20 13:23:22 +02:00
Klaus K Wilting
a0c15c1fa1
code sanitization (i2c pins renamed)
2018-09-20 12:53:58 +02:00
Klaus K Wilting
902eeb1414
lorawan.cpp: prepared bugfix for DEVEUI generator
2018-09-19 19:36:41 +02:00
Klaus K Wilting
0dc3f1cf4f
lorawan.cpp: prepared bugfix in DEVEUI generator
2018-09-19 19:34:02 +02:00
Klaus K Wilting
adef8fc9ce
ota.sample.conf
2018-09-19 13:54:51 +02:00
Klaus K Wilting
22aef4c925
sample_ota.conf
2018-09-19 13:54:14 +02:00
Klaus K Wilting
8d65c84d16
ota.conf
2018-09-19 13:52:14 +02:00
Verkehrsrot
8026d4426b
Rename ota.conf.txt to ota.conf
2018-09-19 13:49:21 +02:00
Verkehrsrot
421b5786e3
Add files via upload
2018-09-19 13:48:33 +02:00
Klaus K Wilting
8f36b313e3
ignore ota.conf
2018-09-19 13:33:48 +02:00
Klaus K Wilting
c33112c3b4
ota.cpp bugfix
2018-09-19 11:38:29 +02:00
Verkehrsrot
8b2e155576
Rename ota.sample.conf to ota.conf
2018-09-19 11:04:23 +02:00
Klaus K Wilting
7b6c2f1090
ota.cpp: bugfix
2018-09-19 01:35:20 +02:00
Klaus K Wilting
d80d1e24e9
ota.cpp: added a retry loop for write-to-flash
2018-09-18 22:58:02 +02:00
Verkehrsrot
14957bea96
Rename OTA.h to ota.h
2018-09-18 17:25:44 +02:00
Verkehrsrot
ce1b774d28
Rename OTA.cpp to ota.cpp
2018-09-18 17:25:18 +02:00
Klaus K Wilting
2201e48800
build.py, ota.conf, platformio.ini
2018-09-18 17:23:56 +02:00
Klaus K Wilting
6052588af0
TTN decoders updated
2018-09-17 22:03:03 +02:00
Klaus K Wilting
52efcb7b01
TTN decoders updated
2018-09-17 21:57:01 +02:00
Klaus K Wilting
bd724557c1
v1.4.32
2018-09-17 17:23:02 +02:00
Klaus K Wilting
21621e54d5
code sanitization (vTaskDelay)
2018-09-16 17:39:18 +02:00
cyberman54
fb7c32e5c8
OTA (experimental)
2018-09-16 12:18:11 +02:00
Klaus K Wilting
0667ee5744
OTA (experimental)
2018-09-15 21:10:11 +02:00
Verkehrsrot
414dd02f1d
Merge pull request #153 from cyberman54/master
...
sync dev to master
2018-09-15 20:04:42 +02:00
Klaus K Wilting
b12ed126b7
OTA (experimental)
2018-09-15 18:59:20 +02:00
Klaus K Wilting
2c1dd22555
ota first test
2018-09-15 16:29:52 +02:00
Klaus K Wilting
8876c58b12
merge
2018-09-15 14:49:19 +02:00
Klaus K Wilting
38dc2667ab
ota-test first push
2018-09-15 14:47:13 +02:00
Verkehrsrot
8999c77579
Merge branch 'ota-test' into development
2018-09-15 14:45:23 +02:00
Verkehrsrot
177ead5bee
Merge pull request #144 from cyberman54/development
...
bugfix ttgov21.h
2018-09-09 17:20:07 +02:00
Klaus K Wilting
c963dbe1c6
bugfix in ttgov21.h
2018-09-09 17:13:12 +02:00
Verkehrsrot
11f8895c6a
Merge pull request #143 from cyberman54/development
...
TTGO 21 v1.6 support added
2018-09-08 13:57:50 +02:00
cyberman54
e4e5cc98e1
sanitizations
2018-09-08 13:56:08 +02:00
cyberman54
25d42d4253
edits ttgov21.h
2018-09-08 13:12:37 +02:00
cyberman54
468d054fd2
support TTGO21 v1.6 added
2018-09-08 12:33:32 +02:00
cyberman54
e68126a7f6
testing
2018-08-18 16:28:33 +02:00
Klaus K Wilting
7a58c8dece
testing
2018-08-16 21:10:13 +02:00
Verkehrsrot
cf6781e7e9
Merge pull request #140 from cyberman54/development
...
Bugfix issue #139
2018-08-14 22:29:54 +02:00
cyberman54
b9327100f2
rcommand.cpp: bugfix issue #139
2018-08-14 22:28:34 +02:00
Klaus K Wilting
f659d18390
bugfix rcommand.cpp (illegal commands chrash)
2018-08-14 15:39:36 +02:00
Klaus K Wilting
83a86fdf15
bug fixed in payload.h (issue #138 )
2018-08-13 18:42:48 +02:00
Klaus K Wilting
0ee138b022
JFrog Bintray OTA (experimental, not working yet)
2018-08-12 23:42:39 +02:00
Klaus K Wilting
c1389427a1
Merge branch 'development' of https://github.com/cyberman54/ESP32-Paxcounter into development
2018-08-12 15:43:08 +02:00
Klaus K Wilting
cc603d4ab8
testing
2018-08-12 15:42:58 +02:00
Verkehrsrot
0318987a4e
Bugfix main.cpp introduced with last commit
2018-08-12 13:44:29 +02:00
Klaus K Wilting
5099d25965
testing
2018-08-12 00:17:57 +02:00
Klaus K Wilting
8873a7ce70
cpu temp reduced to 8bit
2018-08-11 21:47:51 +02:00
Verkehrsrot
e0de50acd8
Merge branch 'master' into development
2018-08-11 19:33:45 +02:00
Klaus K Wilting
5880b7e9ff
v1.4.23
2018-08-11 19:31:42 +02:00
Klaus K Wilting
fcd9357116
small code sanitizations
2018-08-11 19:12:04 +02:00
Klaus K Wilting
d704acc3e5
link check disabled; SendBuffer no more global (does not solve mem leak)
2018-08-10 16:33:47 +02:00
Klaus K Wilting
5fbcd0aebb
Queue wait time
2018-08-08 00:05:38 +02:00
Klaus K Wilting
0e6b6fb025
rcommand.cpp: code sanitization
2018-08-07 22:39:49 +02:00
Verkehrsrot
3c94fb211f
Merge pull request #134 from cyberman54/development
...
Link check validation disabled after join
2018-08-07 21:12:08 +02:00
Klaus K Wilting
af62c8fb11
Link check validation disabled after join
2018-08-07 21:10:34 +02:00
Klaus K Wilting
482066eac9
cleanups main.cpp
2018-08-06 08:22:04 +02:00
Klaus K Wilting
cd63d4164b
rcommand.h edited
2018-08-06 08:19:19 +02:00
Klaus K Wilting
5413347e35
src\hal\ebox.h edit
2018-08-05 23:07:13 +02:00
Klaus K Wilting
63a063f9bc
v1.4.2
2018-08-05 17:49:53 +02:00
Klaus K Wilting
95983bd3fc
rcommand flush send queue added
2018-08-05 12:16:54 +02:00
Klaus K Wilting
0a52b16c78
added free memory to device status query
2018-08-04 22:49:12 +02:00
Klaus K Wilting
9b472780da
src/hal/ebox.h added
2018-08-04 18:58:20 +02:00
Klaus K Wilting
1ba8481474
macsniff.cpp bugfix
2018-08-04 18:29:44 +02:00
Klaus K Wilting
2df6700b2d
macsniff.cpp fixed compiler warning
2018-08-04 18:13:42 +02:00
Klaus K Wilting
0a63b444de
rcommand.cpp improved
2018-08-04 18:09:25 +02:00
Klaus K Wilting
c623de9a39
Send Queues (testing)
2018-08-04 15:40:28 +02:00
Klaus K Wilting
88ab6251f6
Send Queues (testing)
2018-08-04 15:27:58 +02:00
Klaus K Wilting
03ca7d4a37
Send Queues (testing)
2018-08-04 14:37:41 +02:00
Klaus K Wilting
7b35c6a539
Send Queues (experimental)
2018-08-03 23:50:04 +02:00
Klaus K Wilting
952ebe77f9
printKey() moved
2018-08-02 12:48:27 +02:00
Klaus K Wilting
c322eb5a83
bugfix rcommand.cpp
2018-08-02 12:16:40 +02:00
Klaus K Wilting
d7a1922b95
bugfix rcommand.cpp
2018-08-02 11:33:02 +02:00
Verkehrsrot
3f9b4efc46
Merge branch 'master' into development
2018-08-01 12:52:40 +02:00
Klaus K Wilting
eedb42c18a
v1.4.0
2018-08-01 12:50:23 +02:00