mudhorn/meshtastic
1
0
Fork 0
mirror of https://github.com/meshtastic/meshtastic.git synced 2025-02-21 03:25:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed overlooked git merge conflicts

Browse source
This commit is contained in:
Foster Irwin 2022-04-22 10:17:35 -06:00
parent 979b6238c0
commit 7005657167
1 changed files with 0 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
docs/settings/modules/telemetry-module.mdx
View file

@ -109,22 +109,12 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
```shell title="Display Farenheit"
meshtastic --set telemetry_module_display_farenheit true
```
````shell title="Display Celsius"
meshtastic --set telemetry_module_display_farenheit false
=======
```shell title="Display Farenheit" ```shell title="Display Farenheit"
meshtastic --set telemetry_module_environment_display_fahrenheit true meshtastic --set telemetry_module_environment_display_fahrenheit true
```` ````
```shell title="Display Celsius" ```shell title="Display Celsius"
meshtastic --set telemetry_module_environment_display_fahrenheit false meshtastic --set telemetry_module_environment_display_fahrenheit false
>>>>>>> master:docs/settings/telemetry-module.md
``` ```
</TabItem> </TabItem>
@ -168,22 +158,12 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
```shell title="Enable Module"
meshtastic --set telemetry_module_measurement_enabled true
```
````shell title="Disable Module"
meshtastic --set telemetry_module_measurement_enabled false
=======
```shell title="Enable Module" ```shell title="Enable Module"
meshtastic --set telemetry_module_environment_measurement_enabled true meshtastic --set telemetry_module_environment_measurement_enabled true
```` ````
```shell title="Disable Module" ```shell title="Disable Module"
meshtastic --set telemetry_module_environment_measurement_enabled false meshtastic --set telemetry_module_environment_measurement_enabled false
>>>>>>> master:docs/settings/telemetry-module.md
``` ```
</TabItem> </TabItem>
@ -227,14 +207,8 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
````shell title="Configure telemetry_module_read_error_count_threshold to 3 tries"
meshtastic --set telemetry_module_read_error_count_threshold 3
=======
```shell title="Configure telemetry_module_environment_read_error_count_threshold to 3 tries" ```shell title="Configure telemetry_module_environment_read_error_count_threshold to 3 tries"
meshtastic --set telemetry_module_environment_read_error_count_threshold 3 meshtastic --set telemetry_module_environment_read_error_count_threshold 3
>>>>>>> master:docs/settings/telemetry-module.md
```` ````
</TabItem> </TabItem>
@ -278,14 +252,8 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
````shell title="Configure telemetry_module_recovery_interval to 120 seconds"
meshtastic --set telemetry_module_recovery_interval 120
=======
```shell title="Configure telemetry_module_environment_recovery_interval to 120 seconds" ```shell title="Configure telemetry_module_environment_recovery_interval to 120 seconds"
meshtastic --set telemetry_module_environment_recovery_interval 120 meshtastic --set telemetry_module_environment_recovery_interval 120
>>>>>>> master:docs/settings/telemetry-module.md
```` ````
</TabItem> </TabItem>
@ -329,22 +297,12 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
```shell title="Enable on device screen"
meshtastic --set telemetry_module_screen_enabled true
```
````shell title="Disable on device screen"
meshtastic --set telemetry_module_screen_enabled false
=======
```shell title="Enable on device screen" ```shell title="Enable on device screen"
meshtastic --set telemetry_module_environment_screen_enabled true meshtastic --set telemetry_module_environment_screen_enabled true
```` ````
```shell title="Disable on device screen" ```shell title="Disable on device screen"
meshtastic --set telemetry_module_environment_screen_enabled false meshtastic --set telemetry_module_environment_screen_enabled false
>>>>>>> master:docs/settings/telemetry-module.md
``` ```
</TabItem> </TabItem>
@ -396,14 +354,8 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
````shell title="Set module sensor pin"
meshtastic --set telemetry_module_sensor_pin PINNUMBER
=======
```shell title="Set module sensor pin" ```shell title="Set module sensor pin"
meshtastic --set telemetry_module_environment_sensor_pin PINNUMBER meshtastic --set telemetry_module_environment_sensor_pin PINNUMBER
>>>>>>> master:docs/settings/telemetry-module.md
```` ````
</TabItem> </TabItem>
@ -470,22 +422,12 @@ values={[
The CLI is able to take the `value` or the `name` of the sensor from the table above. The CLI is able to take the `value` or the `name` of the sensor from the table above.
::: :::
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
```shell title="Set sensor type to DS18B20"
meshtastic --set telemetry_module_sensor_type 1
```
````shell title="Set sensor type to DS18B20"
meshtastic --set telemetry_module_sensor_type DS18B20
=======
```shell title="Set sensor type to DS18B20" ```shell title="Set sensor type to DS18B20"
meshtastic --set telemetry_module_environment_sensor_type 2 meshtastic --set telemetry_module_environment_sensor_type 2
```` ````
```shell title="Set sensor type to DS18B20" ```shell title="Set sensor type to DS18B20"
meshtastic --set telemetry_module_environment_sensor_type DS18B20 meshtastic --set telemetry_module_environment_sensor_type DS18B20
>>>>>>> master:docs/settings/telemetry-module.md
``` ```
</TabItem> </TabItem>
@ -525,14 +467,8 @@ values={[
]}> ]}>
<TabItem value="cli"> <TabItem value="cli">
<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
````shell title="Set module update interval to 15 seconds"
meshtastic --set telemetry_module_update_interval 15
=======
```shell title="Set module update interval to 120 seconds" ```shell title="Set module update interval to 120 seconds"
meshtastic --set telemetry_module_environment_update_interval 120 meshtastic --set telemetry_module_environment_update_interval 120
>>>>>>> master:docs/settings/telemetry-module.md
```` ````
</TabItem> </TabItem>