Commit graph

190 commits

Author SHA1 Message Date
Daniel Collin
ea5c991824 Optimized data aggregation.
- All aggregation use only the raw data as input.
- Only produce aggregated data that will show in a chart (less work after clearing the sensor_data_aggr table).
- Adding version handling of data aggregation to secure that the peer has up to date data.
- New db version: 6 - Adding sensor.aggr_version(int, default=1), will clear sensor_data_aggr for local sensors


Former-commit-id: cbf5a890a5058791b443e975048db13f6ac4c9fe
2016-02-02 14:26:16 +01:00
Daniel Collin
41ebf9ac30 Bug fixes for Raspberry sensors
Former-commit-id: 59e5c0f293850c14bc500643908262bde02dfa7f
2016-01-30 22:25:19 +01:00
279c5deeb0 disabled GBC for DBBean
Former-commit-id: a8789efa45a0a034a466a779552ec30aabaa54da
2016-01-29 14:47:59 +01:00
Daniel Collin
2169ee4de5 Bug fix. The Raspberry plugin did not have an empty constructor
Former-commit-id: a8eb62cf5552bf395c3faed05b883cff5217786f
2016-01-29 14:15:18 +01:00
c2d03347ca small refactoring
Former-commit-id: 76cf6d11dc8f67469af705755238d86c77fd3b05
2016-01-29 11:11:09 +01:00
51b549528c bug fix where aggr was crashing when no user whas assigned to a sensor
Former-commit-id: f5d59c67752f24f9834e457211e4c155d3dc4b5b
2016-01-29 09:41:14 +01:00
3e9d255532 Better exception logging
Former-commit-id: 656f45de3ad89a53068e37d75b24297f7dbff446
2016-01-29 09:25:21 +01:00
2f934e6b43 nexa bug fix
Former-commit-id: 58df8afaf17b10ae6f71a80715324de34f4a5d87
2016-01-25 21:33:57 +01:00
eceafa762c Tellstic event bugfix. issue 15
Former-commit-id: eed3e3bacbb7adfb27f31f4f1c3a47f1b6e884fd
2016-01-25 20:53:19 +01:00
ff9709b6d2 Small changes to detail pages and change tellstick plugin to write in UTF-8
Former-commit-id: 90320b2bd13c134c0e3ec447759443af3303de42
2016-01-25 16:20:16 +01:00
fc41b60386 Added relative timestamps
Former-commit-id: 5ea7e7519cbe1059d9595a82229b7c7de3ef17bf
2016-01-24 17:37:32 +01:00
73ac1f8208 bug fix where pre and post conf actions where reversed
Former-commit-id: ac688ff189cf02b0f013a9280b1d5beae49e7c2b
2016-01-23 01:22:13 +01:00
aefb0054a0 Sorted overviw raw data display
Former-commit-id: 61bec940fbcded38471094b106c73597d2d26368
2016-01-22 21:18:07 +01:00
5a4107f60f Fixed config page bugs
Former-commit-id: cd32facd6e679eb9a66b294d4011da8eb801fd00
2016-01-22 20:48:29 +01:00
09d59635c3 detected device bug fix
Former-commit-id: f56ddf18a7db16ef07874aceb1d49b7aa4b1bcdd
2016-01-22 20:28:05 +01:00
9961c423a3 Added graph to sensor detail page. Also added missed morris.css file . issue 7
Former-commit-id: 3b2403a46aa58f3937efc345bc6a022e4deb2da5
2016-01-22 19:34:55 +01:00
25693209b5 Refactored aggregate data retrieval
Former-commit-id: 2b109840dac3ceb7270eb5b176a8074e30d9c9df
2016-01-22 17:54:21 +01:00
113bbdbfb8 Added Sensor overview page. issue 7
Former-commit-id: 60dec1d1a95f568404371ecd3c2cc38bc8a4a355
2016-01-22 17:54:18 +01:00
da24ffb822 Events can now be changed in overview page. issue 5
Former-commit-id: 31060a25e584ab277f222dae21bc7a938ec83b1b
2016-01-22 15:46:09 +01:00
87913dfd28 Added Event overview page. issue 5
Former-commit-id: 6ee75491189dc68b53b928436ef5d06a81b81568
2016-01-22 10:52:28 +01:00
afcad4b31f Alerts are now dismissible. [issue 3]
Former-commit-id: a14d76e8da8aac6139dd1e130a9d0be63205a7ea
2016-01-21 10:32:01 +01:00
86bf95d417 Implementation of gui alerts (not dissmissable yet). issue 9
Former-commit-id: 3184c884854a7db76467ab6e7310ce7dea951c39
2016-01-20 17:05:18 +01:00
a45482b92e ControllerManager has now a limbo state for Events and Sensors where they are put during their reconfiguration. Fixing issue 3
Former-commit-id: 39762fb39cd2bb68e903392ffdefd4b8f356e54f
2016-01-20 13:42:38 +01:00
Daniel Collin
e9d32dcc30 Implemented HalSensorController and HalSensorData RPiPowerConsumptionSensor
+ Added RPiTemperatureSensor
+ Updated pi4j-1.0 to pi4j-1.1-SNAPSHOT that includes support for 1-Wire communication and various sensors.


Former-commit-id: 6db4193283bf3fc604fcf250d7a321ba8b70b6a4
2016-01-19 13:53:54 +01:00
3884634590 added flush to sync daemons
Former-commit-id: ddc04e046dc645f677dc182132f985708551bfc5
2016-01-18 17:12:32 +01:00
1f7090200a Removed hard coded users in PCOverview
Former-commit-id: 2a6372ac048c09a2ad201c491d7ffc3dc37025e5
2016-01-18 16:54:10 +01:00
440cc1ec62 Added protocol version check
Former-commit-id: b8a86baa0586c8c87cd92be16789295848c45799
2016-01-18 16:43:03 +01:00
9f9d0e73ee Renamed getAllUsers to getUsers
Former-commit-id: 25666b0e14f38fa10625bc62460bc744be85736b
2016-01-18 15:30:29 +01:00
Daniel Collin
fa719a8b18 Resolved bug where external sensors data were deleted
Former-commit-id: 64ef329e3f1924629fe760cc3df8f324f67c04a9
2016-01-18 15:07:05 +01:00
Daniel Collin
9ee2a788ce Resolved bug where the web charts do not have any gaps when more than one sensor is printed.
Former-commit-id: bd4570203b8b0bfd9333ef23b9110654a8977ccc
2016-01-18 15:04:42 +01:00
42064e5209 Configuration of Events and Sensors are working with dynamic forms
Former-commit-id: ff81dee3365eee865099badc73ca70bc7cb222c6
2016-01-18 13:09:28 +01:00
02e15810ec Device data object are configurable from web but is not visualized correctly
Former-commit-id: a960f1bb610cb1dbbbc76826d15bdb4c6e90c984
2016-01-15 17:04:53 +01:00
1e4bc587bc some improvements
Former-commit-id: d617fda63304602d5db63711ca7bc70d4d27e51e
2016-01-15 14:00:41 +01:00
6e6cae0427 sync bug fix
Former-commit-id: 119b858e73eafa2be8c0dcde46b1ac24feae5e5b
2016-01-15 13:43:30 +01:00
8b42e5bbc9 more bug fixes
Former-commit-id: 8655ac0c062e08d254975942048c82df98a597c2
2016-01-15 13:18:09 +01:00
1e97a4705e more bug fixes
Former-commit-id: a4f546cb05437083e11ada63a9ff1b5b86620ca9
2016-01-15 11:07:57 +01:00
c49650eaff Bug fix
Former-commit-id: 8af0c39b2664373f32eaec5483b4c88950690845
2016-01-15 11:01:01 +01:00
Daniel Collin
656bc41226 Loggin improvement in the PRi sensor
Former-commit-id: 190bc7c849549b13f1abc8058bbae726883d65d6
2016-01-15 10:54:06 +01:00
cc6da8fccf Rename HalEvent and HalSensor to HalEventData and HalSensorData
Former-commit-id: 2dac97a3080245639b43d290aa4e94127cb1bdd4
2016-01-15 10:42:16 +01:00
92e90c5eef Refactored Sensor and Event to extend a common super class (fixed allot of code duplication)
Former-commit-id: 290ddc85eff604b8ca80bc596b2aac1de54ee45a
2016-01-15 08:45:08 +01:00
61c88ed4ca More bugfixes
Former-commit-id: 4d29b4d813ee2e9dba063afeb081742e9537125a
2016-01-14 20:25:50 +01:00
fa9223c653 Switched from JSONObjectStream to Configurator
Former-commit-id: e27c6fd6acf414ad28b8c447f786d30a866060b9
2016-01-14 20:03:36 +01:00
45cf8de571 Bugfix in sync client
Former-commit-id: 6cc17b966f03bb6d70c335f84b1e961d831eed17
2016-01-14 19:24:06 +01:00
5da7cfe2b1 Bugfix external stuff
Former-commit-id: c37f8aada76f3536c3f8b7a76bcd305ed47ba020
2016-01-14 18:12:28 +01:00
0821be8ae9 Added dummy RPi dummy classes
Former-commit-id: 9bb5b35bf11b09dcb5b1328279f228b443d910f8
2016-01-14 17:42:54 +01:00
5f55b5da65 Merge branch 'master' of http://repo.koc.se/hal
Former-commit-id: 9a0f546853b78d3780d00a27ef77a70a3849ac2f
2016-01-14 17:30:12 +01:00
d1696cd32d Peer data sync bugfix
Former-commit-id: d89c27cd778f3bbe26bb256e6a2ce51a786dd7c2
2016-01-14 17:29:46 +01:00
Daniel Collin
b39f5c1f0b Improved logging
Former-commit-id: eab453cc52f1d23906d31e429cab40f2d09bc53a
2016-01-14 16:54:53 +01:00
b06c9c0234 detected events bugfix
Former-commit-id: 6b223c4412b79acbebeb48352c73b6740222a189
2016-01-13 18:16:25 +01:00
fce0a0e939 Added navigation object
Former-commit-id: c6fef444bc1d4fa3389206ac3609fad1f2a41b9c
2016-01-11 19:46:43 +01:00