Skip to content

Commit

Permalink
read me updated (fossasia#1907)
Browse files Browse the repository at this point in the history
  • Loading branch information
neel1998 authored and makoteq committed Jan 16, 2020
1 parent 21b6906 commit 8fe7634
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ Please join us on the following channels:
</table>
<table>
<tr>
<td><img src="/docs/images/instrument_wavegenerator_view.png"></td>
<td><img src="/docs/images/instrument_logic_analyzer_view.png"></td>
<td><img src="/docs/images/instrument_wave_generator_analog.png"></td>
<td><img src="/docs/images/instrument_wave_generator_digital.png"></td>
</tr>
</table>
<table>
Expand All @@ -82,7 +82,8 @@ Please join us on the following channels:
</table>
<table>
<tr>
<td><img src="/docs/images/instrument_robotic_arm_view.png" width = "500"></td>
<td><img src="/docs/images/instrument_robotic_arm_view.png" width = "1000"/></td>
<td><img src="/docs/images/instrument_logic_analyzer_view.png"/></td>
</tr>
</table>

Expand All @@ -107,14 +108,23 @@ Please join us on the following channels:
| AcceleroMeter | Measures the acceleration of the device ||
| Gyro Meter | Measures the rate of rotation ||
| Compass | Measures the absolute rotation relative to earth magnetic poles ||
| Thermometer | Measures the ambient temperature | |
| Robotic Arm Controller | Allows to control 4 servo motors of the robotic arm | |
| Thermometer | Measures the ambient temperature | |
| Robotic Arm Controller | Allows to control 4 servo motors of the robotic arm independently| |
## How to set up the Android app in your development environment

Minimum Android version 5.0 (API Level 21)
Minimum Android version 6.0 (API Level 23)

Maximum Android version 8.1 (API Level 27)

### Application Flavors

There are 2 flavors (build variants) of PSLab Android application.

1. #### Play Store Flavor
- Play Store flavor uses Google Maps to display location stored in logs in Data logger.
2. #### Fdroid Flavors
- Fdroid flavor uses Open Street Maps to display location stored in logs in Data logger.

### Development Setup

Before you begin, you should already have the Android Studio SDK downloaded and set up correctly. You can find a guide on how to do this here: [Setting up Android Studio](http://developer.android.com/sdk/installing/index.html?pkg=studio)
Expand Down
Binary file added docs/images/instrument_wave_generator_analog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/instrument_wave_generator_digital.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/images/instrument_wavegenerator_view.png
Binary file not shown.

0 comments on commit 8fe7634

Please sign in to comment.