Skip to content

chore: merge development branch with master branch #118

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 78 commits into from
Jun 8, 2020
Merged

chore: merge development branch with master branch #118

Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
f2309c4
Add files via upload
wavicles Nov 1, 2016
36cd10b
Fix #36 added steps to build documentation and modified PSL.SENSORS.r…
viveksb007 Mar 20, 2017
88998c7
Update README.md
wavicles Mar 21, 2017
28d9748
resolved conflicts
viveksb007 Mar 21, 2017
06d3ce1
Merge pull request #38 from viveksb007/development
mariobehling Mar 21, 2017
f4860b2
Fix #39 removed some existing bugs and reformatted code acc to pep8 s…
viveksb007 Mar 25, 2017
c1ed400
Fixes #42 Deleted not required files
viveksb007 Apr 9, 2017
2f1f36e
updated readme
viveksb007 Apr 9, 2017
3f018a5
Fixes #42 deleted not required files and updated readme (#44)
viveksb007 Apr 10, 2017
0a017ca
Add support for ADS1115 16-bit ADC
jithinbp Apr 14, 2017
cecbc87
Add support for ADS1115 16-bit ADC (#46)
jithinbp Apr 14, 2017
764532f
Updated TSL2561.py
akarshan96 Apr 15, 2017
e86be68
added reference for values and fixed some warnings
viveksb007 Apr 18, 2017
ee92d0d
modified connectToPort to prevent crash in Windows and OSX
viveksb007 Apr 18, 2017
83710f4
Merge pull request #47 from akarshan96/branch-1
mariobehling Apr 18, 2017
2cddcf2
Merge pull request #51 from viveksb007/development
mariobehling Apr 18, 2017
acf4720
Merge branch 'development' of https://github.com/fossasia/pslab-pytho…
jithinbp Apr 30, 2017
8f12c9e
modify Params dict in MPU6050.py as an example for improving sensor M…
jithinbp Apr 30, 2017
69da398
MPU6050.py : remove powerUp function's argument
jithinbp Apr 30, 2017
9b0f57b
MPU6050.py : Kalman Filtering's options defined in a dictionary element
jithinbp Apr 30, 2017
3e799a1
Modified Params dictionary in all Sensor files
jithinbp Apr 30, 2017
f05e3c8
Convert I2C sensor oscilloscope into non-blocking method
jithinbp May 6, 2017
d0dec8f
add support library for MPU925x 10-DOF IMU sensor
jithinbp May 6, 2017
c8dde2d
Convert I2C sensor oscilloscope into non-blocking method
jithinbp May 6, 2017
acf6c6a
add support library for MPU925x 10-DOF IMU sensor
jithinbp May 6, 2017
2c41fe7
Merge branch 'development' of https://github.com/jithinbp/pslab-pytho…
jithinbp May 7, 2017
d2ec0d6
Update README.md
mariobehling May 8, 2017
fcf6a0d
Improved auto-generated menus in graphical apps. Modified MPU6050.py.…
jithinbp May 8, 2017
7df2c3f
added support for SX1276 LoRa module
jithinbp Jun 3, 2017
ad2f4eb
tested LoRa modules up to 500metres
jithinbp Jun 5, 2017
fff2fa2
Added a transaction function to sciencelab.SPI . made code edits base…
jithinbp Jun 8, 2017
97d4fa8
resolve merge conflicts
jithinbp Jun 8, 2017
2e6c264
further changes based on Codacy recommendations
jithinbp Jun 8, 2017
fcf6357
Merge pull request #63 from jithinbp/development
jithinbp Jun 8, 2017
d871361
remove deprecated function sciencelab.setOnboardLed
jithinbp Jun 8, 2017
8e66c74
Merge branch 'development' of https://github.com/fossasia/pslab-pytho…
jithinbp Jun 8, 2017
4c7fedd
Merge pull request #65 from jithinbp/development
jithinbp Jun 9, 2017
44d5619
rewrite sciencelab.I2C.capture
jithinbp Jun 10, 2017
3ffc54e
Merge pull request #67 from jithinbp/development
jithinbp Jun 10, 2017
f30396a
fixed undefined references in SENSORS/MF522.py . fixes #54
jithinbp Jun 12, 2017
760563b
Merge pull request #68 from jithinbp/development
jithinbp Jun 12, 2017
c2f331b
removed explicit reference to Python3 in Makefile
jithinbp Jun 12, 2017
6672626
Merge pull request #69 from jithinbp/development
jithinbp Jun 12, 2017
2db8949
bug fix in setup.py . undefined reference to "root"
jithinbp Jun 12, 2017
3214ac4
bug fix in setup.py . undefined reference to "root" (#70)
jithinbp Jun 13, 2017
bddac55
bug fix in setup.py . undefined reference to "root"
jithinbp Jun 13, 2017
8bc85f9
merge conflicts
jithinbp Jun 13, 2017
4a8eade
Merge pull request #71 from jithinbp/development
jithinbp Jun 16, 2017
483ed32
Fixes #74: Device support for old and new PSLabs
CloudyPadmal Mar 15, 2018
aa3e6e2
Merge pull request #75 from CloudyPadmal/development
CloudyPadmal Apr 9, 2018
854a8a3
docs: updated links (#77)
CloudyPadmal Oct 14, 2018
158c4bf
Create README.md (#81)
IgorWilbert Oct 21, 2018
bcb2c45
Travis CI: Remove EOLed versions of Python
Oct 25, 2018
dc1c796
Use print() function in both Python 2 and Python 3 (#82)
Nov 11, 2018
78ac311
Merge pull request #84 from cclauss/patch-2
cweitat Dec 29, 2018
80c0dfd
Fix broken initialization on Python 3 (#85)
cynddl Dec 30, 2018
657eda5
Update README.md
mariobehling Jan 31, 2019
fc0ae94
fix: python3 compatible
CloudyPadmal Mar 11, 2019
83aca5c
Merge pull request #86 from CloudyPadmal/python3Compatible
cweitat Mar 12, 2019
24c57a0
Add documentation to Fix permission for make file #88 (#89)
fragm3 Apr 17, 2019
4dab77e
feat: compatibility with Windows (#92)
CloudyPadmal May 8, 2019
1c554a9
Document the PSL Python Library #78 (#90)
fragm3 May 11, 2019
9dcb863
Reformat code and Upgraded Travis + Makefile (#95)
CloudyPadmal May 13, 2019
9f1fea6
Update README.md
mariobehling May 13, 2019
93e0a8c
feat: upgrade makefile to cleanup old libs (#96)
CloudyPadmal May 14, 2019
2744a67
chore: updated makefile with fullcleanup task (#98)
CloudyPadmal May 14, 2019
dd1f8d9
convert byte to int for python3+ (#103)
Pipe-Runner Jul 9, 2019
29db0e1
type casting bytes to int from float
Pipe-Runner Jul 10, 2019
d1e2321
[#105] byte type cast (#106)
Pipe-Runner Jul 28, 2019
d362413
bug in I2C readBulk function fixed (#108)
neel1998 Aug 5, 2019
d0e5af7
Update README.md
mariobehling Aug 26, 2019
164fce6
Update README.md
mariobehling Aug 26, 2019
f123847
Update README.md
mariobehling Aug 27, 2019
7b8eb57
type-error-resolved (#109)
bhadreshpsavani Nov 2, 2019
767a04a
added t and v (#113)
bhadreshpsavani Nov 5, 2019
f68fc60
Add Sensor Names (#111)
bhadreshpsavani Nov 5, 2019
a74d48f
Travis CI add Python 3.7, 3.8 find undefined names (#112)
cclauss Nov 8, 2019
5c03e23
Handle conflict in namespace 'serial' (#114)
bessman Jun 7, 2020
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
Prev Previous commit
Next Next commit
Update README.md
  • Loading branch information
@wavicles
wavicles authored Mar 21, 2017
commit 88998c7538676aa3a9c12d45d0eed783c811f980
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This repository hosts the python library for communicating with PSLab. This can
* 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
## Communication
Chat: [Pocket Science Slack Channel](http://fossasia.slack.com/messages/pocketscience/) | [Get an Invite](http://fossasia-slack.herokuapp.com/)

----------------
Expand All @@ -22,7 +22,7 @@ Installation

To install PSLab on Debian based Gnu/Linux system, the following dependencies must be installed.

####Dependencies
#### Dependencies

* PyQt 4.7+, PySide, or PyQt5
* python 2.6, 2.7, or 3.x
Expand All @@ -33,10 +33,10 @@ To install PSLab on Debian based Gnu/Linux system, the following dependencies mu
* iPython-qtconsole   #optional


#####Now clone both the repositories [pslab-apps](https://github.com/fossasia/pslab-apps) and [pslab](https://github.com/fossasia/pslab).
##### 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~~ any order
##### Libraries must be installed in ~~the following~~ any order

1. pslab-apps
2. pslab
Expand All @@ -45,7 +45,7 @@ To install PSLab on Debian based Gnu/Linux system, the following dependencies mu
*If user is only interested in using PSLab as an acquisition device without a display/GUI, only one repository [pslab](https://github.com/fossasia/pslab) needs to be installed*


#####To install, cd into the directories
##### To install, cd into the directories

`$ cd <SOURCE_DIR>`

Expand All @@ -65,7 +65,7 @@ For the main GUI (Control panel), you can run Experiments from the terminal.

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

####Development Environment
#### Development Environment

To set up the development environment, install the packages mentioned in dependencies. For building GUI's Qt Designer is used.

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy