Commit Graph

788 Commits

Author SHA1 Message Date
Klaus K Wilting
184e1e7d84 hal files lopy.h, lopy4.h adapted to current pins_arduino.h 2018-12-28 21:04:11 +01:00
Verkehrsrot
ffab2f7743
Merge branch 'master-1.7.0-rc2' into development 2018-12-28 20:31:38 +01:00
Klaus K Wilting
330b3045d4 append gps data to counter data 2018-12-28 20:23:17 +01:00
Klaus K Wilting
76600a86b1 first fully functional integration (experimental) 2018-12-27 17:09:40 +01:00
Klaus K Wilting
eb5dac2dea new bsec tree 2018-12-26 23:21:28 +01:00
Klaus K Wilting
5009ec0563 initial 2018-12-26 23:01:54 +01:00
Klaus K Wilting
7f066f338f changed init order of BME loop 2018-12-26 13:00:32 +01:00
Klaus K Wilting
911f03c6c5 bugfix hal file heltec, heltecv2, lop,y, lopy4 2018-12-25 09:59:04 +01:00
Klaus K Wilting
b328dd61a0 BME680 optimizations 2018-12-22 21:40:43 +01:00
Klaus K Wilting
2940561c26 display.cpp: removed inverse display for send queue length 2018-12-22 18:18:28 +01:00
Klaus K Wilting
2f51a65b8f bugfix lopy.h + lopy4.h 2018-12-22 18:01:45 +01:00
Verkehrsrot
d1303b81dc
Merge branch 'master-1.7.0-rc1' into development 2018-12-22 16:58:26 +01:00
Klaus K Wilting
3140ab9214 v1.7.01 (PSRAM support, timesync off) 2018-12-22 14:37:47 +01:00
Klaus K Wilting
9574a194fd v1.6.996 2018-12-21 00:35:21 +01:00
Klaus K Wilting
48cbcd40cd delay function sanitized 2018-12-19 12:32:25 +01:00
Klaus K Wilting
551737cc89 plain_decoder.js: bugfix 2018-12-18 10:43:59 +01:00
Klaus K Wilting
ea9f462675 plan_decoder.js: bugfix 2018-12-18 10:43:12 +01:00
Klaus K Wilting
a14fb3d2a2 update ttgobeam_new.h 2018-12-17 10:42:58 +01:00
Klaus K Wilting
82c831e4e4 update ttgobeam_new.h 2018-12-17 10:42:34 +01:00
Klaus K Wilting
616d66c5fb ttgobeam HAL files added 2018-12-17 10:30:56 +01:00
Klaus K Wilting
3e68bbd09e v1.6.972: ttgobeamnew.h added 2018-12-17 10:13:08 +01:00
cyberman54
39204ef7fc Lmic AES changed to MbedTLS hw AES (experimental) 2018-12-16 23:36:17 +01:00
Klaus K Wilting
ad33f8fc76 deinit Bluetooth while device starts if not compiled 2018-12-16 16:50:37 +01:00
Klaus K Wilting
9e079fe642 packed_decoder.js: errorhandling NULL input 2018-12-16 15:38:59 +01:00
Klaus K Wilting
dadab1bd14 payload.cpp: bugfix cayenne 2018-12-09 22:11:45 +01:00
Klaus K Wilting
334255849e ttgobeam.h: BME680 disabled by default 2018-12-09 19:36:22 +01:00
Klaus K Wilting
df4a87df5c ttgobeam.h: brownout optional 2018-12-09 19:33:54 +01:00
Klaus K Wilting
2e2f256ea6 ttgobeam.h: brownout disabled 2018-12-09 18:54:48 +01:00
Klaus K Wilting
e733dba9f4 v1.6.991 2018-12-09 13:48:03 +01:00
Verkehrsrot
373656e481
Update heltecv2.h 2018-12-08 11:18:10 +01:00
Klaus K Wilting
664d58bb4f Bluetooth init ode changes 2018-12-02 18:22:57 +01:00
Klaus K Wilting
47579414ac code sanitization 2018-12-02 14:29:32 +01:00
Klaus K Wilting
decb8b7181 change default to bluetooth disabled 2018-12-02 14:08:50 +01:00
Verkehrsrot
557ccdebd0
Merge pull request #216 from cyberman54/development
v1.6.971
2018-11-28 11:44:05 +01:00
Klaus K Wilting
a22823c356 revert to espressif32 v1.5.0 due to wifi and ble packet loss 2018-11-28 11:41:34 +01:00
Verkehrsrot
ee55176e18
Merge pull request #215 from cyberman54/development
bugfix payload decoder packed_decoder.js
2018-11-27 23:25:08 +01:00
Klaus K Wilting
91a49da61e bugfix payload decoder packed_decoder.js 2018-11-27 23:19:59 +01:00
Verkehrsrot
d0390d8ffa
Merge pull request #214 from cyberman54/development
v1.6.97
2018-11-27 21:32:16 +01:00
Klaus K Wilting
2d0f9c3c13 OTA wifi stability improvement 2018-11-27 21:31:20 +01:00
Klaus K Wilting
207eb6bb98 add feature send battery voltage data 2018-11-27 11:21:20 +01:00
Verkehrsrot
09136c296c
Update paxcounter.conf 2018-11-27 10:57:24 +01:00
Verkehrsrot
6d42056cb8
Merge pull request #213 from cyberman54/development
v1.6.95
2018-11-27 10:16:17 +01:00
Klaus K Wilting
72063b88b1 v1.6.95 2018-11-27 10:10:20 +01:00
Klaus K Wilting
e838b53e7a lorawan: code sanitization 2018-11-26 23:56:25 +01:00
Klaus K Wilting
dd9a493df3 lorawan.cpp: small code sanitizations 2018-11-26 23:32:11 +01:00
Klaus K Wilting
556790082c lorawan.cpp: migrated to LMIC MCCI v2.3.0 2018-11-26 22:49:45 +01:00
Verkehrsrot
c8696bfe1a
Merge pull request #212 from cyberman54/development
BME680: bugfix pressure  value conversion; feature temperature offset
2018-11-26 19:25:49 +01:00
Klaus K Wilting
d5565c99e6 BME680: bugfix pressure value conversion; feature temperature offset 2018-11-26 16:12:41 +01:00
Fab-Lab.eu
6374c3ef1e
Update octopus32.h
changed: BME680 I2C pins and LED active status
2018-11-26 08:48:06 +01:00
Klaus K Wilting
4da2260852 BME280 payload corrections 2018-11-25 23:39:12 +01:00
Klaus K Wilting
54dea2e505 ota.cpp: WIFI_STA mode; lorawan.cpp: rssi negative display 2018-11-25 22:16:14 +01:00
Klaus K Wilting
589e185153 BSEC optimization 2018-11-25 21:39:00 +01:00
Klaus K Wilting
f024361c19 BSEC configuration 2018-11-25 20:56:14 +01:00
Klaus K Wilting
e2c975178a payload converter fixes 2018-11-25 19:16:31 +01:00
Klaus K Wilting
320ec01c14 BME280 fixes 2018-11-25 18:27:20 +01:00
Klaus K Wilting
75fb08e72c v1.6.85 2018-11-25 16:35:36 +01:00
Klaus K Wilting
b85dc829a5 Bosch BSEC integration completed 2018-11-25 16:05:30 +01:00
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