1
0
mirror of https://github.com/revspace/operame synced 2024-10-31 21:47:30 +00:00
Commit Graph

75 Commits

Author SHA1 Message Date
Pieter De Mil
a119c8d7e5
Merge pull request #10 from SanderVanhove/patch-1
Fix header file name
2021-10-06 15:25:50 +02:00
Sander Vanhove
02888d3c54
Fix header file name 2021-10-06 15:22:21 +02:00
Pieter De Mil
68b82bcf02
Update README.md 2021-09-03 16:38:10 +02:00
Pieter De Mil
f9c3d05ce9
Merge pull request #9 from SanderVanhove/main
Add temperature and humidity to rest message
2021-09-03 16:37:07 +02:00
Sander Vanhove
56a53b0a1c Add temp and humidity to rest message 2021-09-01 16:09:03 +02:00
ControlCO2.space
b1766c1b3f
Merge pull request #8 from SanderVanhove/feat/add-rest
Extend rest cert length
2021-08-27 15:06:57 +02:00
Sander Vanhove
31bab2ce25 Extend rest cert length 2021-08-26 16:35:14 +02:00
ControlCO2.space
887650110f
Merge pull request #7 from controlco2/bugfix/publish-temp-and-hum-to-temp-and-hum-topics
bugfix: publish temperature and humidity to their own topics
2021-07-26 15:54:04 +02:00
Pieter De Mil
4dbff9156d bugfix: publish temperature and humidity to their own topics 2021-07-26 15:51:11 +02:00
ControlCO2.space
ca29d59c08
Merge pull request #6 from controlco2/bugfix/check-temp-hum-flag
bugfix: check if the user wants to send temperature and humidity via …
2021-07-26 15:43:36 +02:00
Pieter De Mil
b6c24d252a bugfix: check if the user wants to send temperature and humidity via MQTT 2021-07-26 15:41:51 +02:00
ControlCO2.space
9ce786bc62
Merge pull request #5 from controlco2/feature/add-mqtt-topics-temperature-humidity
Changed MQTT message template to fixed JSON payload, added temperature and humidity
2021-07-08 13:00:09 +02:00
Pieter De Mil
d4dd03590e Changed MQTT message template to fixed JSON payload, added temperature and humidity 2021-07-08 12:53:11 +02:00
ControlCO2.space
ce58e673fc
Merge pull request #4 from controlco2/feature/mqtt_username_password
Fix MQTT
2021-07-06 18:07:53 +02:00
Pieter De Mil
fee6d067e9 Fix MQTT 2021-07-06 17:59:48 +02:00
ControlCO2.space
a51b9df121
Merge pull request #3 from tomderyck/main
Added DHT22 sensor code
2021-06-26 10:42:20 +02:00
ControlCO2.space
f7de85e785
Merge branch 'main' into main 2021-06-26 10:41:51 +02:00
tomderyck
b467bda9eb Added DHT22 sensor code
If DHT22 humidity sensor is connected, temp and hum is displayed.
2021-06-16 09:52:10 +02:00
ControlCO2.space
44867dc781
Merge pull request #1 from tomderyck/main
Logo update and Excel Data Streamer
2021-06-07 17:26:30 +02:00
ControlCO2.space
623fdef4ed
Merge pull request #2 from SanderVanhove/feat/add-rest
Add rest post functionality
2021-06-07 17:17:58 +02:00
SanderVanhove
441e494844 Add rest post functionality 2021-06-04 16:44:24 +02:00
tomderyck
de55b35627 Logo updated
ControlCO2 logo used
2021-06-03 10:57:59 +02:00
tomderyck
57860a9429 Modification for Excel Data Streamer
Modified the serial communication of CO2 values
2021-06-03 10:53:13 +02:00
controlco2
9907ef7ceb
ControlCO2.space 2021-05-13 12:22:19 +02:00
Juerd Waalboer
b84a6d8b19 Flush serial buffers before sending 0x87 2021-03-13 19:04:19 +01:00
Juerd Waalboer
2807ee2647 Implement manual calibration (command 0x87) 2021-03-11 03:54:36 +01:00
Juerd Waalboer
8fa0ee91e7 Hacky parallel firmware flasher 2021-02-17 05:01:08 +01:00
Juerd Waalboer
29d873d268 Show message during SPIFFS format
Also moved startup order around so module error message can be localized
with user language.
2021-01-26 07:18:16 +01:00
Juerd Waalboer
69ddf8054a Add basic i18n support and English translations 2021-01-26 06:28:14 +01:00
Juerd Waalboer
f76e092998 Use Dutch translation of WiFiSettings 2021-01-26 05:09:52 +01:00
Juerd Waalboer
d1942fcaa0 More bits to support >1 minute MQTT intervals
Oops, overlooked that 16 when copy/pasting the macro.
2021-01-02 19:19:25 +01:00
Juerd Waalboer
7fb7682cfe Rollback #2 / 3f87f63
Doesn't work.
2020-12-31 01:06:04 +01:00
Juerd Waalboer
e92b3f6bb2
Merge pull request #2 from bertrik/platformio_libnames
Clarify library dependencies in platformio.ini by specififying them a…
2020-12-30 17:27:42 +01:00
Bertrik Sikken
3f87f63951 Clarify library dependencies in platformio.ini by specififying them as author/libname. 2020-12-30 17:02:54 +01:00
Juerd Waalboer
216534d105 Fix bug: OTA not enabled in portal
Thanks, Bertrik!
2020-12-30 16:45:52 +01:00
Juerd Waalboer
320bff7393 Bugfix: use portal uptime instead of MCU uptime for portal timeout 2020-12-27 22:25:41 +01:00
Juerd Waalboer
94c39eaf0d Don't catch up with missed intervals 2020-12-27 21:10:38 +01:00
Juerd Waalboer
f4fe6e3a1e Code cleanup
- Removed unused #define and 'using namespace'
- Moved magic literals to global const
- Reordered functions
- Changed timers in main loop to simple macro instead of Timer class
- Changed several identifiers
- Reformatted global variable assignments
2020-12-27 20:57:53 +01:00
Juerd Waalboer
a9242b549b Remove useless line
Was visible for only 50 ms...
2020-12-27 20:25:29 +01:00
Juerd Waalboer
d2177e450f Tiny refactor 2020-12-27 19:56:22 +01:00
Juerd Waalboer
5889fcdaa5 Smarter debouncing; act after key release 2020-12-27 19:37:39 +01:00
Juerd Waalboer
1d7f5d2614 Slower upload speed is the default in new platformio 2020-12-26 18:13:44 +01:00
Juerd Waalboer
2a69bedc55 Use released version of ESP-WiFiSettings 2020-12-26 18:13:25 +01:00
Juerd Waalboer
e70efe35d7 Display message before restarting 2020-12-26 18:09:11 +01:00
Juerd Waalboer
28bfd78e28 README nitpicks 2020-12-26 17:55:15 +01:00
Juerd Waalboer
b899c18604 Merge branch 'main' of github.com:Juerd/operame into main 2020-12-26 17:53:57 +01:00
Juerd Waalboer
5434d9227f
Merge pull request #1 from supakeen/supakeen-documentation-1
A slightly less spartan README.
2020-12-26 17:52:54 +01:00
Juerd Waalboer
663816223b Avoid possibility of using char* without initialization 2020-12-26 17:44:49 +01:00
Juerd Waalboer
fe392acfbd Change type for consistency
(Now it's inconsistent with the char* in readBytes, but at least it's
consistent in this file...)

Thanks, supakeen!

Also changed the type for the returned value.
2020-12-26 17:39:10 +01:00
Juerd Waalboer
14f917b84f Document special-case return values
Thanks, supakeen!

Additional thought: should maybe be an enum
2020-12-26 17:35:20 +01:00