modify(WIP)

doc/software_installation.md

@@ -22,7 +22,7 @@
   - [Menu screen](#menu-screen)
     - [Sensors](#sensors)
     - [Courses](#courses)
-    - [Live Track](#live-track)
+    - [Connectivity](#connectivity)
     - [Upload Activity](#upload-activity)
     - [Map](#map)
     - [Profile](#profile)
@@ -49,7 +49,7 @@ $ pip3 install git+https://github.com/hishizuka/crdp.git
 # mac
 $ brew install sqlite3
 # linux
-$ sudo apt-get install sqlite3 libsqlite3-dev
+$ sudo apt install sqlite3 libsqlite3-dev
 
 $ cd pizero_bikecomputer
 ```
@@ -67,14 +67,14 @@ Here is [my setup guide in Japanese](https://qiita.com/hishi/items/8bdfd9d72fa8f
 
 ### Common
 
-Install in the home directory of default user "pi". Also, your Raspberry Pi is connected to internet and updated with `apt-get update & apt-get upgrade`.
+Install in the home directory of default user "pi". Also, your Raspberry Pi is connected to internet and updated with `apt update & apt upgrade`.
 
 
 ```
 $ cd
 $ git clone https://github.com/hishizuka/pizero_bikecomputer.git
-$ sudo apt-get install python3-pip cython3 cmake gawk python3-numpy python3-pyqt5 python3-pyqtgraph sqlite3 libsqlite3-dev libatlas-base-dev python3-aiohttp python3-aiofiles python3-smbus python3-rpi.gpio python3-psutil python3-pil bluez-obexd dbus-x11
-$ sudo pip3 install oyaml sip polyline garminconnect stravacookies qasync dbus-next bluez-peripheral tb-mqtt-client
+$ sudo apt install python3-pip cython3 cmake python3-numpy python3-pyqt5 python3-pyqtgraph sqlite3 libsqlite3-dev libatlas-base-dev python3-aiohttp python3-aiofiles python3-smbus python3-rpi.gpio python3-psutil python3-pil bluez-obexd dbus-x11
+$ sudo pip3 install oyaml sip polyline garminconnect stravacookies qasync dbus-next bluez-peripheral tb-mqtt-client timezonefinder
 $ sudo pip3 install git+https://github.com/hishizuka/crdp.git
 $ cd pizero_bikecomputer
 ```
@@ -86,7 +86,7 @@ $ cd pizero_bikecomputer
 Assume Serial interface is on and login shell is off in raspi-config and GPS device is connected as /dev/ttyS0. If GPS device is /dev/ttyAMA0, modify gpsd config file(/etc/default/gpsd).
 
 ```
-$ sudo apt-get install gpsd gpsd-clients
+$ sudo apt install gpsd gpsd-clients
 $ sudo pip3 install gps3 timezonefinder 
 $ sudo cp install/etc/default/gpsd /etc/default/gpsd
 $ sudo systemctl enable gpsd
@@ -108,7 +108,7 @@ Check with [pa1010d example program](https://github.com/pimoroni/pa1010d-python/
 ### ANT+ USB dongle
 
 ```
-$ sudo apt-get install libusb-1.0-0 python3-usb
+$ sudo apt install libusb-1.0-0 python3-usb
 $ sudo pip3 install git+https://github.com/hishizuka/openant.git
 ```
 
@@ -122,7 +122,7 @@ Assume SPI interface is on in raspi-config.
 You can use python3-pyqt5 package. Don't need building Qt.
 
 ```
-$ sudo apt-get install python3-pigpio
+$ sudo apt install python3-pigpio
 $ sudo systemctl enable pigpiod
 $ sudo systemctl start pigpiod
 ```
@@ -189,7 +189,7 @@ $ sudo pip3 install magnetic-field-calculator
 #### Button SHIM
 
 ```
-$ sudo apt-get install python3-buttonshim
+$ sudo apt install python3-buttonshim
 ```
 
 #### PiJuice HAT
@@ -499,21 +499,21 @@ Right side
     - <img width="320" alt="mapstogpx-01" src="https://github.com/hishizuka/pizero_bikecomputer/assets/12926652/928a8ed5-82e7-4ba2-afc7-6b68150d9043"> <img width="320" alt="mapstogpx-02" src="https://github.com/hishizuka/pizero_bikecomputer/assets/12926652/d6fbfb22-5c93-47e5-920f-8ef4fc9c02de">
 
 
-### Live Track
+### Connectivity
 
 <img width="400" alt="livetrack-01" src="https://github.com/hishizuka/pizero_bikecomputer/assets/12926652/9f9660fd-eca4-4b97-a60a-d2ff890bf3f0">
 
-- Live Track
-  - Enable real-time data upload to the [ThingsBoard](https://thingsboard.io) dashboard.
-  - `tb-mqtt-client` package, which can be installed with the `pip3` command, is required.
-  - Also, thingsboard device access token is required in [THINGSBOARD_API](#thingsboard_api-section) of setting.conf.
-  - You will also need to upload and set up a dashboard.　For more details of Thingboard setup, see [thingsboard_setup.md](./thingsboard_setup.md).
-- Auto upload via BT
+- Auto BT Tethering
   - Upload to ThingsBoard via bluetooth tethering via a paired smartphone which are already paired using `bluetoothctl`.
   - The following `Select BT device` must also be specified.
   - Since it operates intermittently once every two minutes, the power consumption of the Raspberry Pi and smartphone is much lower than a constant connection via Wifi tethering.
 - Select BT device
   - Specify the device to use for bluetooth tethering.
+- Live Track
+  - Enable real-time data upload to the [ThingsBoard](https://thingsboard.io) dashboard.
+  - `tb-mqtt-client` package, which can be installed with the `pip3` command, is required.
+  - Also, thingsboard device access token is required in [THINGSBOARD_API](#thingsboard_api-section) of setting.conf.
+  - You will also need to upload and set up a dashboard.　For more details of Thingboard setup, see [thingsboard_setup.md](./thingsboard_setup.md).
 
 
 ### Upload Activity
@@ -645,9 +645,9 @@ Set the value before starting the program. If the value is set during running, i
 - `map`
   - Set the map.
   - The `G_MAP_CONFIG` in modules/config.py provides some preset definitions.
-  - `toner`: A map for monochrome colors. [http://maps.stamen.com/toner/](http://maps.stamen.com/toner/)
   - `wikimedia`: An example map of a full-color map. [https://maps.wikimedia.org/](https://maps.wikimedia.org/)
   - `jpn_kokudo_chiri_in`: A map from Japan GSI. [https://cyberjapandata.gsi.go.jp](https://cyberjapandata.gsi.go.jp)
+  - (obsolete)`toner`: A map for monochrome colors. [http://maps.stamen.com/toner/](http://maps.stamen.com/toner/)
   - You can add a map URL to map.yaml. Specify the URL in tile format (tile coordinates by [x, y] and zoom level by [z]). And The map name is set to this setting `map`.
   - Also, you can set raster mbtiles mapsets generated from [mb-util](https://github.com/mapbox/mbutil). It is sqlite3 db packed with raster maptile images. The definition in map.yaml is following with sample mbtile map named `sample_mbtile` placed at `maptile/sample_mbtile.mbtiles`.
 
@@ -730,10 +730,6 @@ If you want to upload activities to Garmin Connect, set your `email` and `passwo
 
 If you want to search for a route on a map, set your `token` of the Google Directions API.
 
-#### OPENWEATHERMAP_API section
-
-If you want to correct the altitude using a barometric pressure sensor, set your `token` of the OpenWeatherMap API. 
-
 #### THINGSBOARD_API section
 
 If you want to use ThingsBoard dashboard, set your `token` of the Thingboard device access token.