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
2c59ae5693
Added event table and added ignored table to DB upgrade
...
Former-commit-id: 9237a2457630ac5fa1e41c7e6b16214ca24cba08
2016-01-04 19:21:26 +01:00
1f781f0c8d
Added events to ControllerManager
...
Former-commit-id: 0982aed3728ac12c562b63fad5d74b7a548e50c0
2016-01-04 19:05:16 +01:00
6522b817dc
Changed Controller Object sensor from Sensor to HalSensor
...
Former-commit-id: efbf9952098f1bdd70547d12a98a62a396fbf705
2016-01-04 18:16:58 +01:00
a63f34641f
Enabled ControllerManager and med startup more robust
...
Former-commit-id: f5aade38ed8bd352c12d00046ce38c99e6147216
2015-12-31 00:27:42 +01:00
27c5204ec1
Implemented loading and saving Events and Sensors
...
Former-commit-id: 26ce2c437dd31a0236f6e13f1dff0709ed6a4966
2015-12-31 00:04:53 +01:00
588ac41956
Massive refactoring, new Sensor/Event class structure, controller instantiation disabled as it needs some more work
...
Former-commit-id: 0d2c15d63ea44c45c018fec59877a374122dacd4
2015-12-23 01:17:30 +01:00
fc05f82f31
Added Sensor plugin logic
...
Former-commit-id: d1cd27bf98192e0976b078eabb202bd13496df5c
2015-12-23 00:33:49 +01:00
Daniel Collin
275ffd97c2
Adding logic to the batabase upgrade.
...
1. Introduced a new db table "db_version_history" to hal-default.db. The table contains a list of db version. Every version has some parameters:
- 'db-version' (int) - A db version number. table 'conf', key 'db_version' points to this.
- 'force-upgrade' (default:0) - If 1 then force the upgrade to this version
- 'clear-internal-aggr-data' (default:0) - If 1 then clear all internal aggr data before upgrade.
- 'clear-external-aggr-data' (defualt:0) - If 1 then clear all external aggr data before upgrade.
The db table 'conf', key 'db_version' has to point to the db version to upgrad to. Only forward upgrades are supported.
2. Modified HalContext to act accoring to the parameters in the new db table.
Former-commit-id: 19bd87ade3129f3fc0c51f0e1b94f71dc854d792
2015-12-21 14:09:51 +01:00
Daniel Collin
b391e3a5e1
Fixed so that the aggregation will have less of a delay
...
Former-commit-id: cf26badd0d108260c4c00934005599aa7aea2e47
2015-12-21 13:49:18 +01:00
3f579bdf63
added run script
...
Former-commit-id: be675da729024872eef85cd98fbad22996fc4c65
2015-12-19 13:59:45 +01:00
4e283b750a
Fixed mobile view
...
Former-commit-id: c0a27929741e826f6ba42aab39e5072098f69cd0
2015-12-18 17:47:59 +01:00
405d7ebf02
Bug fix, Optimized imports, Changed Timer to ExecutorService
...
Former-commit-id: b23ccf25f1f121589bd8887dbe833b95db4d2b24
2015-12-18 17:20:33 +01:00
Daniel Collin
d635888742
bug fix
...
Former-commit-id: cc32837aa622271c375ce50add3fb43136c32fc1
2015-12-18 10:15:22 +01:00
