Patrick McDonagh
1e5bf85b87
Can see tags and values now
2016-04-27 22:11:33 -05:00
Patrick McDonagh
c64083c20b
Tag Server website works without data
2016-04-27 19:23:14 -05:00
Patrick McDonagh
80d965dfcc
Setup DB Structure using Models in Sails.js
2016-04-27 09:39:02 -05:00
Patrick McDonagh
4a867430ac
Add CRUD for devices
2016-04-26 17:06:41 -05:00
Patrick McDonagh
a277e47fd3
Add tag error fix, db optimization
2016-04-26 13:30:30 -05:00
Patrick McDonagh
30ec348d48
Add MySQL database model
2016-04-26 13:29:46 -05:00
Patrick McDonagh
8f262e1b23
Updated tag submodule. now includes analog and bit alarms
2016-04-20 12:15:20 -05:00
Patrick McDonagh
5a7d40088c
fixed a few typos
2016-04-20 11:48:32 -05:00
Patrick McDonagh
4c8ff3f4a5
update tag submodule
2016-04-19 13:13:25 -05:00
Patrick McDonagh
c90bf70360
fix db create function
2016-04-19 13:12:53 -05:00
Patrick McDonagh
f324c33f6b
changed to be location agnostic
2016-04-18 15:56:20 -05:00
Patrick McDonagh
0b1104bdeb
Updated to store data_type
2016-04-18 14:54:14 -05:00
Patrick McDonagh
5bb8f1bdfd
fixed pycomm_micro cip_base imports
2016-04-18 14:08:44 -05:00
Patrick McDonagh
f5ab8c21b3
fixed inner import
2016-04-18 14:02:46 -05:00
Patrick McDonagh
1182c9627d
Fixed pycomm_micro import
2016-04-18 13:52:20 -05:00
Patrick McDonagh
0dbb19076b
Updated Tag
2016-04-18 10:09:39 -05:00
Patrick McDonagh
9dadb25011
fixed .gitmodules
2016-04-18 09:56:17 -05:00
Patrick McDonagh
e0f48be5f0
Updated Tag
2016-04-18 09:08:50 -05:00
Patrick McDonagh
066da70b71
Fixed init script
2016-04-15 18:14:10 -05:00
Patrick McDonagh
eb69640a11
Updated tag submodule again
2016-04-15 18:12:29 -05:00
Patrick McDonagh
4bb40dc85d
Updated Tag submodule
2016-04-15 18:10:22 -05:00
Patrick McDonagh
cb6f138859
Updated to work with tag submodule
2016-04-15 18:06:50 -05:00
Patrick McDonagh
ff5f3bdf8b
Removed submodule micro800
2016-04-15 18:05:32 -05:00
Patrick McDonagh
96467142b9
Updated submodule micro800
2016-04-15 18:02:42 -05:00
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
