Skip to content

Commit

Permalink
Remove jagged config option
Browse files Browse the repository at this point in the history
  • Loading branch information
Ernst79 committed Jan 31, 2021
1 parent 0349d34 commit 237b7d3
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 16 deletions.
3 changes: 0 additions & 3 deletions custom_components/ble_monitor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
from .const import (
DEFAULT_ROUNDING,
DEFAULT_DECIMALS,
DEFAULT_JAGGED,
DEFAULT_PERIOD,
DEFAULT_LOG_SPIKES,
DEFAULT_USE_MEDIAN,
Expand All @@ -47,7 +46,6 @@
DEFAULT_DEVICE_RESET_TIMER,
CONF_ROUNDING,
CONF_DECIMALS,
CONF_JAGGED,
CONF_PERIOD,
CONF_LOG_SPIKES,
CONF_USE_MEDIAN,
Expand Down Expand Up @@ -102,7 +100,6 @@
{
vol.Optional(CONF_ROUNDING, default=DEFAULT_ROUNDING): cv.boolean,
vol.Optional(CONF_DECIMALS, default=DEFAULT_DECIMALS): cv.positive_int,
vol.Optional(CONF_JAGGED, default=DEFAULT_JAGGED): cv.boolean,
vol.Optional(CONF_PERIOD, default=DEFAULT_PERIOD): cv.positive_int,
vol.Optional(CONF_LOG_SPIKES, default=DEFAULT_LOG_SPIKES): cv.boolean,
vol.Optional(CONF_USE_MEDIAN, default=DEFAULT_USE_MEDIAN): cv.boolean,
Expand Down
6 changes: 1 addition & 5 deletions custom_components/ble_monitor/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
from .const import (
DEFAULT_ROUNDING,
DEFAULT_DECIMALS,
DEFAULT_JAGGED,
DEFAULT_PERIOD,
DEFAULT_LOG_SPIKES,
DEFAULT_USE_MEDIAN,
Expand All @@ -34,7 +33,6 @@
DEFAULT_DEVICE_RESET_TIMER,
CONF_ROUNDING,
CONF_DECIMALS,
CONF_JAGGED,
CONF_PERIOD,
CONF_LOG_SPIKES,
CONF_USE_MEDIAN,
Expand Down Expand Up @@ -81,7 +79,6 @@
): cv.boolean,
vol.Optional(CONF_ROUNDING, default=DEFAULT_ROUNDING): cv.boolean,
vol.Optional(CONF_DECIMALS, default=DEFAULT_DECIMALS): cv.positive_int,
vol.Optional(CONF_JAGGED, default=DEFAULT_JAGGED): cv.boolean,
vol.Optional(CONF_LOG_SPIKES, default=DEFAULT_LOG_SPIKES): cv.boolean,
vol.Optional(CONF_USE_MEDIAN, default=DEFAULT_USE_MEDIAN): cv.boolean,
vol.Optional(CONF_RESTORE_STATE, default=DEFAULT_RESTORE_STATE): cv.boolean,
Expand Down Expand Up @@ -212,7 +209,7 @@ async def async_step_add_device(self, user_input=None):
class BLEMonitorConfigFlow(BLEMonitorFlow, config_entries.ConfigFlow, domain=DOMAIN):
"""BLEMonitor config flow."""

VERSION = 2
VERSION = 1
CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH

@staticmethod
Expand Down Expand Up @@ -283,7 +280,6 @@ def _show_main_form(self, errors=None):
): cv.boolean,
vol.Optional(CONF_ROUNDING, default=self.config_entry.options.get(CONF_ROUNDING, DEFAULT_ROUNDING)): cv.boolean,
vol.Optional(CONF_DECIMALS, default=self.config_entry.options.get(CONF_DECIMALS, DEFAULT_DECIMALS)): cv.positive_int,
vol.Optional(CONF_JAGGED, default=self.config_entry.options.get(CONF_JAGGED, DEFAULT_JAGGED)): cv.boolean,
vol.Optional(CONF_LOG_SPIKES, default=self.config_entry.options.get(CONF_LOG_SPIKES, DEFAULT_LOG_SPIKES)): cv.boolean,
vol.Optional(CONF_USE_MEDIAN, default=self.config_entry.options.get(CONF_USE_MEDIAN, DEFAULT_USE_MEDIAN)): cv.boolean,
vol.Optional(CONF_RESTORE_STATE, default=self.config_entry.options.get(CONF_RESTORE_STATE, DEFAULT_RESTORE_STATE)): cv.boolean,
Expand Down
2 changes: 0 additions & 2 deletions custom_components/ble_monitor/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# Configuration options
CONF_ROUNDING = "rounding"
CONF_DECIMALS = "decimals"
CONF_JAGGED = "jagged"
CONF_PERIOD = "period"
CONF_LOG_SPIKES = "log_spikes"
CONF_USE_MEDIAN = "use_median"
Expand All @@ -23,7 +22,6 @@
# Default values for configuration options
DEFAULT_ROUNDING = True
DEFAULT_DECIMALS = 1
DEFAULT_JAGGED = True
DEFAULT_PERIOD = 60
DEFAULT_LOG_SPIKES = False
DEFAULT_USE_MEDIAN = False
Expand Down
4 changes: 2 additions & 2 deletions custom_components/ble_monitor/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from .const import (
CONF_ROUNDING,
CONF_DECIMALS,
CONF_JAGGED,
CONF_PERIOD,
CONF_LOG_SPIKES,
CONF_USE_MEDIAN,
Expand Down Expand Up @@ -533,7 +532,8 @@ def __init__(self, config, mac, devtype, firmware):
self._device_class = DEVICE_CLASS_HUMIDITY
# LYWSD03MMC / MHO-C401 "jagged" humidity workaround
if devtype in ('LYWSD03MMC', 'MHO-C401'):
self._jagged = config[CONF_JAGGED]
if self._device_firmware == "Xiaomi (MiBeacon)":
self._jagged = True


class MoistureSensor(MeasuringSensor):
Expand Down
2 changes: 0 additions & 2 deletions custom_components/ble_monitor/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"discovery": "Discovery",
"rounding": "Rounding",
"decimals": "Decimals",
"jagged": "Jagged humidity for LYWSD03MMC and MHO-C401",
"period": "Period",
"log_spikes": "Log spikes",
"use_median": "Use median",
Expand Down Expand Up @@ -50,7 +49,6 @@
"discovery": "Discovery",
"rounding": "Rounding",
"decimals": "Decimals",
"jagged": "Jagged humidity for LYWSD03MMC and MHO-C401",
"period": "Period",
"log_spikes": "Log spikes",
"use_median": "Use median",
Expand Down
2 changes: 0 additions & 2 deletions custom_components/ble_monitor/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"discovery": "Discovery",
"rounding": "Rounding",
"decimals": "Decimals",
"jagged": "Jagged humidity for LYWSD03MMC and MHO-C401",
"period": "Period",
"log_spikes": "Log spikes",
"use_median": "Use median",
Expand Down Expand Up @@ -50,7 +49,6 @@
"discovery": "Discovery",
"rounding": "Rounding",
"decimals": "Decimals",
"jagged": "Jagged humidity for LYWSD03MMC and MHO-C401",
"period": "Period",
"log_spikes": "Log spikes",
"use_median": "Use median",
Expand Down

0 comments on commit 237b7d3

Please sign in to comment.