Commit graph

141 commits

Author SHA1 Message Date
ea9dbdeeaf bugs.koc.se test. issue 3
Former-commit-id: b198d0a9a409c7bc5ebb9669107a4ea57a247e74
2016-01-20 15:31:54 +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
7cf45ff232 Adding NexaTellstick code and NexaControl library (as git submodule)
Former-commit-id: 8565cd71c32e491147f5ff032d8e95404b7ad627
2016-01-19 15:19:55 +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
c667b56ae4 Bug fix
Former-commit-id: 1ac564a6478dc0e5b557d1f5f5caaf3318d31770
2016-01-15 11:02:21 +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
bd14a79be7 Zutil correction fix
Former-commit-id: 58c6312aba52fc291a6594d1f506366f15966966
2016-01-15 10:52:21 +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
1d57b3f1dd Small web ui update, We now have the EYE!
Former-commit-id: 9c2cd10f771885747776d381aad21f9118f5825b
2016-01-13 19:04:42 +01:00
b06c9c0234 detected events bugfix
Former-commit-id: 6b223c4412b79acbebeb48352c73b6740222a189
2016-01-13 18:16:25 +01:00
45efb6120d Updated sensor checkbox
Former-commit-id: fa9398168de96f831b84293009b5f3fd6dc9bfb7
2016-01-11 19:54:50 +01:00
fce0a0e939 Added navigation object
Former-commit-id: c6fef444bc1d4fa3389206ac3609fad1f2a41b9c
2016-01-11 19:46:43 +01:00
068e19db22 Added event config page
Former-commit-id: 96256bf1c1c7c4ac2f7a851fc816910cf5b79bb1
2016-01-11 18:22:53 +01:00
2c98cd897d Moved user profile to a new page
Former-commit-id: f28819825c92b749ac250e844db9dec292132b8c
2016-01-11 18:08:52 +01:00
4428824061 Moved PowerChallenge into Hal
Former-commit-id: 34665800518933f0b92723378601a3bafc53fdb0
2016-01-11 18:02:45 +01:00
5b2dffeb43 Removed "koc" from package names
Former-commit-id: 93e426a87e8a82a83783d68cf7a814c88df375aa
2016-01-11 17:48:02 +01:00
1ab72ffbc3 Detected sensors will be shown on the web
Former-commit-id: 6c942025a7ad2c8567ae4db97194ba9fef1a6611
2016-01-10 03:43:38 +01:00
26810e9b2c Dynamic form working for sensors, only visuals no save logic
Former-commit-id: 7bfd7a5bd685b7527e75e692531a2f9a544733e1
2016-01-10 03:24:41 +01:00
35ac4ba678 Small trace fix
Former-commit-id: 98ff22c4b19e3d92262f24344b9e3273ffecec7d
2016-01-06 23:26:55 +01:00
eec7887f94 Implemented peer information syncing.
Implemented local sensor sync boolean value validation.
Updated some traces


Former-commit-id: 6cfd254ccb6a983f56308e706f91869867881bc2
2016-01-06 23:20:28 +01:00
8d3ac0d340 Bug fix and improved logging for Sync Client
Former-commit-id: 35e5f30d32f5b2e486ef9ffccf73e71426ddecd1
2016-01-05 02:54:08 +01:00
71da8fba9a Removed hal.conf as it is server specific
Former-commit-id: 6f812c64ebcf4b7d66b6078cffe34bdd97dec4c7
2016-01-05 02:14:52 +01:00
e08f1b4477 Bug fixes
Former-commit-id: e2dd5aecc8d9fd521d97bff04a9336f6c5008aad
2016-01-05 02:11:03 +01:00
060f784611 Some refactoring for better testing
Former-commit-id: 159d14c7ee81ea75ef9bade2d48c67a056ea4c42
2016-01-05 00:42:25 +01:00
e9168e6136 Rollback: Added tail into run script
Former-commit-id: 00bdc63174715e07226189408786784a253c588c
2016-01-04 23:20:09 +01:00
d0bab40da2 Added tail into run script
Former-commit-id: 5efd4d202b8fcc6f778102184a9ed4f98dc35fa5
2016-01-04 23:12:29 +01:00
53ce5c0dce Linux fixes and updated run script to run main server
Former-commit-id: 8863d1403995e9ff8d7754928a60b32ed00ba9eb
2016-01-04 23:04:00 +01:00
d117e344c2 Implemented reporting and storing of raw data
Former-commit-id: db8352f02b4a703698c69618a8af6036d78f5b1d
2016-01-04 22:50:26 +01:00