Commit Graph

76 Commits

Author SHA1 Message Date
Patrick McDonagh
099fe06123 Handling PID file from within init script 2016-12-05 15:40:24 -06:00
Patrick McDonagh
a733ec4d9c write PID to file 2016-12-05 15:12:14 -06:00
Patrick McDonagh
912c8b17cf Uses start.sh instead of script variable 2016-12-05 12:50:46 -06:00
Patrick McDonagh
29c406eaa3 Adds startup script 2016-12-05 12:28:54 -06:00
Patrick McDonagh
c143f7ca6e Silences HTTPS warnings since we're using a self-signed certificate 2016-11-29 11:12:42 -06:00
Patrick McDonagh
14999fbab9 Removes unnecessary files and makes adjustment for new utils module in pycomm_helper 2016-11-28 16:18:20 -06:00
Patrick McDonagh
fdbee7c479 Merged in POCONSOLE-25-Flask (pull request #1)
POCONSOLE-25 flask
2016-11-21 23:33:56 +00:00
Patrick McDonagh
387e08d5bd Attempts to save some space by rounding points in cards to 2 digits 2016-11-18 14:32:07 -06:00
Patrick McDonagh
6f4f925f76 updates gauge off url 2016-11-17 16:20:03 -06:00
Patrick McDonagh
00c04636c8 Fixes error using stroke_tags 2016-11-15 11:21:52 -06:00
Patrick McDonagh
a8ed2b5c08 Mostly completes POCONSOLE-39. Still need to get it on an actual well to test the data coming in 2016-11-11 17:43:52 -06:00
Patrick McDonagh
2d928cc1aa per POCONSOLE-59, updates submodule 2016-09-09 18:16:53 -05:00
Patrick McDonagh
49e6e0605f Fix to init script 2016-08-05 16:00:42 -05:00
Patrick McDonagh
a61cdf0e55 Updated Tag submodule to work with POCONSOLE-51 (HTTPS) 2016-06-23 10:23:28 -05:00
Patrick McDonagh
2d1b3d9134 POCONSOLE-51 forces HTTPS 2016-06-22 11:58:02 -05:00
Patrick McDonagh
637ad310db Missed one. 2016-06-16 16:08:43 -05:00
Patrick McDonagh
59d1f08f8c Fixed tag names for using pretty names 2016-06-16 16:06:59 -05:00
Patrick McDonagh
a1200ec234 Fixes tag read bug 2016-06-16 10:50:54 -05:00
Patrick McDonagh
4481aa47b0 Updates tag so I don't have to keep fixing Micro800 imports 2016-06-14 19:09:03 -05:00
Patrick McDonagh
706c40a4ed Fixes driver. This file runs & works. 2016-06-14 19:06:35 -05:00
Patrick McDonagh
9035959a1b fixes map functions 2016-06-08 15:55:31 -05:00
Patrick McDonagh
b081120858 run_status uses 'status' instead of 'val' 2016-06-06 20:52:35 -05:00
Patrick McDonagh
bf90060f97 need to specify the id of the data_type for main_plc 2016-06-06 20:50:00 -05:00
Patrick McDonagh
b750edc4bd getMainPLC was returning a list instead of an object 2016-06-06 20:47:24 -05:00
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
76c5f63597 Create Seed functions 2016-05-08 21:14:36 -05:00
Patrick McDonagh
56c433545a Fixed some non-default IP address issues 2016-04-25 16:09:24 -05:00
Patrick McDonagh
133f0c36ad Prevent printing to console 2016-04-23 16:40:50 -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