Skip to content

merge from development #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 16, 2016
Merged

merge from development #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0df330b
Update README.md
wavicles Aug 12, 2016
80a6056
Update Makefile
wavicles Aug 12, 2016
a200f43
Merge pull request #26 from wavicles/master
wavicles Aug 12, 2016
30e1b85
Update README.md
mariobehling Aug 15, 2016
6765a06
Corrected travis badge
mariobehling Aug 15, 2016
ebaeb0b
Added Slack Channel
mariobehling Aug 15, 2016
9242f46
Update .travis.yml
mariobehling Aug 15, 2016
a00c0b9
Merge pull request #6 from fossasia/development
wavicles Aug 15, 2016
e9fa762
Merge pull request #27 from wavicles/master
wavicles Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ python:
#install: "pip install -r requirements.txt"
# command to run tests
script: nosetests

notifications:
slack: fossasia:bqOzo4C9y6oI6dTF8kO8zdxp
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ install:
mkdir -p $(DESTDIR)/lib/udev/rules.d
install -m 644 99-pslab.rules $(DESTDIR)/lib/udev/rules.d/99-pslab
# fix a few permissions
find $(DESTDIR)/usr/share/pslab/psl_res -name auto.sh -exec chmod -x {} \;
#find $(DESTDIR)/usr/share/pslab/psl_res -name auto.sh -exec chmod -x {} \;
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@

The Pocket Science Lab from FOSSASIA <http://pslab.fossasia.org>

[![Build Status](https://travis-ci.org/fossasia/pslab.svg?branch=development)](https://travis-ci.org/fossasia/pslab)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ce4af216571846308f66da4b7f26efc7)](https://www.codacy.com/app/mb/pslab?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fossasia/pslab&amp;utm_campaign=Badge_Grade)

This repository hosts the python library for communicating with PSLab. This can be installed on a linux pc/raspberry pi. With this, one can communicate with the hardware using simple python code.


* The project is inspired from ExpEYES http://expeyes.in
* FOSSASIA is supporting development and promotion of ExpEYES project since 2014 mainly through Google Summer of Code
* The current work is a part of my GSoC-16 project

##Communication
Chat: [Pocket Science Slack Channel](http://fossasia.slack.com/messages/pocketscience/) | [Get an Invite](http://fossasia-slack.herokuapp.com/)

----------------

Installation
Expand All @@ -30,7 +36,7 @@ To install PSLab on Debian based Gnu/Linux system, the following dependencies mu
#####Now clone both the repositories [pslab-apps](https://github.com/fossasia/pslab-apps) and [pslab](https://github.com/fossasia/pslab).


#####Libraries must be installed in the following order
#####Libraries must be installed in ~~the following~~ any order

1. pslab-apps
2. pslab
Expand Down