Skip to content

Commit a1a5d95

Browse files
neel1998CloudyPadmal
authored andcommitted
read me updated (#1907)
1 parent 2b9282f commit a1a5d95

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Please join us on the following channels:
5454
</table>
5555
<table>
5656
<tr>
57-
<td><img src="/docs/images/instrument_wavegenerator_view.png"></td>
58-
<td><img src="/docs/images/instrument_logic_analyzer_view.png"></td>
57+
<td><img src="/docs/images/instrument_wave_generator_analog.png"></td>
58+
<td><img src="/docs/images/instrument_wave_generator_digital.png"></td>
5959
</tr>
6060
</table>
6161
<table>
@@ -82,7 +82,8 @@ Please join us on the following channels:
8282
</table>
8383
<table>
8484
<tr>
85-
<td><img src="/docs/images/instrument_robotic_arm_view.png" width = "500"></td>
85+
<td><img src="/docs/images/instrument_robotic_arm_view.png" width = "1000"/></td>
86+
<td><img src="/docs/images/instrument_logic_analyzer_view.png"/></td>
8687
</tr>
8788
</table>
8889

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

114-
Minimum Android version 5.0 (API Level 21)
115+
Minimum Android version 6.0 (API Level 23)
115116

116117
Maximum Android version 8.1 (API Level 27)
117118

119+
### Application Flavors
120+
121+
There are 2 flavors (build variants) of PSLab Android application.
122+
123+
1. #### Play Store Flavor
124+
- Play Store flavor uses Google Maps to display location stored in logs in Data logger.
125+
2. #### Fdroid Flavors
126+
- Fdroid flavor uses Open Street Maps to display location stored in logs in Data logger.
127+
118128
### Development Setup
119129

120130
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)
67.4 KB
Loading
68.3 KB
Loading
-91.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)