Merge pull request #52 from apt105/Small-edits

Small edits

README.md

@@ -33,85 +33,8 @@
 
 ## What is Meshtastic?
 
-<table>
-<tr>
-<td>
-<p>
 Meshtastic® is a project that lets you use inexpensive GPS mesh radios as an extensible, super long battery life mesh GPS communicator. These radios are great for hiking, skiing, paragliding - essentially any hobby where you don't have reliable internet access. Each member of your private mesh can always see the location and distance of all other members and any text messages sent to your group chat.
-</p>
+
-<p>
 The radios automatically create a mesh to forward packets as needed, so everyone in the group can receive messages from even the furthest member. The radios will optionally work with your phone, but no phone is required.
-</p>
-</td>
-</tr>
-</table>
-## Getting started
 
-###### Description, should mention:
+Please see our [website](https://meshtastic.org) for more information about Meshtastic.
-
-You will require atleast one of [these](https://github.com/meshtastic/meshtastic-device#supported-hardware) devices
-
-- Link to device compatability table on `meshtastic/meshtastic-device`
-- Link to flashing instructions
-
-## Community
-
-###### Description, should mention:
-
-- Discussions tab: https://github.com/meshtastic/Meshtastic/discussions
-- Forum
-- Slack
-- unofficial/international communities
-- Maybe have an `awesome-meshtastic` page, have all of the apps and extensions ppl have made
-
-## Software
-
-###### Description
-
-#### Meshtastic App
-
-<table>
-<tr>
-<td>
-<p>
-The official Meshtastic Android app, It provides messaging, channel configuration and a real time map. It also has inbuilt functionality for updating device firmware over Bluetooth
-</p>
-</td>
-</tr>
-</table>
-
-#### Meshtastic Device
-
-<table>
-<tr>
-<td>
-<p>
-The paramount Meshtastic project, the device firmware itself. Runs on supported hardware that allows the creation of mesh networks at any scale
-</p>
-</td>
-</tr>
-</table>
-
-#### Meshtastic.js
-
-<table>
-<tr>
-<td>
-<p>
-TypeScript library for interfacting with Meshtastic 
-</p>
-</td>
-</tr>
-</table>
-
-#### Meshtastic-python
-
-<table>
-<tr>
-<td>
-<p>
-Description about product
-</p>
-</td>
-</tr>
-</table>

website/docs/hardware/buttons.md

@@ -0,0 +1,14 @@
+---
+id: buttons
+title: Modifying devices to add buttons
+sidebar_label: Adding buttons
+---
+
+Many of the TTGO Lora32 devices do not have a progam button to navigate the displayed pages. It is possible to add a button to the following device:
+
+## TTGO Lora32 V2.1-1.6
+
+Shorting IO12 to ground will progress the screen pages, wake up the device, etc. A simple push switch can be added for this purpose.
+
+[<img src="/img/hardware/lora32-v2-1.6-button.jpg" style={{zoom:'30%'}} />](/img/hardware/lora32-v2-1.6-button.jpg)
+

website/docs/hardware/rak4631.md

@@ -26,5 +26,6 @@ There is currently fledgling support for the WisBlock RAK4631 module. The WisBlo
 * Firmware file: `firmware-rak4631-1.x.x.uf2`
 * [Purchase Link](https://docs.rakwireless.com/Product-Categories/WisBlock/RAK4631/Overview)
 * [Installation instructions](https://docs.rakwireless.com/Product-Categories/WisBlock/RAK4631/Quickstart/#rak4631-lora-mesh-via-meshtastic)
+* Dont forget to [update the bootloader](https://docs.rakwireless.com/Product-Categories/WisBlock/RAK4631/Quickstart/#updating-the-bootloader) first!
 
 <img alt="RAK4631 Core Module" src="/img/hardware/rak4631.png" style={{zoom:'50%'}} />

website/docs/software/android/installation.md

@@ -3,12 +3,16 @@ id: android-installation
 title: Android application installation
 sidebar_label: Installation
 ---
-Our Android application is available to download on Google Play.
+~~Our Android application is available to download on Google Play.~~ Our Google Play listing has been removed by google due to a recent policy change by them with respect to the background location accesss (which our app needs). We've started the '[appeal](/docs/software/android/location-access)' process, but for now you'll need to get the app from other places.
 
-<p align="center"><a href="https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source%3Dgithub-homepage"><img alt="Download at https://play.google.com/store/apps/details?id=com.geeksville.mesh" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" style={{zoom:'35%'}} /></a></p>
+The app is also available on the Amazon [Appstore](https://www.amazon.com/Geeksville-Industries-Meshtastic/dp/B08CY9394Q). You will need to install the Amazon Appstore onto your phone in order to install the Meshtastic application.
+
+<p align="center"><a href="https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source%3Dgithub-homepage"><img alt="Download at https://play.google.com/store/apps/details?id=com.geeksville.mesh" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" style={{zoom:'35%'}} /></a>      <a href="https://www.amazon.com/Geeksville-Industries-Meshtastic/dp/B08CY9394Q"><img alt="Download at https://www.amazon.com/Geeksville-Industries-Meshtastic/dp/B08CY9394Q" src="/img/amazon-fire-button.png" style={{zoom:'20%',padding:'3.5em'}} /></a></p>
 
 The application may not be found if your phone/Android version are too old. The minimum Android version is 5.0 (Lollipop 2014, first BLE support). However Android 6, Marshmallow 2015, is recommended as the Bluetooth is more stable.
 
+The app can also be sideloaded by downloading the .apk from the <a href="https://github.com/meshtastic/Meshtastic-Android/releases/latest">GitHub releases</a> page. If you wish to view the code or contribute to development of the app, please visit the app's <a href="https://github.com/meshtastic/Meshtastic-Android">GitHub page</a>.
+
 On installing the Meshtastic app, load it and navigate to the settings page. The app will ask you to give it permissions to access your location. This is needed for any app to use bluetooth, as the app is then able to scan the local area for bluetooth devices and, in theory, could triangulate your location based the devices it sees. If you give location permissions "only while using the app", the app will only be able to use bluetooth while it is open and visible to the user. This means if the screen is locked, or you are using another app, Meshtastic will not be able to use bluetooth, and will not be able to receive any messages from the node.
 
 [![Messages page](/img/android/android-messages-sm.png)](/img/android/android-messages-sm.png) [![Nodes page](/img/android/android-nodes-sm.png)](/img/android/android-nodes.png) [![Channel page](/img/android/android-channel-sm.png)](/img/android/android-channel.png) [![Settings page](/img/android/android-settings-sm.png)](/img/android/android-settings.png) [![Debug page](/img/android/android-debug-sm.png)](/img/android/android-debug.png)

website/docs/software/device/device.md

@@ -8,6 +8,7 @@ The device firmware runs on the nodes to build the mesh for communication. Each
 
 The current firmware has support for a screen to display received messages, along with information about nodes on the mesh, and more detailed information about the device on which it is running.
 
+The latest firmware can be downloaded from the <a href="https://github.com/meshtastic/Meshtastic-device/releases/latest">GibHut releases</a> page, which also contains the release notes for each version. If you wish to view the code or contribute to development of the firmware, please visit the device code <a href="https://github.com/meshtastic/Meshtastic-device">GitHub page</a>.
 ### Buttons
 
 A number of devices support buttons that can be used to interact with the firmware. These buttons have a number of different functions:

website/docs/software/js/getting-started.md

@@ -12,6 +12,8 @@ Full API docummentation is avaliable at [js.meshtastic.org](https://js.meshtasti
 
 Meshtastic.js is a JavaScript library that provides an interface to Meshtastic devices. It can be used to build applications to interface with a Meshtastic network. Currently HTTP(S) and Bluetooth connections are supported.
 
+If you wish to view the code or contribute to development of the library, please visit the JavaScript code <a href="https://github.com/meshtastic/meshtastic.js">GitHub page</a>.
+
 ## Connection methods
 
 ### HTTP(S)

website/docs/software/python/installation.md

@@ -10,6 +10,8 @@ This is a python library for using Meshtastic devices. This small library (and e
 
 [Full documentation](https://meshtastic.github.io/Meshtastic-python) for the library, including examples, is available.
 
+If you wish to view the code or contribute to development of the python library or the command line interface, please visit the Meshtastic python <a href="https://github.com/meshtastic/Meshtastic-python">GitHub page</a>.
+
 Installation is easily done through the [Python package installer pip](https://pypi.org/project/meshtastic/) (note, you must use pip version 20 or later):
 
 <Tabs
@@ -19,6 +21,7 @@ Installation is easily done through the [Python package installer pip](https://p
     {label: 'Linux', value: 'linux'},
     {label: 'macOS', value: 'macos'},
     {label: 'Windows', value: 'windows'},
+    {label: 'Termux for Android', value: 'termux'},
   ]}>
 <TabItem value="linux">
 
@@ -119,5 +122,29 @@ Installation is easily done through the [Python package installer pip](https://p
     pip3 install --upgrade meshtastic
     ```
     
+</TabItem>
+<TabItem value="termux">
+
+* Install [Termux](https://f-droid.org/en/packages/com.termux/) from the F-Droid app store (Google play does not currently support the latest builds)
+* Load Termux and update the package list
+    ```
+    pkg update
+    ```
+* Upgrade the installed packages
+    ```
+    pkg upgrade
+    ```
+* Install python
+    ```
+    pkg install python
+    ```
+* Upgrade pip and installed meshtastic and its dependancies
+    ```
+    pip install --upgrade pip pytap2 wheel mesthtastic
+    ```
+
+:::note 
+Be aware that currently the Meshtastic CLI is not able to control the nodes over USB through termux, but you can control devices over wifi using the `--host x.x.x.x` option with the device IP address. However, only ESP32 devices can use wifi currently.
+:::
 </TabItem>
 </Tabs>

website/sidebars.js

@@ -135,6 +135,7 @@ module.exports = {
           "hardware/wisBlock-hardware",
         ],
       },
+      "hardware/buttons",
       {
         "Antennas": [
           "hardware/antenna/antenna",