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

Commit Graph

  • 7951ffa210 Error checking on config and tag entries Patrick McDonagh 2016-04-29 15:01:16 -05:00
  • 9478f9913b Add config model Patrick McDonagh 2016-04-28 18:51:41 -05:00
  • b5b7fcd638 use port 3000 in dev mode Patrick McDonagh 2016-04-28 14:28:25 -05:00
  • 66043c3429 Multiple tag comparison working Patrick McDonagh 2016-04-28 14:26:04 -05:00
  • 1e5bf85b87 Can see tags and values now Patrick McDonagh 2016-04-27 22:11:33 -05:00
  • c64083c20b Tag Server website works without data Patrick McDonagh 2016-04-27 19:23:14 -05:00
  • 80d965dfcc Setup DB Structure using Models in Sails.js Patrick McDonagh 2016-04-27 09:39:02 -05:00
  • 4a867430ac Add CRUD for devices feature/POCONSOLE-20-device-selection Patrick McDonagh 2016-04-26 17:06:41 -05:00
  • a277e47fd3 Add tag error fix, db optimization Patrick McDonagh 2016-04-26 13:30:30 -05:00
  • 30ec348d48 Add MySQL database model Patrick McDonagh 2016-04-26 13:29:46 -05:00
  • 8f262e1b23 Updated tag submodule. now includes analog and bit alarms Patrick McDonagh 2016-04-20 12:15:20 -05:00
  • 5a7d40088c fixed a few typos Patrick McDonagh 2016-04-20 11:48:32 -05:00
  • 4c8ff3f4a5 update tag submodule Patrick McDonagh 2016-04-19 13:13:25 -05:00
  • c90bf70360 fix db create function Patrick McDonagh 2016-04-19 13:12:53 -05:00
  • f324c33f6b changed to be location agnostic Patrick McDonagh 2016-04-18 15:56:20 -05:00
  • 0b1104bdeb Updated to store data_type Patrick McDonagh 2016-04-18 14:54:14 -05:00
  • 5bb8f1bdfd fixed pycomm_micro cip_base imports Patrick McDonagh 2016-04-18 14:08:44 -05:00
  • f5ab8c21b3 fixed inner import Patrick McDonagh 2016-04-18 14:02:46 -05:00
  • 1182c9627d Fixed pycomm_micro import Patrick McDonagh 2016-04-18 13:52:20 -05:00
  • 0dbb19076b Updated Tag Patrick McDonagh 2016-04-18 10:09:39 -05:00
  • 9dadb25011 fixed .gitmodules Patrick McDonagh 2016-04-18 09:56:17 -05:00
  • e0f48be5f0 Updated Tag Patrick McDonagh 2016-04-18 09:08:50 -05:00
  • 066da70b71 Fixed init script Patrick McDonagh 2016-04-15 18:14:10 -05:00
  • eb69640a11 Updated tag submodule again Patrick McDonagh 2016-04-15 18:12:29 -05:00
  • 4bb40dc85d Updated Tag submodule Patrick McDonagh 2016-04-15 18:10:22 -05:00
  • cb6f138859 Updated to work with tag submodule Patrick McDonagh 2016-04-15 18:06:50 -05:00
  • ff5f3bdf8b Removed submodule micro800 Patrick McDonagh 2016-04-15 18:05:32 -05:00
  • 96467142b9 Updated submodule micro800 Patrick McDonagh 2016-04-15 18:02:42 -05:00
  • b65f49fd69 Moved micro800 and tag modules to their own repos, included submodules Patrick McDonagh 2016-04-15 18:00:21 -05:00
  • 6fdc513386 Read was defaulting to False Patrick McDonagh 2016-04-15 17:35:14 -05:00
  • 61e0c4a5f5 val was used before assigned Patrick McDonagh 2016-04-15 17:33:12 -05:00
  • 8c5e328eb3 Use less plc-specific language Patrick McDonagh 2016-04-15 17:29:56 -05:00
  • 0295bb6d86 Allow for forcing send or skip of database, read() returns value Patrick McDonagh 2016-04-15 17:24:49 -05:00
  • 2cb7c0f8da Fix file names for git repo Patrick McDonagh 2016-04-14 15:42:44 -05:00
  • 723ae7494a Removed unused files, fixed dashboard Patrick McDonagh 2016-04-14 12:58:51 -05:00
  • 97538ebb70 Merge pull request #1 in POCLOUD/tag-server from MySQL to master Patrick McDonagh 2016-04-13 22:19:04 +00:00
  • 667f654077 Able to switch back and forth between MySQL and SQLite Patrick McDonagh 2016-04-13 17:17:15 -05:00
  • 83c63bde31 Moved location to /root/tagserver Patrick McDonagh 2016-04-12 18:38:44 -05:00
  • c8baa20927 MySQL working, need to retro SQLite Patrick McDonagh 2016-04-12 18:31:14 -05:00
  • c568c2dfdb Converted to CoffeeScript, data in MySQL Patrick McDonagh 2016-04-12 12:12:10 -05:00
  • 40a3a0d304 Added connect statement to connect to db before trying to INSERT Patrick McDonagh 2016-04-11 15:48:17 -05:00
  • 528b62bcbb reading tags from mysql and writing values to mysql Patrick McDonagh 2016-04-07 17:06:55 -05:00
  • f0f94aaa0f added Tag classes for MySQL and SQLite Patrick McDonagh 2016-04-07 14:39:12 -05:00
  • d9d83789c2 Updated gitIgnore Patrick McDonagh 2016-04-07 14:35:42 -05:00
  • 6294a28462 Merge branch 'develop' Patrick McDonagh 2016-03-23 09:57:30 -05:00
  • 10cd8558ab removed node modules and bower components from develop branch develop Patrick McDonagh 2016-03-23 09:56:05 -05:00
  • 22650d7688 Remove bower components and node modules from the repo Patrick McDonagh 2016-03-23 09:52:17 -05:00
  • ae1058659f Merge pull request #2 in POCLOUD/tagserver from feature/POCONSOLE-10-clx-and-u800 to master Patrick McDonagh 2016-03-01 20:46:44 +00:00
  • d965481ae8 fixed import of micro800 Patrick McDonagh 2016-03-01 14:32:17 -06:00
  • b5ede3c29b wasnt putting the value anywhere Patrick McDonagh 2016-03-01 13:49:16 -06:00
  • cd760216e6 Updated configProperties to include plc_type Patrick McDonagh 2016-03-01 13:42:51 -06:00
  • b1427c095c Ignore all pyc files Patrick McDonagh 2016-03-01 13:15:56 -06:00
  • a0232bcab2 Merge pull request #1 in POCLOUD/tagserver from feature/POCONSOLE-9-edit-pycomm-to-read-from-micro800 to master Patrick McDonagh 2016-03-01 19:09:54 +00:00
  • 24eca42324 Changed driver name Patrick McDonagh 2016-03-01 13:05:05 -06:00
  • e1fc5c81a4 Added files to attempt reading from micro800 Patrick McDonagh 2016-03-01 12:59:44 -06:00
  • 9de66f60ce Update to tsDriver to attempt to locate via gps Patrick McDonagh 2016-03-01 12:53:25 -06:00
  • a8e9bec928 Added the ability to store tag at every scan Patrick McDonagh 2016-02-29 20:23:09 -06:00
  • 9442685a6a Merge remote-tracking branch 'refs/remotes/origin/develop' Patrick McDonagh 2016-02-22 18:38:41 -06:00
  • 934c4c8171 Updated README to reflect recent configuration changes. Patrick McDonagh 2016-02-22 18:38:06 -06:00
  • 48834ab455 Merge remote-tracking branch 'refs/remotes/origin/feature/csv-columns' Patrick McDonagh 2016-02-22 18:16:11 -06:00
  • 11bdf2542f Finished CSV functions Patrick McDonagh 2016-02-22 18:15:23 -06:00
  • f6884d8a15 Added function to download all data in a column-formatted csv Patrick McDonagh 2016-02-22 17:52:58 -06:00
  • dd234d6282 Added getAllTags function Patrick McDonagh 2016-02-22 16:55:13 -06:00
  • afa61dd3ae Merged branch develop into master Patrick McDonagh 2016-02-11 15:54:07 -06:00
  • ec4cdf7f31 Finished ability to download all CSV files Patrick McDonagh 2016-02-11 15:53:25 -06:00
  • 7ce2acd5e0 added vanityName to csv output Patrick McDonagh 2016-02-11 14:18:57 -06:00
  • 29c3dc7199 ability to download all values in CSV format Patrick McDonagh 2016-02-11 14:11:04 -06:00
  • 4e77d955ee Merged feature/config-page into develop Patrick McDonagh 2016-02-05 14:59:14 -06:00
  • ca5fc9c743 Config Pages, functions and tables added Patrick McDonagh 2016-02-05 14:58:51 -06:00
  • 851a90283f Added functions to check loggers and restart loggers Patrick McDonagh 2016-02-03 10:26:40 -06:00
  • 0d1bc7b088 Generic Init Scripts added Patrick McDonagh 2016-02-02 13:40:25 -06:00
  • 18ddf73db8 Removed diagnostic output Patrick McDonagh 2016-02-01 21:46:40 -06:00
  • 30a5e72453 Graphs now use datetime instead of id for x-axis Patrick McDonagh 2016-02-01 21:43:57 -06:00
  • 27d1501cd5 Formatting Readme Patrick McDonagh 2016-02-01 20:57:17 -06:00
  • 11c2d601f1 Changes to Readme Patrick McDonagh 2016-02-01 20:55:38 -06:00
  • deb5de3ecd Created README.md Patrick McDonagh 2016-02-01 18:33:43 -06:00
  • 90f10611ac Added ability to specify datetime limits Patrick McDonagh 2016-02-01 18:13:33 -06:00
  • 4dc4aa0555 Let's use /mnt/usb/data.db for storing the SQLite db Patrick McDonagh 2016-01-28 17:41:58 -06:00
  • 9247893342 added header to CSV data Patrick McDonagh 2016-01-28 17:10:22 -06:00
  • 5c67ea10fe Added ability to download CSV of data series Patrick McDonagh 2016-01-28 17:00:32 -06:00
  • 2cc575c7fd Added font-awesome and details to tags Patrick McDonagh 2016-01-28 16:30:32 -06:00
  • 908b9713bb Added ability to CUD tags from the website Patrick McDonagh 2016-01-28 12:47:54 -06:00
  • 4da445d78f Added vanity name and description, loading screen, pocloud driver Patrick McDonagh 2016-01-28 10:57:33 -06:00
  • 6316fb267e Added line graph to tag vals Patrick McDonagh 2016-01-27 15:06:08 -06:00
  • 6b61156b93 Converted to using bower for installing components Patrick McDonagh 2016-01-27 10:01:20 -06:00
  • 3c67f8004e Added function to retrieve latest values of all tags. Patrick McDonagh 2016-01-26 22:00:33 -06:00
  • b981246cf6 Typo Patrick McDonagh 2016-01-26 21:13:25 -06:00
  • a070ff8c99 Missing }); Patrick McDonagh 2016-01-26 21:11:56 -06:00
  • a9f3c47ed0 somewhere to show off the new stuff Patrick McDonagh 2016-01-26 21:09:53 -06:00
  • 5535f06478 removed redundant function, get tag info with values Patrick McDonagh 2016-01-26 21:07:13 -06:00
  • 62b8397d60 updated tagvals Patrick McDonagh 2016-01-26 20:57:19 -06:00
  • d16b19ba5f Added logo, updated driver for testing Patrick McDonagh 2016-01-26 20:54:14 -06:00
  • 7ed53967dd Typo in routes Patrick McDonagh 2016-01-26 20:49:43 -06:00
  • 820ecca071 Fixed js locations Patrick McDonagh 2016-01-26 20:43:34 -06:00
  • cec44863a6 Getting ready for testing Patrick McDonagh 2016-01-26 20:20:50 -06:00
  • 0eae16e1c5 Got angular working to display tags Patrick McDonagh 2016-01-26 17:05:35 -06:00
  • 6aa9ff123f Gave up and set time window to 24 hours. locations setup of for local testing Patrick McDonagh 2016-01-26 10:35:46 -06:00
  • 475b0f55cd testing .get again Patrick McDonagh 2016-01-25 13:57:44 -06:00
  • e273e378e5 testing using 6 as parameter Patrick McDonagh 2016-01-25 13:52:19 -06:00
  • fbdfa1d6a4 id worked, testing int for hours Patrick McDonagh 2016-01-25 13:47:51 -06:00