Skip to content

Commit

Permalink
readme updated (fossasia#1958)
Browse files Browse the repository at this point in the history
  • Loading branch information
neel1998 authored and mariobehling committed Aug 28, 2019
1 parent 8b69f3e commit 57a2e83
Show file tree
Hide file tree
Showing 35 changed files with 12 additions and 16 deletions.
28 changes: 12 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Repository for the PSLab Android App for performing experiments with the [Pocket

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

<a href="https://play.google.com/store/apps/details?id=io.pslab"><img alt="Get it on Google Play" height="80" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"></a>
<a href="https://f-droid.org/app/io.pslab"><img alt="Get it on F-Droid" height="80" src="https://f-droid.org/badge/get-it-on.png"></a>
<a href="https://play.google.com/store/apps/details?id=io.pslab"><img alt="Get it on Google Play" height="80" src="/docs/images/playstore_badge.png"></a>
<a href="https://f-droid.org/app/io.pslab"><img alt="Get it on F-Droid" height="80" src="/docs/images/fdroid_badge.png"></a>

## Buy

Expand All @@ -36,9 +36,9 @@ This repository holds the Android App for performing experiments with [PSLab](ht
<table>
<tr>
<td><img src="/docs/images/view_device_not_found.png"></td>
<td><img src="/docs/images/view_initialization.png"></td>
<td><img src="/docs/images/view_home_screen.png"></td>
<td><img src="/docs/images/view_instrument_panel.png"></td>
<td><img src="/docs/images/view_about_us.png"></td>
</tr>
</table>
<table>
Expand All @@ -49,36 +49,32 @@ This repository holds the Android App for performing experiments with [PSLab](ht
</table>
<table>
<tr>
<td><img src="/docs/images/view_about_us.png"></td>
<td><img src="/docs/images/view_not_connected_nav_menu.png" width = "500"></td>
<td><img src="/docs/images/view_pin_layout_front.png"></td>
<td><img src="/docs/images/view_pin_layout_back.png"></td>
<td><img src="/docs/images/view_side_navigation_drawer.png"></td>
<td><img src="/docs/images/instrument_luxmeter_guide.png"></td>
</tr>
</table>
<table>
<tr>
<td><img src="/docs/images/instrument_oscilloscope_channelparam.png"></td>
<td><img src="/docs/images/instrument_oscilloscope_audiojack.png"></td>
<td><img src="/docs/images/instrument_oscilloscope_channel_view.png"></td>
<td><img src="/docs/images/instrument_oscilloscope_audiojack_view.png"></td>
</tr>
</table>
<table>
<tr>
<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>
<tr>
<td><img src="/docs/images/instrument_power_source_view.png"></td>
<td><img src="/docs/images/instrument_luxmeter_guide.png"></td>
<td><img src="/docs/images/instrument_multimeter_view.png"></td>
<td><img src="/docs/images/instrument_multi_meter_view.png"></td>
</tr>
</table>
<table>
<tr>
<td><img src="/docs/images/instrument_barometer_view.png"></td>
<td><img src="/docs/images/view_log_map_location.png"></td>
<td><img src="/docs/images/view_data_logger.png"></td>
<td><img src="/docs/images/view_create_config_file.png"></td>
</tr>
</table>
<table>
Expand All @@ -91,8 +87,8 @@ This repository holds the Android App for performing experiments with [PSLab](ht
</table>
<table>
<tr>
<td><img src="/docs/images/instrument_robotic_arm_view.png" width = "1000"/></td>
<td><img src="/docs/images/instrument_logic_analyzer_view.png"/></td>
<td><img src="/docs/images/instrument_robotic_arm_controller_view.png" width = "500"/></td>
<td><img src="/docs/images/instrument_logical_analyzer_view.png" width = "500"/></td>
</tr>
</table>

Expand Down Expand Up @@ -254,7 +250,7 @@ The project is maintained by
- Lorenz Gerber ([@lorenzgerber](https://github.com/lorenzgerber))
- Wei Tat ([@cweitat](https://github.com/cweitat))
- Wai Gie ([@woshikie](https://github.com/woshikie))

- Neel Trivedi ([@neel1998](https://github.com/neel1998))
## Alumni
- Praveen Patil ([@wavicles](https://github.com/wavicles))
- Jithin ([@jithinbp](https://github.com/jithinbp))
Expand Down
Binary file added docs/images/fdroid_badge.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 modified docs/images/instrument_accelerometer_view.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 modified docs/images/instrument_barometer_view.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/instrument_compass_view.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 modified docs/images/instrument_gyro_view.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 modified docs/images/instrument_logic_analyzer_guide.png
100644 → 100755
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_logic_analyzer_view.png
Binary file not shown.
Binary file added docs/images/instrument_logical_analyzer_view.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 modified docs/images/instrument_luxmeter_guide.png
100644 → 100755
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_multi_meter_view.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_multimeter_view.png
Binary file not shown.
Binary file removed docs/images/instrument_oscilloscope_audiojack.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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_oscilloscope_channelparam.png
Binary file not shown.
Binary file modified docs/images/instrument_oscilloscope_guide.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/instrument_power_source_view.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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_robotic_arm_view.png
Binary file not shown.
Binary file modified docs/images/instrument_thermo_view.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 modified docs/images/instrument_wave_generator_analog.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/instrument_wave_generator_digital.png
100644 → 100755
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/playstore_badge.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 modified docs/images/view_about_us.png
100644 → 100755
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/view_create_config_file.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 modified docs/images/view_data_logger.png
100644 → 100755
Binary file modified docs/images/view_device_not_found.png
100644 → 100755
Binary file modified docs/images/view_home_screen.png
100644 → 100755
Binary file modified docs/images/view_instrument_panel.png
100644 → 100755
Binary file modified docs/images/view_log_map_location.png
100644 → 100755
Binary file removed docs/images/view_navigation_drawer.png
Diff not rendered.
Binary file modified docs/images/view_pin_layout_back.png
100644 → 100755
Binary file modified docs/images/view_pin_layout_front.png
100644 → 100755
Binary file added docs/images/view_side_navigation_drawer.png

0 comments on commit 57a2e83

Please sign in to comment.