DigitalInfinity/ESP32-PaxCounter
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,225 Commits 1 Branch 0 Tags
3d26f737be0c4dd03fd8a8222c7348f81b7c0a78
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Verkehrsrot bb187ef0bd Merge pull request #274 from cyberman54/master 
sync master to dev
 2019-02-17 19:35:32 +01:00
Verkehrsrot 4608a3b063 Merge pull request #273 from cyberman54/development 
v1.7.31
 2019-02-17 19:23:36 +01:00
Verkehrsrot b538c6db8d Update platformio.ini 2019-02-10 18:18:47 +01:00
Verkehrsrot 616d2bd8de Merge pull request #270 from cyberman54/development 
bugfix IF482 RTC start
 2019-02-10 16:45:51 +01:00
Verkehrsrot 9177d5c062 Merge pull request #269 from cyberman54/master 
sync dev to master
 2019-02-10 00:05:44 +01:00
Verkehrsrot 1f6aba3175 Merge pull request #268 from Octoate/master 
Fixed invalid OLED pin mapping for TTGO v1
 2019-02-10 00:04:01 +01:00
Verkehrsrot 5ae59c5c33 Merge pull request #267 from cyberman54/master 
sync dev to master
 2019-02-09 16:16:53 +01:00
Verkehrsrot 8baf976419 Merge pull request #266 from cyberman54/development 
v1.7.2
 2019-02-09 16:15:05 +01:00
Verkehrsrot 5d1bff6a9b Update ttgov1.h 2019-02-04 20:56:38 +01:00
Verkehrsrot bef33af4b8 Update ttgov2.h 2019-02-04 20:53:27 +01:00
Verkehrsrot ba3320b0bb Update heltec.h 2019-02-04 20:51:16 +01:00
Verkehrsrot b9d4204c09 Update platformio.ini 2019-02-04 20:43:55 +01:00
Verkehrsrot a25ab0930c Update heltecv2.h 2019-02-04 19:45:40 +01:00
Verkehrsrot 6b3a367e68 Merge pull request #261 from cyberman54/development 
bugfixes for time/date handling and i2c bus access handling
 2019-02-02 10:53:45 +01:00
Verkehrsrot 171500581b Merge pull request #260 from cyberman54/development 
once more some bugfixes in realtime handling
 2019-01-29 19:54:05 +01:00
Verkehrsrot a3286ada2b Merge pull request #259 from cyberman54/development 
v1.7.41
 2019-01-29 00:08:58 +01:00
Verkehrsrot cbdf181a10 Merge pull request #258 from cyberman54/master 
sync dev with master
 2019-01-29 00:02:21 +01:00
Verkehrsrot 162a099f5c Added some pictures of paxcounters 2019-01-28 20:13:57 +01:00
Verkehrsrot 70a51563b2 Merge pull request #254 from cyberman54/development 
v1.7.14
 2019-01-28 00:54:30 +01:00
Verkehrsrot c6a9b4e194 Merge pull request #253 from cyberman54/development 
Merge pull request #252 from cyberman54/master
 2019-01-28 00:52:15 +01:00
Verkehrsrot d257b1dd4e Merge pull request #252 from cyberman54/master 
sync master to dev
 2019-01-28 00:47:01 +01:00
Verkehrsrot 696e46ce20 Merge branch 'development' into master 2019-01-28 00:46:49 +01:00
Verkehrsrot f6d140c9be Update README.md 2019-01-20 12:43:31 +01:00
Verkehrsrot b7a95d9ca9 Merge pull request #246 from cyberman54/master 
sync dev to master
 2019-01-19 10:01:05 +01:00
Verkehrsrot bbdbf5a6a3 Merge pull request #245 from cyberman54/development 
globals.h: fixed wrong include Mallocator.h
 2019-01-19 10:00:13 +01:00
Verkehrsrot 3b0fbf36d2 Merge pull request #243 from cyberman54/development 
update hal files
 2019-01-12 12:17:59 +01:00
Verkehrsrot 76d7d187b1 Update README.md 2019-01-12 11:04:35 +01:00
Verkehrsrot 8934386718 Add files via upload 2019-01-12 11:03:17 +01:00
Verkehrsrot 92176a664f Merge pull request #242 from cyberman54/development 
update heltec.h, heltecv2.h
 2019-01-11 19:28:50 +01:00
Verkehrsrot e4320e97f8 Merge pull request #241 from cyberman54/development 
v1.7.11
 2019-01-11 18:43:44 +01:00
Verkehrsrot ffab2f7743 Merge branch 'master-1.7.0-rc2' into development 2018-12-28 20:31:38 +01:00
Verkehrsrot 5bdc354a07 Merge pull request #233 from cyberman54/development-bme680-2 
BME680 integration refactored
 2018-12-28 19:17:44 +01:00
Verkehrsrot d1303b81dc Merge branch 'master-1.7.0-rc1' into development 2018-12-22 16:58:26 +01:00
cyberman54 39204ef7fc Lmic AES changed to MbedTLS hw AES (experimental) 2018-12-16 23:36:17 +01:00
Verkehrsrot 7f6ff59020 Update platformio.ini 2018-12-08 12:34:35 +01:00
Verkehrsrot 373656e481 Update heltecv2.h 2018-12-08 11:18:10 +01:00
Verkehrsrot 557ccdebd0 Merge pull request #216 from cyberman54/development 
v1.6.971
 2018-11-28 11:44:05 +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
Verkehrsrot d0390d8ffa Merge pull request #214 from cyberman54/development 
v1.6.97
 2018-11-27 21:32:16 +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
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
Verkehrsrot 7f6dc8a8ac Merge pull request #211 from make-IoT/patch-2 
Update octopus32.h
 2018-11-26 09:04:17 +01:00
Verkehrsrot e37c8ba732 Merge pull request #210 from cyberman54/development 
v1.6.9
 2018-11-25 23:40:05 +01:00
Verkehrsrot 39558f72fc Merge pull request #209 from cyberman54/development 
v1.6.85
 2018-11-25 18:46:53 +01:00
Verkehrsrot 15e8e0722d Merge pull request #208 from cyberman54/sensor-development 
sync sensor development to development
 2018-11-25 18:28:15 +01:00
Verkehrsrot e59125b5e1 Update update.cpp 
fixed issue #206
 2018-11-21 11:14:44 +01:00
Verkehrsrot ec979d4b81 Merge pull request #205 from cyberman54/master 
sync dev to master
 2018-11-19 15:37:09 +01:00
Verkehrsrot b921731013 Merge pull request #204 from cyberman54/development 
v1.6.82
 2018-11-19 15:34:26 +01:00
Verkehrsrot 42a30b622b Merge pull request #203 from cyberman54/development 
merge development v1.6.82
 2018-11-18 21:03:47 +01:00
Verkehrsrot 80dd7310cc Update comments in spislave.cpp 2018-11-12 13:16:23 +01:00
Verkehrsrot 8a53ed0602 Merge pull request #202 from cyberman54/development 
SPI slave code fixes
 2018-11-12 12:00:47 +01:00
Verkehrsrot dbc3d28d31 Merge pull request #201 from der-ambi/SPI_fixes 
some SPI Slave fixes
 2018-11-12 11:59:04 +01:00
Verkehrsrot a51d9f77ae Merge pull request #200 from cyberman54/development 
v1.6.62
 2018-11-08 21:10:33 +01:00
Verkehrsrot 8963aeccb9 Merge pull request #199 from cyberman54/SPI-slave-development 
v1.6.6
 2018-11-05 17:32:40 +01:00
Verkehrsrot 85a180206a Merge pull request #196 from der-ambi/spi_on_development_3110 
Spi on development 3110
 2018-11-03 20:08:05 +01:00
Verkehrsrot cd756af443 Merge pull request #195 from cyberman54/development 
v1.6.53
 2018-11-02 08:41:49 +01:00
Verkehrsrot 1c3ab7c124 Update README.md 2018-10-24 18:52:48 +02:00
Verkehrsrot 4942668bb4 Update README.md 2018-10-24 18:52:07 +02:00
Verkehrsrot 0523ecb8b6 Merge pull request #191 from cyberman54/development 
international settings improved
 2018-10-23 09:01:17 +02:00
Verkehrsrot 9758afe4fc Merge pull request #190 from cyberman54/development 
v1.6.51
 2018-10-22 14:10:59 +02:00
Verkehrsrot 5e1d51393a Merge pull request #188 from cyberman54/development 
LICENSE update
 2018-10-21 23:10:32 +02:00
Verkehrsrot 300bab8ca6 Merge pull request #187 from cyberman54/development 
v1.6.5
 2018-10-21 22:34:54 +02:00
Verkehrsrot 8eb4cc660d Merge pull request #186 from cyberman54/development 
eboxtube.h added; renamed GPS_QUECTEL_L76 to GPS_I2C
 2018-10-21 10:27:57 +02:00
Verkehrsrot 1041137de8 Merge pull request #184 from cyberman54/development 
v1.6.1
 2018-10-17 07:32:44 +02:00
Verkehrsrot ec024b4676 Merge pull request #183 from cyberman54/master 
sync dev to master
 2018-10-14 15:18:51 +02:00
Verkehrsrot 2cf6545c9c Update ttgobeam.h 2018-10-14 09:54:37 +02:00
Verkehrsrot 73e941dd95 Merge pull request #180 from make-IoT/master 
Update README.md
 2018-10-06 22:21:01 +02:00
Verkehrsrot 74055903b9 Merge pull request #178 from make-IoT/patch-1 
Create octopus32.h
 2018-10-06 21:32:13 +02:00
Verkehrsrot 15bb75fd0d Merge pull request #179 from make-IoT/master 
Update platformio.ini
 2018-10-06 21:31:55 +02:00
Verkehrsrot aa00cb896e Merge pull request #177 from cyberman54/development 
v1.6.0
 2018-10-05 20:10:23 +02:00
Verkehrsrot 9ea27e9664 Merge pull request #176 from cyberman54/newtasking 
v1.6.0
 2018-10-03 16:55:19 +02:00
Verkehrsrot d02462ecbb Merge pull request #175 from cyberman54/development 
v1.5.16 (upgrade to ESP IDF 3.1)
 2018-10-01 22:07:37 +02:00
Verkehrsrot 8084b2c645 Merge pull request #173 from cyberman54/development 
v1.5.14
 2018-10-01 12:11:56 +02:00
Verkehrsrot 686571edd0 Merge pull request #172 from cyberman54/development 
v1.5.13
 2018-09-30 22:07:08 +02:00
Verkehrsrot 20914e79b7 Merge pull request #170 from cyberman54/master 
sync dev to master
 2018-09-30 17:53:37 +02:00
Verkehrsrot 2cb75a9b43 Merge pull request #169 from cyberman54/development 
v1.5.9
 2018-09-30 17:52:44 +02:00
Verkehrsrot f38c4024a7 Merge pull request #168 from cyberman54/development 
v1.5.9
 2018-09-30 17:30:29 +02:00
Verkehrsrot e8f247b288 Merge pull request #167 from cyberman54/development 
v1.5.8
 2018-09-30 12:03:32 +02:00
Verkehrsrot fb759d3e56 Merge pull request #166 from cyberman54/development 
v1.5.7
 2018-09-27 19:12:13 +02:00
Verkehrsrot 05b446dbef Delete OTA-Screenshot.png 2018-09-23 17:36:27 +02:00
Verkehrsrot d39e2bd8a8 OTA screenshot image uploaded 2018-09-23 17:34:26 +02:00
Verkehrsrot 215149d479 Merge pull request #164 from cyberman54/development 
v1.5.3
 2018-09-23 15:24:59 +02:00
Verkehrsrot a5e03ec1df Merge pull request #161 from cyberman54/development 
ota.cpp: display dialog while updating
 2018-09-22 20:43:26 +02:00
Verkehrsrot ec7c28d624 Merge pull request #159 from cyberman54/development 
v1.5.2
 2018-09-22 17:08:32 +02:00
Verkehrsrot 63536d0806 Merge pull request #158 from cyberman54/development 
v1.5.1
 2018-09-22 14:19:37 +02:00
Verkehrsrot 6af4405e2b Merge pull request #157 from cyberman54/master 
sync master to dev
 2018-09-20 12:55:19 +02:00
Verkehrsrot 569da23b6b Merge pull request #155 from cyberman54/development 
v1.4.35
 2018-09-19 16:48:23 +02:00
Verkehrsrot 939d4b6a3b Update README.md 2018-09-19 16:33:56 +02:00
Verkehrsrot e5a4ada7d5 Update README.md 2018-09-19 13:59:34 +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
Verkehrsrot 8b2e155576 Rename ota.sample.conf to ota.conf 2018-09-19 11:04:23 +02:00
Verkehrsrot ed50a79297 Update README.md 2018-09-18 18:43:51 +02:00
Verkehrsrot f18c567adf Update README.md 2018-09-18 18:03:06 +02:00
Verkehrsrot aa9129abca Update README.md 2018-09-18 18:01:56 +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
cyberman54 fb7c32e5c8 OTA (experimental) 2018-09-16 12:18:11 +02:00
Verkehrsrot 414dd02f1d Merge pull request #153 from cyberman54/master 
sync dev to master
 2018-09-15 20:04:42 +02:00