nmelone/datalogger-POC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49 Commits 2 Branches 0 Tags
22f20d90a2ec59b67a83d24585c7b3912cd1d0b9
Commit Graph

49 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick McDonagh
22f20d90a2 Was never getting main PLC 2016-06-06 20:45:38 -05:00
Patrick McDonagh
d8a589c33f Device Types not being found before accessing 2016-06-06 20:43:30 -05:00
Patrick McDonagh
9151a33701 Adds a little error message 2016-06-06 16:39:18 -05:00
Patrick McDonagh
061189de4e adds Sails datalogger 2016-06-06 14:48:05 -05:00
Patrick McDonagh
a871da9c61 Uses the sail-ready tag submodule 2016-06-06 13:38:22 -05:00
Patrick McDonagh
4311bc5037 adds init script 2016-05-13 18:08:53 -05:00
Patrick McDonagh
2b4a7bbce5 card_id was double-writing 2016-04-21 13:15:58 -05:00
Patrick McDonagh
922647bb3b card id change threshold was keeping cards from being written 2016-04-21 13:15:41 -05:00
Patrick McDonagh
fa88353d9c use generic readConfig 2016-04-21 09:33:22 -05:00
Patrick McDonagh
165da93dad tag submodule update for storing strings 2016-04-20 15:20:22 -05:00
Patrick McDonagh
3e2253d387 set up ability to switch back and forth between MySQL and SQLite 2016-04-20 15:14:58 -05:00
Patrick McDonagh
1a4c6730f9 Updated tag submodule, now includes alarms 2016-04-20 12:20:08 -05:00
Patrick McDonagh
ba551fef93 Tested Datalogger storing to SQLite using tag Submodule 2016-04-20 11:48:09 -05:00
Patrick McDonagh
921fed5c08 Moved files around, started using Tag submodule 2016-04-19 17:25:16 -05:00
Patrick McDonagh
cddab5d10a Add tag submodule 2016-04-19 14:58:30 -05:00
Patrick McDonagh
0314bb29cf fixed sql create functions 2016-04-19 13:00:49 -05:00
Patrick McDonagh
49838ffed6 started fixing datalogger to match db structure of tag server 2016-04-18 09:21:00 -05:00
Patrick McDonagh
686280e553 Added tag class for custom tags 2016-04-12 18:40:18 -05:00
Patrick McDonagh
8e44e18c82 MySQL Setup successful 2016-04-06 23:14:42 -05:00
Patrick McDonagh
381ba39993 Started tag logic to store tags in database 2016-04-03 16:23:18 -05:00
Patrick McDonagh
320e8c37a2 copied dataLogger.py from sqlite to mysql directory 2016-03-31 17:40:27 -05:00
Patrick McDonagh
bf3d19b3aa Wrote database setup file. 
creates tables and users
 2016-03-31 17:39:06 -05:00
Patrick McDonagh
e6ebea5b83 Moved SQLite files into a directory 2016-03-31 16:41:49 -05:00
Patrick McDonagh
eb9774f1b7 Don't need tuxeip anymore 2016-03-31 16:41:24 -05:00
Patrick McDonagh
c202feb2f7 Removed logging since it takes up lots of space 2016-03-31 14:57:57 -05:00
Patrick McDonagh
0b09a84ad0 Merged branch master into master 2016-03-30 17:00:35 -05:00
Patrick McDonagh
8682ab8386 updated for new version of PyComm 2016-03-30 17:00:24 -05:00
Patrick McDonagh
11b888c311 updated for new version of PyComm 2016-03-30 16:57:25 -05:00
Patrick McDonagh
00af9f0144 Updated to work with Sqlite 2016-03-30 15:58:10 -05:00
Patrick McDonagh
2437380c6e fixed getTodaysTotals.py 2016-03-29 21:48:52 -05:00
Patrick McDonagh
e81dec2244 Updated db location 2016-03-29 21:06:16 -05:00
Patrick McDonagh
033696ea39 Added error trapping and fixed some alarm logging issues 2016-03-29 17:29:26 -05:00
Patrick McDonagh
273d1cb36e Fixed location of data.db 2016-03-29 16:59:36 -05:00
Patrick McDonagh
5fc31d7153 Renamed dataLogger_SQLite_pycomm.py to reflect its true purpose 2016-03-29 13:21:38 -05:00
Patrick McDonagh
30f0cceb82 Deleted files that are no longer in use 2016-03-29 13:20:56 -05:00
Patrick McDonagh
3e105f9361 Fixes to make the script work correctly 2016-03-29 09:47:41 -05:00
Patrick McDonagh
d73d349c2b Removed status from history_tags 2016-03-24 12:37:19 -05:00
Patrick McDonagh
20fba072a9 Added Status logic to datalogger 2016-03-24 12:36:28 -05:00
Patrick McDonagh
7a191fab6f Merge branch 'master' of http://bitbucket.poconsole.net/scm/poconsole/datalogger 
# Conflicts:
#	dataLogger_SQLite_pycomm.py
 2016-03-24 12:34:02 -05:00
Patrick McDonagh
8047db1d24 Moved Run Status to its own table 2016-03-24 12:30:48 -05:00
Patrick McDonagh
34d4655245 Updated files to work better with SQLite 2016-03-23 17:28:31 -05:00
Patrick McDonagh
9263221273 Merge branch 'master' of http://bitbucket.poconsole.net/git/POCONSOLE/datalogger 
* 'master' of http://bitbucket.poconsole.net/git/POCONSOLE/datalogger:
  Tested and completed SQLite datalogger using PyComm
  "datalogger_SQLite_Pycomm.py" mostly complete. Needs testing
 2016-03-23 10:04:46 -05:00
Patrick McDonagh
16d4057ce9 Tested and completed SQLite datalogger using PyComm 2016-03-22 14:31:02 -05:00
Patrick McDonagh
2c807ac77f "datalogger_SQLite_Pycomm.py" mostly complete. Needs testing 2016-03-21 16:58:39 -05:00
Patrick McDonagh
f428c34ad3 Added card_history_date table 2016-01-10 11:51:06 -06:00
Patrick McDonagh
939801715a Added ability to write to SQLite db using dataLoggerSQLite.py 2016-01-07 16:58:48 -06:00
Patrick McDonagh
6caf4bde5d If a card with a new date is detected, the new date will be added to card_history_dates table 2016-01-05 13:09:24 -06:00
Patrick McDonagh
c7a19796f3 Alarm logger Updates 2015-12-30 07:09:11 -06:00
Patrick McDonagh
340ac5ab60 Initial Commit 2015-12-08 22:19:39 -06:00