-
-
-### Backers
-
-Thank you to all our backers! [[Become a backer](https://opencollective.com/Grow-IoT#backer)]
-
-
-
-
-### Sponsors
-
-Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/Grow-IoT#sponsor))
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 3718500..a78790c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,26 @@
-Copyright (c) 2016, Common Garden
+Copyright (c) 2018, Common Garden
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
diff --git a/README.md b/README.md
index 71314a5..cddbef7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Grow-IoT
-[](#backers) [](#sponsors) [](https://gitter.im/CommonGarden/Grow-IoT) [](https://github.com/CommonGarden/Grow-IoT/blob/master/LICENSE) [](https://travis-ci.org/CommonGarden/Grow-IoT)
+[](#backers) [](#sponsors) [](https://gitter.im/CommonGarden/Grow-IoT) [](https://github.com/CommonGarden/Grow-IoT/blob/master/LICENSE) [](https://travis-ci.org/CommonGarden/Grow-IoT)
The Grow-IoT project is managed as a mono-repo with a bunch of seperately published packages such as:
* [Grow.js](https://github.com/CommonGarden/Grow-IoT/tree/development/packages/Grow.js)
@@ -14,11 +14,9 @@ See our [basic Raspberry pi example](https://github.com/CommonGarden/BasicRaspbe
You need to install [Meteor](https://www.meteor.com/) first (if you haven't already).
-You will also need to install [Lerna](https://github.com/lerna/lerna), which we use to manage all the packages that comprise Grow-IoT!
+You will also need to install [yarn](https://yarnpkg.com/), which we use to manage all the packages that comprise Grow-IoT!
-```bash
-npm install -g lerna
-```
+You will also need to install [yarn](https://yarnpkg.com/), which we use to manage all the packages that comprise Grow-IoT! See the [yarn website](https://yarnpkg.com/) for platform specific installation instructions.
Then clone the repo and enter the new directory:
@@ -30,8 +28,7 @@ cd Grow-IoT
Finally install the needed software dependencies:
```
-meteor npm install
-lerna bootstrap
+yarn
```
Start the Grow-IoT server with the `meteor` command:
@@ -43,14 +40,13 @@ meteor
And that's it! Visit http://localhost:3000 with your browser of choice; you should now have the application running.
## Connecting devices (or virtual things)
-Create a new device (click the '+' button) and create a device `uuid` and `token`. Then run (in a seperate terminal):
+Create a new device (click the '+' button) and create a device. Enter "test" for both the `uuid` and `token`. Then run the mock device driver (in a seperate terminal):
```bash
-node tests/test-grow-hub.js
+node packages/Grow.js/examples/test-device.js
```
-Paste in the `uuid` and `token` you created and presto! You've connected your first thing to Grow-IoT.
-You can find then component for this device in `imports/things/GrowHub.jsx`.
+You can find the ui component for this device in `imports/things/misc/Thermostat.jsx`.
# Connecting sensors and actuators
@@ -58,21 +54,23 @@ In the `packages` directory, we've started 2 libraries to help you connect senso
* [Thing.js](https://github.com/CommonGarden/Grow-IoT/tree/development/packages/Thing.js): A general purpose internet of things library... basically a fancy event emitter
* [Grow.js](https://github.com/CommonGarden/Grow-IoT/tree/development/packages/Grow.js): extends the Thing class with a bunch of useful things for growers like scheduling, registering listeners and alerts, etc.
-Hardware examples live in the `.examples` folder (the folder is hidden, because Meteor is dumb and tries to build everything). The corresponding UI components live in`imports/things/`.
+Hardware examples live in those packages' `examples` folder. Corresponding UI components live in `imports/things/`.
**See [Thing.js](https://github.com/CommonGarden/Grow-IoT/tree/development/packages/Thing.js) for more info on creating and connecting devices.**
### Adding custom components
To do so:
-1. Make a new `CustomComponent.jsx` file in `imports/things/'` or `yarn add package-name`
+1. Make a new `CustomComponent.jsx` file in `imports/things/'` or `npm install package-name` if the component is published on [npm](https://www.npmjs.com/).
2. Open `imports/things/index.js`.
3. `import CustomComponent from './CustomComponent'`
4. Lastly, add `CustomComponent` to the exported `components` object.
-Example grow systems:
-* https://github.com/CommonGarden/Fermenter
-* https://github.com/CommonGarden/CompostBrewer
+Example devices and grow systems:
+* [Basic Raspberry Pi example](https://github.com/CommonGarden/Grow-Hub)
+* [General Grow Controller](https://github.com/CommonGarden/Grow-Hub)
+* [Fermenter](https://github.com/CommonGarden/Fermenter)
+* [Compost Brewer](https://github.com/CommonGarden/CompostBrewer)
More on the way! Contributions welcome!
@@ -83,13 +81,15 @@ File/Folder | Provides
--------------|----------------------------------------------------------------
`.meteor` | Meteor stuff, well documented in [other places](http://docs.meteor.com/#/full/).
`.sandstorm` | Sandstorm.io stuff
+`ai` | AI and Machine learning code
`client` | Imports things and starts the React app.
-`imports` | API, UI, and thing examples live here
-`packages` | Grow.js and Thing.js live here.
+`docs` | Project documentation
+`imports` | API, App, and thing web component examples live here
+`packages` | Grow.js, Thing.js, and other standalone packages live here.
`public` | Fonts and other static, public assets live here.
`tests` | Unit and Thread conformance tests
`server` | Imports the server code.
-`tests` | Hmmm....
+`test` | Tests
Our [wiki](https://github.com/CommonGarden/Grow-IoT/wiki) also contains a growing assortment of useful info, including:
* [Cloud setup](https://github.com/CommonGarden/Grow-IoT/wiki/Cloud-setup)
@@ -102,12 +102,11 @@ Our [wiki](https://github.com/CommonGarden/Grow-IoT/wiki) also contains a growin
## Roadmap
There's a lot to do.
-* [CoAP](https://github.com/CommonGarden/Grow-IoT/issues/300) (it's been started but not tested very well)
* [Graph-QL](https://github.com/CommonGarden/Grow-IoT/issues/315)
+* [MQTT](https://github.com/CommonGarden/Grow-IoT/issues/224)
* [User profiles](https://github.com/CommonGarden/Grow-IoT/issues/382)
-* Better data visualizations (timeseries without having to use grafana anyone?)
-* [Options to replace mongodb and influxdb](https://github.com/CommonGarden/Grow-IoT/issues/417).
-* [Logic ui](https://github.com/CommonGarden/Grow-IoT/issues/306) (a.k.a. advanced interoperablity) a.k.a. "Swarms"
+* [Camera](https://github.com/CommonGarden/Grow-IoT/issues/374)
+* [Image storage and retreival with IPFS](https://github.com/CommonGarden/Grow-IoT/issues/416)
* [Environments](https://github.com/CommonGarden/Grow-IoT/issues/311) (creating groups of things)
* [Administration and device management](https://github.com/CommonGarden/Grow-IoT/issues/370) (a green house or lab involves more than one user often)
@@ -117,6 +116,5 @@ There's a lot to do.
This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
-
## License
Grow-IoT is released under the 2-Clause BSD License, sometimes referred to as the "Simplified BSD License" or the "FreeBSD License".
diff --git a/ai/classifier/README.md b/ai/classifier/README.md
index 640b0b7..8ddad4f 100644
--- a/ai/classifier/README.md
+++ b/ai/classifier/README.md
@@ -1,8 +1,10 @@
-# opal
+# Image Classifier
A plant disease classifier
## Requirements
- [TensorFlow](https://www.tensorflow.org/install/)
+- [Matplotlib](https://matplotlib.org/)
+- [Pillow](https://pillow.readthedocs.io/en/5.0.0/)
### Installation (Mac)
diff --git a/ai/classifier/camera.py b/ai/classifier/camera.py
index 95d9459..c691baf 100644
--- a/ai/classifier/camera.py
+++ b/ai/classifier/camera.py
@@ -1,7 +1,8 @@
import picamera
+camera = picamera.PiCamera()
+
def capture(file_name='img.jpg'):
- camera = picamera.PiCamera()
camera.capture(file_name)
def capture_sequence(base_name='img'):
@@ -11,6 +12,6 @@ def capture_sequence(base_name='img'):
while True:
file_name = base_name + '_' + str(i) + '.jpg'
key = raw_input("Press Enter to take picture:")
- camera.capture(file_name=file_name)
+ capture(file_name=file_name)
print('Image ' + file_name + ' taken')
i += 1
diff --git a/ai/classifier/checkpoint b/ai/classifier/checkpoint
index 2ae7edc..0a7c9a6 100644
--- a/ai/classifier/checkpoint
+++ b/ai/classifier/checkpoint
@@ -1,2 +1,2 @@
-model_checkpoint_path: "pero-model"
-all_model_checkpoint_paths: "pero-model"
+model_checkpoint_path: "weed-model"
+all_model_checkpoint_paths: "weed-model"
diff --git a/ai/classifier/dataset.py b/ai/classifier/dataset.py
index e55469b..c766761 100644
--- a/ai/classifier/dataset.py
+++ b/ai/classifier/dataset.py
@@ -12,7 +12,7 @@ def load_train(train_path, image_size, classes):
cls = []
print('Going to read training images')
- for fields in classes:
+ for fields in classes:
index = classes.index(fields)
print('Now going to read {} files (Index: {})'.format(fields, index))
path = os.path.join(train_path, fields, '*g')
@@ -83,7 +83,6 @@ def next_batch(self, batch_size):
self._epochs_done += 1
start = 0
self._index_in_epoch = batch_size
-
assert batch_size <= self._num_examples
end = self._index_in_epoch
@@ -96,7 +95,7 @@ class DataSets(object):
data_sets = DataSets()
images, labels, img_names, cls = load_train(train_path, image_size, classes)
- images, labels, img_names, cls = shuffle(images, labels, img_names, cls)
+ images, labels, img_names, cls = shuffle(images, labels, img_names, cls)
if isinstance(validation_size, float):
validation_size = int(validation_size * images.shape[0])
@@ -115,3 +114,5 @@ class DataSets(object):
data_sets.valid = DataSet(validation_images, validation_labels, validation_img_names, validation_cls)
return data_sets
+
+
diff --git a/ai/classifier/demo.py b/ai/classifier/demo.py
deleted file mode 100644
index 71c2641..0000000
--- a/ai/classifier/demo.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-
-import sys, getopt
-
-import tensorflow as tf
-from model import Model
-#import cv2
-import matplotlib.image as mpimg
-
-graph_path = 'pero-model.meta'
-checkpoints_path = './'
-
-def run_demo():
- with tf.Session() as sess:
- nn = Model()
- nn.init(graph_path, checkpoints_path, sess)
- #image = cv2.imread(image_path)
- while True:
- image_path = raw_input("Image path:")
- image = mpimg.imread(image_path)
- bad, good = nn.predict(image)[0]
- print 'Bad', str(bad*100), '%'
- print 'Good', str(good*100), '%'
-
-def main(argv):
- inputfile = ''
- outputfile = ''
- # try:
- # opts, args = getopt.getopt(argv,"hi:o:",["ifile=","ofile="])
- # except getopt.GetoptError:
- # print 'test.py -i
+
+
+### Backers
+
+Thank you to all our backers! [[Become a backer](https://opencollective.com/Grow-IoT#backer)]
+
+
+
+
+### Sponsors
+
+Thank you to all our sponsors! (please ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/Grow-IoT#sponsor))
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/code-of-conduct.md b/docs/code-of-conduct.md
new file mode 100644
index 0000000..9537ae9
--- /dev/null
+++ b/docs/code-of-conduct.md
@@ -0,0 +1,26 @@
+The Common Garden community is made up of a mixture of professionals and volunteers from all over the world and across many different disciplines.
+
+Diversity is one of our huge strengths, but it can also lead to communication issues and unhappiness. To that end, we have a few ground rules that we ask people to adhere to when they are participating within this community and project. These rules apply equally to founders, mentors and those seeking help and guidance.
+
+This is not an exhaustive list of things that you cannot do. Rather, take it in the spirit in which it is intended – a guide to make it easier to enrich all of us and the technical communities in which we participate. Together with this code of conduct see also the [principles which guide us](Principles).
+
+This code of conduct applies to all spaces managed by the Common Garden project. This includes slack, the mailing lists, the issue tracker, our forum, and any other spaces created by the project developers which the community uses for communication.
+
+If you believe someone is violating the code of conduct, we ask that you report it by contacting a Common Garden team member.
+
+* **Be welcoming, friendly, and patient.**
+* **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we are a world-wide community, so you might not be communicating in someone else's primary language.
+* **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It is important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the Common Garden community should be respectful when dealing with other members as well as with people outside the Common Garden community.
+* **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior are not acceptable. This includes, but is not limited to:
+ * Violent threats or language directed against another person.
+ * Sexist, racist, or otherwise discriminatory jokes and language.
+ * Classist, elitist, intellectually orthodox, or otherwise oppressive language.
+ * Posting sexually explicit or violent material.
+ * Posting (or threatening to post) other people's personally identifying information ("doxing").
+ * Personal insults, especially those using racist, sexist, or otherwise oppressive terms.
+ * Unwelcome sexual attention.
+ * Advocating for, or encouraging, any of the above behavior.
+ * Repeated harassment of others. In general, if someone asks you to stop, then stop.
+* **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and Common Garden is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we are different. The strength of Common Garden comes from its varied community, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint does not mean that they are wrong. Do not forget that it is human to err and blaming each other does not get us anywhere, rather offer to help resolving issues and to help learn from mistakes.
+
+Original text courtesy of the [Django project](https://www.djangoproject.com/conduct/).
diff --git a/imports/api/Users/server/edit-profile.js b/imports/api/Users/server/edit-profile.js
new file mode 100644
index 0000000..e261a57
--- /dev/null
+++ b/imports/api/Users/server/edit-profile.js
@@ -0,0 +1,30 @@
+import { Meteor } from 'meteor/meteor';
+
+let action;
+
+const updateUser = (userId, { emailAddress, profile }) => {
+ try {
+ Meteor.users.update(userId, {
+ $set: {
+ 'emails.0.address': emailAddress,
+ profile,
+ },
+ });
+ } catch (exception) {
+ throw new Error(`[editProfile.updateUser] ${exception.message}`);
+ }
+};
+
+const editProfile = ({ userId, profile }, promise) => {
+ try {
+ action = promise;
+ updateUser(userId, profile);
+ action.resolve();
+ } catch (exception) {
+ action.reject(exception.message);
+ }
+};
+
+export default options =>
+ new Promise((resolve, reject) =>
+ editProfile(options, { resolve, reject }));
diff --git a/imports/api/Users/server/index.js b/imports/api/Users/server/index.js
new file mode 100644
index 0000000..ca4ae0d
--- /dev/null
+++ b/imports/api/Users/server/index.js
@@ -0,0 +1,4 @@
+import './edit-profile';
+import './methods';
+import './publications';
+// import './send-welcome-email';
diff --git a/imports/api/Users/server/methods.js b/imports/api/Users/server/methods.js
new file mode 100644
index 0000000..fdf6973
--- /dev/null
+++ b/imports/api/Users/server/methods.js
@@ -0,0 +1,37 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Accounts } from 'meteor/accounts-base';
+import editProfile from './edit-profile';
+// import rateLimit from '../../../modules/rate-limit';
+
+Meteor.methods({
+ 'users.sendVerificationEmail': function usersSendVerificationEmail() {
+ return Accounts.sendVerificationEmail(this.userId);
+ },
+ 'users.editProfile': function usersEditProfile(profile) {
+ check(profile, {
+ emailAddress: String,
+ profile: {
+ name: {
+ first: String,
+ last: String,
+ },
+ },
+ });
+
+ return editProfile({ userId: this.userId, profile })
+ .then(response => response)
+ .catch((exception) => {
+ throw new Meteor.Error('500', exception);
+ });
+ },
+});
+
+/*rateLimit({
+ methods: [
+ 'users.sendVerificationEmail',
+ 'users.editProfile',
+ ],
+ limit: 5,
+ timeRange: 1000,
+});*/
diff --git a/imports/api/Users/server/publications.js b/imports/api/Users/server/publications.js
new file mode 100644
index 0000000..7728b4b
--- /dev/null
+++ b/imports/api/Users/server/publications.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+
+Meteor.publish('users.editProfile', function usersProfile() {
+ return Meteor.users.find(this.userId, {
+ fields: {
+ emails: 1,
+ profile: 1,
+ services: 1,
+ },
+ });
+});
diff --git a/imports/api/Users/server/send-welcome-email.js b/imports/api/Users/server/send-welcome-email.js
new file mode 100644
index 0000000..fd89839
--- /dev/null
+++ b/imports/api/Users/server/send-welcome-email.js
@@ -0,0 +1,26 @@
+import { Meteor } from 'meteor/meteor';
+import sendEmail from '../../../modules/server/send-email';
+import getOAuthProfile from '../../../modules/get-oauth-profile';
+
+export default (options, user) => {
+ const OAuthProfile = getOAuthProfile(options, user);
+
+ const applicationName = 'Application Name';
+ const firstName = OAuthProfile ? OAuthProfile.name.first : options.profile.name.first;
+ const emailAddress = OAuthProfile ? OAuthProfile.email : options.email;
+
+ return sendEmail({
+ to: emailAddress,
+ from: `${applicationName} Camera
; + } +} diff --git a/imports/app/components/GrowFile.jsx b/imports/app/components/GrowFile.jsx index 04e6f89..205ddce 100644 --- a/imports/app/components/GrowFile.jsx +++ b/imports/app/components/GrowFile.jsx @@ -1,12 +1,11 @@ -// TODO: make a component for a grow-file. import React, { Component } from 'react'; import { Meteor } from 'meteor/meteor'; import { createContainer } from 'meteor/react-meteor-data'; import moment from 'moment'; import PropTypes from 'prop-types'; -// import Badge from 'material-ui/Badge'; +import Badge from 'material-ui/Badge'; import IconButton from 'material-ui/IconButton'; -// import NotificationsIcon from 'material-ui/svg-icons/social/notifications'; +import NotificationsIcon from 'material-ui/svg-icons/social/notifications'; import Subheader from 'material-ui/Subheader'; import IconMenu from 'material-ui/IconMenu'; import MenuItem from 'material-ui/MenuItem'; @@ -17,8 +16,6 @@ import StopIcon from 'material-ui/svg-icons/av/stop'; import SkipIcon from 'material-ui/svg-icons/av/skip-next'; import PreviousIcon from 'material-ui/svg-icons/av/skip-previous'; -// import WarningIcon from 'material-ui/svg-icons/alert/warning'; - export default class GrowFile extends Component { constructor(props) { super(props); @@ -64,9 +61,8 @@ export default class GrowFile extends Component { floatingLabelText="Growfile" id="Growfile" ref="Growfile" - // defaultValue={JSON.stringify(this.props.thing.properties.growfile, null, 2)} + defaultValue={JSON.stringify(this.props.growfile, null, 2)} multiLine={true} - // style={styles.oneHundred} rows={10} />