merge main

Author: FoamyGuy

adafruit_bme680.py

@@ -479,12 +479,8 @@ def _set_heatr_conf(self, heater_temp: int, heater_time: int, enable: bool = Tru
             run_gas = _BME68X_DISABLE_GAS_MEAS
         self._run_gas = ~(run_gas - 1)
 
-        ctrl_gas_data_0 = bme_set_bits(
-            ctrl_gas_data_0, _BME68X_HCTRL_MSK, _BME68X_HCTRL_POS, hctrl
-        )
-        ctrl_gas_data_1 = bme_set_bits_pos_0(
-            ctrl_gas_data_1, _BME68X_NBCONV_MSK, nb_conv
-        )
+        ctrl_gas_data_0 = bme_set_bits(ctrl_gas_data_0, _BME68X_HCTRL_MSK, _BME68X_HCTRL_POS, hctrl)
+        ctrl_gas_data_1 = bme_set_bits_pos_0(ctrl_gas_data_1, _BME68X_NBCONV_MSK, nb_conv)
         ctrl_gas_data_1 = bme_set_bits(
             ctrl_gas_data_1, _BME68X_RUN_GAS_MSK, _BME68X_RUN_GAS_POS, run_gas
         )

examples/bme680_displayio_simpletest.py

@@ -2,10 +2,12 @@
 # SPDX-License-Identifier: MIT
 
 import time
+
 import board
 from adafruit_display_text.bitmap_label import Label
-from terminalio import FONT
 from displayio import Group
+from terminalio import FONT
+
 import adafruit_bme680
 
 # create a main_group to hold anything we want to show on the display.
@@ -41,10 +43,8 @@
 # begin main loop
 while True:
     # Update the label.text property to change the text on the display
-    display_output_label.text = """Temperature: {:.1f} C
-Humidity: {:.1f} %""".format(
-        bme680.temperature + temperature_offset, bme680.relative_humidity
-    )
+    display_output_label.text = f"""Temperature: {bme680.temperature + temperature_offset:.1f} C
+Humidity: {bme680.relative_humidity:.1f} %"""
 
     # wait for a bit
     time.sleep(1)