nmelone/datalogger-POC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • ab32f65d7c Fixes restart command typo master Patrick McDonagh 2016-12-05 17:15:53 -06:00
  • 0fba320e84 Updates README file Patrick McDonagh 2016-12-05 16:22:42 -06:00
  • 099fe06123 Handling PID file from within init script Patrick McDonagh 2016-12-05 15:40:24 -06:00
  • a733ec4d9c write PID to file Patrick McDonagh 2016-12-05 15:12:14 -06:00
  • 912c8b17cf Uses start.sh instead of script variable Patrick McDonagh 2016-12-05 12:50:46 -06:00
  • 29c406eaa3 Adds startup script Patrick McDonagh 2016-12-05 12:28:54 -06:00
  • c143f7ca6e Silences HTTPS warnings since we're using a self-signed certificate Patrick McDonagh 2016-11-29 11:12:42 -06:00
  • 14999fbab9 Removes unnecessary files and makes adjustment for new utils module in pycomm_helper Patrick McDonagh 2016-11-28 16:18:20 -06:00
  • fdbee7c479 Merged in POCONSOLE-25-Flask (pull request #1) Patrick McDonagh 2016-11-21 23:33:56 +00:00
  • 387e08d5bd Attempts to save some space by rounding points in cards to 2 digits Patrick McDonagh 2016-11-18 14:32:07 -06:00
  • 6f4f925f76 updates gauge off url Patrick McDonagh 2016-11-17 16:20:03 -06:00
  • 00c04636c8 Fixes error using stroke_tags Patrick McDonagh 2016-11-15 11:21:52 -06:00
  • a8ed2b5c08 Mostly completes POCONSOLE-39. Still need to get it on an actual well to test the data coming in Patrick McDonagh 2016-11-11 17:43:52 -06:00
  • 2d928cc1aa per POCONSOLE-59, updates submodule Patrick McDonagh 2016-09-09 18:16:53 -05:00
  • 49e6e0605f Fix to init script Patrick McDonagh 2016-08-05 16:00:42 -05:00
  • a61cdf0e55 Updated Tag submodule to work with POCONSOLE-51 (HTTPS) Patrick McDonagh 2016-06-23 10:23:28 -05:00
  • 2d1b3d9134 POCONSOLE-51 forces HTTPS Patrick McDonagh 2016-06-22 11:58:02 -05:00
  • 637ad310db Missed one. Patrick McDonagh 2016-06-16 16:08:43 -05:00
  • 59d1f08f8c Fixed tag names for using pretty names Patrick McDonagh 2016-06-16 16:06:59 -05:00
  • a1200ec234 Fixes tag read bug Patrick McDonagh 2016-06-16 10:50:54 -05:00
  • 4481aa47b0 Updates tag so I don't have to keep fixing Micro800 imports Patrick McDonagh 2016-06-14 19:09:03 -05:00
  • 706c40a4ed Fixes driver. This file runs & works. Patrick McDonagh 2016-06-14 19:06:35 -05:00
  • 9035959a1b fixes map functions Patrick McDonagh 2016-06-08 15:55:31 -05:00
  • b081120858 run_status uses 'status' instead of 'val' Patrick McDonagh 2016-06-06 20:52:35 -05:00
  • bf90060f97 need to specify the id of the data_type for main_plc Patrick McDonagh 2016-06-06 20:50:00 -05:00
  • b750edc4bd getMainPLC was returning a list instead of an object Patrick McDonagh 2016-06-06 20:47:24 -05:00
  • 22f20d90a2 Was never getting main PLC Patrick McDonagh 2016-06-06 20:45:38 -05:00
  • d8a589c33f Device Types not being found before accessing Patrick McDonagh 2016-06-06 20:43:30 -05:00
  • 9151a33701 Adds a little error message Patrick McDonagh 2016-06-06 16:39:18 -05:00
  • 061189de4e adds Sails datalogger Patrick McDonagh 2016-06-06 14:48:05 -05:00
  • a871da9c61 Uses the sail-ready tag submodule Patrick McDonagh 2016-06-06 13:38:22 -05:00
  • 4311bc5037 adds init script Patrick McDonagh 2016-05-13 18:08:53 -05:00
  • 76c5f63597 Create Seed functions Patrick McDonagh 2016-05-08 21:14:36 -05:00
  • 56c433545a Fixed some non-default IP address issues Patrick McDonagh 2016-04-25 16:09:24 -05:00
  • 133f0c36ad Prevent printing to console Patrick McDonagh 2016-04-23 16:40:50 -05:00
  • 2b4a7bbce5 card_id was double-writing feature/POC-72-poconsole-storing-to-mysql Patrick McDonagh 2016-04-21 13:15:58 -05:00
  • 922647bb3b card id change threshold was keeping cards from being written Patrick McDonagh 2016-04-21 13:15:41 -05:00
  • fa88353d9c use generic readConfig Patrick McDonagh 2016-04-21 09:33:22 -05:00
  • 165da93dad tag submodule update for storing strings Patrick McDonagh 2016-04-20 15:20:22 -05:00
  • 3e2253d387 set up ability to switch back and forth between MySQL and SQLite Patrick McDonagh 2016-04-20 15:14:58 -05:00
  • 1a4c6730f9 Updated tag submodule, now includes alarms Patrick McDonagh 2016-04-20 12:20:08 -05:00
  • ba551fef93 Tested Datalogger storing to SQLite using tag Submodule Patrick McDonagh 2016-04-20 11:48:09 -05:00
  • 921fed5c08 Moved files around, started using Tag submodule Patrick McDonagh 2016-04-19 17:25:16 -05:00
  • cddab5d10a Add tag submodule Patrick McDonagh 2016-04-19 14:58:30 -05:00
  • 0314bb29cf fixed sql create functions Patrick McDonagh 2016-04-19 13:00:49 -05:00
  • 49838ffed6 started fixing datalogger to match db structure of tag server Patrick McDonagh 2016-04-18 09:21:00 -05:00
  • 686280e553 Added tag class for custom tags Patrick McDonagh 2016-04-12 18:40:18 -05:00
  • 8e44e18c82 MySQL Setup successful Patrick McDonagh 2016-04-06 23:14:42 -05:00
  • 381ba39993 Started tag logic to store tags in database Patrick McDonagh 2016-04-03 16:23:18 -05:00
  • 320e8c37a2 copied dataLogger.py from sqlite to mysql directory Patrick McDonagh 2016-03-31 17:40:27 -05:00
  • bf3d19b3aa Wrote database setup file. Patrick McDonagh 2016-03-31 17:39:06 -05:00
  • e6ebea5b83 Moved SQLite files into a directory Patrick McDonagh 2016-03-31 16:41:49 -05:00
  • eb9774f1b7 Don't need tuxeip anymore Patrick McDonagh 2016-03-31 16:41:24 -05:00
  • c202feb2f7 Removed logging since it takes up lots of space Patrick McDonagh 2016-03-31 14:57:57 -05:00
  • 0b09a84ad0 Merged branch master into master Patrick McDonagh 2016-03-30 17:00:35 -05:00
  • 8682ab8386 updated for new version of PyComm Patrick McDonagh 2016-03-30 16:57:25 -05:00
  • 11b888c311 updated for new version of PyComm Patrick McDonagh 2016-03-30 16:57:25 -05:00
  • 00af9f0144 Updated to work with Sqlite Patrick McDonagh 2016-03-30 15:58:10 -05:00
  • 2437380c6e fixed getTodaysTotals.py Patrick McDonagh 2016-03-29 21:48:52 -05:00
  • e81dec2244 Updated db location Patrick McDonagh 2016-03-29 21:06:16 -05:00
  • 033696ea39 Added error trapping and fixed some alarm logging issues Patrick McDonagh 2016-03-29 17:29:26 -05:00
  • 273d1cb36e Fixed location of data.db Patrick McDonagh 2016-03-29 16:59:36 -05:00
  • 5fc31d7153 Renamed dataLogger_SQLite_pycomm.py to reflect its true purpose Patrick McDonagh 2016-03-29 13:21:38 -05:00
  • 30f0cceb82 Deleted files that are no longer in use Patrick McDonagh 2016-03-29 13:20:56 -05:00
  • 3e105f9361 Fixes to make the script work correctly Patrick McDonagh 2016-03-29 09:47:41 -05:00
  • d73d349c2b Removed status from history_tags Patrick McDonagh 2016-03-24 12:37:19 -05:00
  • 20fba072a9 Added Status logic to datalogger Patrick McDonagh 2016-03-24 12:36:28 -05:00
  • 7a191fab6f Merge branch 'master' of http://bitbucket.poconsole.net/scm/poconsole/datalogger Patrick McDonagh 2016-03-24 12:34:02 -05:00
  • 8047db1d24 Moved Run Status to its own table Patrick McDonagh 2016-03-24 12:30:48 -05:00
  • 34d4655245 Updated files to work better with SQLite Patrick McDonagh 2016-03-23 17:28:31 -05:00
  • 9263221273 Merge branch 'master' of http://bitbucket.poconsole.net/git/POCONSOLE/datalogger Patrick McDonagh 2016-03-23 10:04:46 -05:00
  • 16d4057ce9 Tested and completed SQLite datalogger using PyComm Patrick McDonagh 2016-03-22 14:31:02 -05:00
  • 2c807ac77f "datalogger_SQLite_Pycomm.py" mostly complete. Needs testing Patrick McDonagh 2016-03-21 16:58:39 -05:00
  • f428c34ad3 Added card_history_date table Patrick McDonagh 2016-01-10 11:51:06 -06:00
  • 939801715a Added ability to write to SQLite db using dataLoggerSQLite.py Patrick McDonagh 2016-01-07 16:58:48 -06:00
  • 6caf4bde5d If a card with a new date is detected, the new date will be added to card_history_dates table Patrick McDonagh 2016-01-05 13:09:24 -06:00
  • c7a19796f3 Alarm logger Updates Patrick McDonagh 2015-12-30 07:09:11 -06:00
  • 340ac5ab60 Initial Commit Patrick McDonagh 2015-12-08 22:19:39 -06:00