Patrick McDonagh
b65f49fd69
Moved micro800 and tag modules to their own repos, included submodules
2016-04-15 18:00:21 -05:00
Patrick McDonagh
6fdc513386
Read was defaulting to False
2016-04-15 17:35:14 -05:00
Patrick McDonagh
61e0c4a5f5
val was used before assigned
2016-04-15 17:33:12 -05:00
Patrick McDonagh
8c5e328eb3
Use less plc-specific language
2016-04-15 17:29:56 -05:00
Patrick McDonagh
0295bb6d86
Allow for forcing send or skip of database, read() returns value
2016-04-15 17:24:49 -05:00
Patrick McDonagh
2cb7c0f8da
Fix file names for git repo
2016-04-14 15:42:44 -05:00
Patrick McDonagh
723ae7494a
Removed unused files, fixed dashboard
2016-04-14 12:58:51 -05:00
Patrick McDonagh
97538ebb70
Merge pull request #1 in POCLOUD/tag-server from MySQL to master
...
MySQL and SQLite working
* commit '667f6540773b6a556171c20a16996b32d334fc05':
Able to switch back and forth between MySQL and SQLite
Moved location to /root/tagserver
MySQL working, need to retro SQLite
Converted to CoffeeScript, data in MySQL
Added connect statement to connect to db before trying to INSERT
reading tags from mysql and writing values to mysql
added Tag classes for MySQL and SQLite
Updated gitIgnore
2016-04-13 22:19:04 +00:00
Patrick McDonagh
667f654077
Able to switch back and forth between MySQL and SQLite
2016-04-13 17:17:15 -05:00
Patrick McDonagh
83c63bde31
Moved location to /root/tagserver
2016-04-12 18:38:44 -05:00
Patrick McDonagh
c8baa20927
MySQL working, need to retro SQLite
2016-04-12 18:31:14 -05:00
Patrick McDonagh
c568c2dfdb
Converted to CoffeeScript, data in MySQL
2016-04-12 12:12:10 -05:00
Patrick McDonagh
40a3a0d304
Added connect statement to connect to db before trying to INSERT
2016-04-11 15:48:17 -05:00
Patrick McDonagh
528b62bcbb
reading tags from mysql and writing values to mysql
2016-04-07 17:06:55 -05:00
Patrick McDonagh
f0f94aaa0f
added Tag classes for MySQL and SQLite
2016-04-07 14:39:12 -05:00
Patrick McDonagh
d9d83789c2
Updated gitIgnore
2016-04-07 14:35:42 -05:00
Patrick McDonagh
6294a28462
Merge branch 'develop'
...
* develop:
removed node modules and bower components from develop branch
Conflicts:
.gitignore
2016-03-23 09:57:30 -05:00
Patrick McDonagh
10cd8558ab
removed node modules and bower components from develop branch
2016-03-23 09:56:05 -05:00
Patrick McDonagh
22650d7688
Remove bower components and node modules from the repo
2016-03-23 09:52:17 -05:00
Patrick McDonagh
ae1058659f
Merge pull request #2 in POCLOUD/tagserver from feature/POCONSOLE-10-clx-and-u800 to master
...
* commit 'd965481ae893f51b7f42e9dd371dbdf647cedfc7':
fixed import of micro800
wasnt putting the value anywhere
Updated configProperties to include plc_type
2016-03-01 20:46:44 +00:00
Patrick McDonagh
d965481ae8
fixed import of micro800
2016-03-01 14:32:17 -06:00
Patrick McDonagh
b5ede3c29b
wasnt putting the value anywhere
2016-03-01 13:49:16 -06:00
Patrick McDonagh
cd760216e6
Updated configProperties to include plc_type
2016-03-01 13:42:51 -06:00
Patrick McDonagh
b1427c095c
Ignore all pyc files
2016-03-01 13:15:56 -06:00
Patrick McDonagh
a0232bcab2
Merge pull request #1 in POCLOUD/tagserver from feature/POCONSOLE-9-edit-pycomm-to-read-from-micro800 to master
...
* commit '24eca4232482e8bb3b57bee84cdb100486e56a4e':
Changed driver name
Added files to attempt reading from micro800
2016-03-01 19:09:54 +00:00
Patrick McDonagh
24eca42324
Changed driver name
2016-03-01 13:05:05 -06:00
Patrick McDonagh
e1fc5c81a4
Added files to attempt reading from micro800
2016-03-01 12:59:44 -06:00
Patrick McDonagh
9de66f60ce
Update to tsDriver to attempt to locate via gps
2016-03-01 12:53:25 -06:00
Patrick McDonagh
a8e9bec928
Added the ability to store tag at every scan
2016-02-29 20:23:09 -06:00
Patrick McDonagh
9442685a6a
Merge remote-tracking branch 'refs/remotes/origin/develop'
2016-02-22 18:38:41 -06:00
Patrick McDonagh
934c4c8171
Updated README to reflect recent configuration changes.
...
Added preliminary API documentation as well
2016-02-22 18:38:06 -06:00
Patrick McDonagh
48834ab455
Merge remote-tracking branch 'refs/remotes/origin/feature/csv-columns'
2016-02-22 18:16:11 -06:00
Patrick McDonagh
11bdf2542f
Finished CSV functions
...
Data is now returned with columns for each tag
2016-02-22 18:15:23 -06:00
Patrick McDonagh
f6884d8a15
Added function to download all data in a column-formatted csv
2016-02-22 17:52:58 -06:00
Patrick McDonagh
dd234d6282
Added getAllTags function
2016-02-22 16:55:13 -06:00
Patrick McDonagh
afa61dd3ae
Merged branch develop into master
2016-02-11 15:54:07 -06:00
Patrick McDonagh
ec4cdf7f31
Finished ability to download all CSV files
2016-02-11 15:53:25 -06:00
Patrick McDonagh
7ce2acd5e0
added vanityName to csv output
2016-02-11 14:18:57 -06:00
Patrick McDonagh
29c3dc7199
ability to download all values in CSV format
2016-02-11 14:11:04 -06:00
Patrick McDonagh
4e77d955ee
Merged feature/config-page into develop
2016-02-05 14:59:14 -06:00
Patrick McDonagh
ca5fc9c743
Config Pages, functions and tables added
2016-02-05 14:58:51 -06:00
Patrick McDonagh
851a90283f
Added functions to check loggers and restart loggers
2016-02-03 10:26:40 -06:00
Patrick McDonagh
0d1bc7b088
Generic Init Scripts added
2016-02-02 13:40:25 -06:00
Patrick McDonagh
18ddf73db8
Removed diagnostic output
2016-02-01 21:46:40 -06:00
Patrick McDonagh
30a5e72453
Graphs now use datetime instead of id for x-axis
2016-02-01 21:43:57 -06:00
Patrick McDonagh
27d1501cd5
Formatting Readme
2016-02-01 20:57:17 -06:00
Patrick McDonagh
11c2d601f1
Changes to Readme
2016-02-01 20:55:38 -06:00
Patrick McDonagh
deb5de3ecd
Created README.md
2016-02-01 18:33:43 -06:00
Patrick McDonagh
90f10611ac
Added ability to specify datetime limits
2016-02-01 18:13:33 -06:00
Patrick McDonagh
4dc4aa0555
Let's use /mnt/usb/data.db for storing the SQLite db
2016-01-28 17:41:58 -06:00
