Skip to content
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.

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

Updated Documentation of README.md #2113

Merged
merged 3 commits into from
May 22, 2020

Conversation

Shivam7-1
Copy link
Contributor

Changes: Updated Documentation of README.md

Checklist: [Please tick following check boxes with [x] if the respective task is completed]

  • I have used resources from strings.xml, dimens.xml and colors.xml without hard-coding them
  • No modifications done at the end of resource files strings.xml, dimens.xml or colors.xml
  • I have reformatted code in every file included in this PR [CTRL+ALT+L]
  • My code does not contain any extra lines or extra spaces
  • I have requested reviews from other members

README.md Outdated
@@ -11,7 +11,7 @@ Repository for the PSLab Android App for performing experiments with the [Pocket
[![Gitter](https://badges.gitter.im/fossasia/pslab.svg)](https://gitter.im/fossasia/pslab?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Twitter Follow](https://img.shields.io/twitter/follow/pslabio.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/pslabio)

This repository holds the Android App for performing experiments with [PSLab](https://pslab.io/). PSLab is a tiny pocket science lab that provides an array of equipment for doing science and engineering experiments. It can function like an oscilloscope, waveform generator, frequency counter, programmable voltage and current source and also as a data logger. Our website is at https://pslab.io
This repository holds the Android App for performing experiments with [PSLab](https://pslab.io/). PSLab is a tiny pocket science lab that provides an array of equipment for doing science and engineering experiments. It can function like an oscilloscope, waveform generator, frequency counter, gyroscope, compass, programmable voltage and current source and also as a data logger. Our website is at https://pslab.io
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here it's talking about the PSLab device; not the app.

@Shivam7-1 Shivam7-1 requested a review from CloudyPadmal May 18, 2020 12:07
@CloudyPadmal
Copy link
Collaborator

@Shivam7-1 please squash the commits into one

@Shivam7-1
Copy link
Contributor Author

How to squash commits in windows

@CloudyPadmal
Copy link
Collaborator

Instructions are mentioned in the readme file

@@ -199,7 +199,7 @@ To use PSLab device with Android, you simply need an OTG cable, an Android Devic

Please help us follow the best practice to make it easy for the reviewer as well as the contributor. We want to focus on the code quality more than on managing pull request ethics.

* Single commit per pull request
* Single commit per pull request.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, you have made an edit here. But didn't follow it..

@Shivam7-1
Copy link
Contributor Author

I am Unable to squash all commit can you tell how to squash

@CloudyPadmal CloudyPadmal merged commit c91954f into fossasia:development May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants