initial commit

docs/app-help/Channels-Oscilloscope.md

@@ -2,16 +2,35 @@
 title: Channels - Oscilloscope
 ---
 
-Tap the channel badge at the bottom of the screen to show the channel menu.
-From the menu the channel can be enabled/disabled and the channel voltage range(s) can be configured.   
+## Enabling/Disabling Channels
 
-Tapping and holding the channel badge will switch the channel on or off.
+Channels can be enabled/disabled (switched on or off) by tapping the channel badge and selecting the appropriate option from the popup menu. Alternatively, tapping and holding the channel badge will toggle its enabled state.
 
-If the Oscilloscope front end can measure voltage ranges different to the default 0-3.3V range of the Pico (eg if you have added a resistor divider in front of the ADC pin) then you
-will need to configure the channel as described [here](../wiki/Analog-Front-End) in order for Scoppy to display the correct voltage
-values.
+![](images/enable-channels.png)
 
-The probe attenuation value can also be configured. Tap the channel badge and select Settings and then Probe from the menu.
+![](images/both-channels-enabled.png)
+
+<br>
+
+> TIP. Tapping and holding the channel badge will switch the channel on or off.
+
+<br>
+
+## Probe attenuation
+
+The probe attenuation value can also be configured. Tap the channel badge and select _Settings_ and then _Probe_ from the menu.
+
+## Measurements > On-screen
+
+Select this from the popup menu to configure the on-screen measurements
+
+> TIP. Tapping the the on-screen measurements will display configuration screen for the measurements.
+
+## Measurements > Snapshot
+
+Select this from the popup menu to view the snapshot measurements
+
+> TIP. Long pressing the the on-screen measurements will display the snapshot measurements.
 
 <br>
 {% include see-also.md %}

docs/app-help/Upgrade-To-Premium.md

@@ -2,5 +2,11 @@
 title: Upgrade to Premium
 ---
 
+Some features of the Scoppy App require the premium upgrade to be purchased. This will also remove any advertising.
+
+To upgrade, tap the _Menu_ button and then tap _Upgrade to Premium_ and follow the instructions.
+
+If you don't see the _Upgrade to Premium_ button then you have already upgraded or you are using hardware that unlocks the premium features of the app. 
+
 <br>
 {% include see-also.md %}

docs/app-help/index.md

@@ -23,6 +23,7 @@ title: App Help Index
 * [Scoppy Firmware Settings](../app-help/Firmware-Settings)
 * [Voltage Ranges](../app-help/Voltage-Ranges)
 * [RP2040 Settings (incl. max sample rate)](../app-help/rp2040-settings)
+* [Premium Upgrade](Upgrade-To-Premium)
 * [Release Notes](../wiki/ReleaseNotes)
 
 <br>

docs/dso-500k.md

@@ -7,11 +7,6 @@ title: DSO-500K operating instructions
 ### Install the Scoppy Android App
 Install the [Scoppy Android app](https://play.google.com/store/apps/details?id=xyz.fhdm.scoppy) from the Play Store.
 
-If you purchased your DSO-500K before June 13, 2023 you should have received a code and instructions to upgrade to the premium version of the app.
-
-For boards purchased after Jun 13 2023 (these boards have DSO-500K-P printed on the back), the premium features of the app will be unlocked automatically 
-and upgrading to the premium version of the Scoppy app is not required.
-
 ### Connecting to your Phone/Tablet
 
 The DSO-500K can communicate with your Android phone/tablet over Wi-Fi or via USB. We recommended connecting via USB first and then configuring the Wi-Fi connection.

docs/wiki/Analog-Front-End.md

@@ -26,7 +26,7 @@ To measure different voltage ranges (eg. -5V to +5V or 0V to 0.1V etc) than the
 You will need to design your analog front-end so that it either:
 * allows selection of the voltage range by the user (eg. using a mechanical switch). The front end will also need to set the appropriate values at the voltage range pins of the Pico so that the firmware and app know which voltage range is currently selected
 * OR
-* reads the values of the voltage range pins and sets the range of the front-end accordingly (eg. via an analog switch such as a CD4052)
+* reads the values of the voltage range pins and sets the range of the front-end accordingly (eg. via an analog switch such as a CD4052). The values of the voltage range pins will be set by the firmware according to the current Volts/Div setting in the app.
 
 If using the latter method, you will need to configure the _Auto Voltage Range Pins_ setting to the appropriate value (see below).
 
@@ -93,7 +93,7 @@ level combinations at the pins.
 
 Note:
 * bit 2 is disabled by default.
-* each voltage range GPIO configured as an input is pulled low. If you connect nothing to these pins then range 0 is selected.
+* each voltage range GPIO that is configured as an input is pulled low. If you connect nothing to these pins then range 0 is selected.
 
 
 | GPIO 2 (CH1 bit 1)| GPIO 3 (CH1 bit 0)| CH 1 Voltage Range ID|

docs/wiki/Installation-&-Getting-Started.md

@@ -21,12 +21,32 @@ Communication between the firmware on the Pico (or Pico W) and app on the phone/
 
 #### a. USB
 
+Open the app and look at the connection badge at the lower left of the app screen and check that the connection type is set to USB. If it isn't USB, tap the badge and then tap 'Change connection type' from the menu and then select USB.
+
+![](img/app/usb-connection-type-disconnected.png)
+
 Attach the small end of the OTG cable/adapter to the USB input of the Android device (do NOT plug it into the USB socket of the Pico!). Then use a USB cable to connect the OTG cable/adapter to the Pico (or Pico W). You should see the status LED on the Pico start blinking. 
 
-Once you open the app and a connection is established between the Pico and the Scoppy app the onboard LED should stop blinking. You may need to tap the 'Run' button in the app if the scope is currently stopped (Scoppy will either be RUNNING or STOPPED. This status is displayed at the top right of the grid).
+Android will now probably ask permission for the Scoppy app to access USB. Tap Yes/OK.
+
+Once a connection is established between the Pico and the Scoppy app the onboard LED should stop blinking. You may need to tap the 'Run' button in the app if the scope is currently stopped (Scoppy will either be RUNNING or STOPPED. This status is displayed at the top right of the grid).
+
+The connection badge should now display 'USB OK'
+
+![](img/app/usb-ok.png)
+
+<br>
 
 Please note that if you are using a Pico W and a connection over USB hasn’t been established within 10 seconds the Pico W will start listening to connections over Wi-Fi. To try connecting via USB again the Pico W will need to be restarted.
 
+__USB connection troubleshooting__
+
+If a connection cannot be established over USB then check the following:
+* Make sure the OTG adapter is plugged into the Android device and not the Oscilloscope. If using a Micro-USB adaptor it is possible to get this the wrong way around.
+* Do not use other adapters between the Android device and oscilloscope. For example, using a Type-C to Micro USB adapter between the OTG adapter and phone will prevent
+a connection being established.
+* Ensure the correct firmware has been installed. You can do this by repeating steps 2 and 3.
+
 #### b. Wi-Fi (Pico W)
 
 Please see [Getting started with Scoppy and the Pico W](./Getting-started-with-the-Pico-W). Once connected, continue to Step 5 below.

docs/wiki/firmware-versions.md

@@ -2,7 +2,24 @@
 title: Firmware downloads
 ---
 
-Download the firmware by selecting one of the following links.
+### Download the firmware by selecting one of the following links.
+
+Pico: [scoppy-pico-v18.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v18/scoppy-pico-v18.uf2)
+<br>
+Pico W: [scoppy-picow-v18.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v18/scoppy-picow-v18.uf2)
+
+If you have an [FHDM FSCOPE-500K](https://store.fhdm.xyz/fscope-500k) board then you will need to use one of these:
+<br>
+FSCOPE with Pico: [scoppy-fscope-500k-pico-v18.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v18/scoppy-fscope-500k-pico-v18.uf2)
+<br>
+FSCOPE with Pico W: [scoppy-fscope-500k-picow-v18.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v18/scoppy-fscope-500k-picow-v18.uf2)
+
+If you have an [FHDM DSO-500K](https://store.fhdm.xyz/dso-500k) then you will need this:
+[scoppy-dso-500k-p-v18.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v18/scoppy-dso-500k-p-v18.uf2)
+
+<small>Note.  Different firmware is available for the Pico and Pico W. The Pico firmware is not compatible with the Pico W and vice versa.</small>
+
+### Previous version (v17)
 
 Pico: [scoppy-pico-v17.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v17/scoppy-pico-v17.uf2)
 <br>
@@ -15,9 +32,6 @@ FSCOPE with Pico: [scoppy-fscope-500k-pico-v17.uf2](https://github.com/fhdm-dev/
 FSCOPE with Pico W: [scoppy-fscope-500k-picow-v17.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v17/scoppy-fscope-500k-picow-v17.uf2)
 
 If you have an [FHDM DSO-500K](https://store.fhdm.xyz/dso-500k) then you will need this:
-[scoppy-dso-500k-p-v17.uf2](https://github.com/fhdm-dev/scpdl1/raw/master/a/v17/scoppy-dso-500k-p-v17.uf2)
-
-<small>Note.  Different firmware is available for the Pico and Pico W. The Pico firmware is not compatible with the Pico W and vice versa.</small>
 
 <br>
 {% include see-also.md %}