Skip to content

Commit ae41324

Browse files
authored
Update adafruit_ina260.py
add empty rows to resolve merge conflicts
1 parent 18faf54 commit ae41324

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

adafruit_ina260.py

+8
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
# pylint: disable=too-few-public-methods
6161
class Mode:
6262
"""Modes avaible to be set
63+
6364
+--------------------+---------------------------------------------------------------------+
6465
| Mode | Description |
6566
+====================+=====================================================================+
@@ -74,6 +75,7 @@ class Mode:
7475
| ``Mode.SHUTDOWN`` | Shutdown the sensor, reducing the quiescent current and turning off|
7576
| | current into the device inputs. Set another mode to re-enable |
7677
+--------------------+---------------------------------------------------------------------+
78+
7779
"""
7880

7981
SHUTDOWN = const(0x0)
@@ -83,6 +85,7 @@ class Mode:
8385

8486
class ConversionTime:
8587
"""Options for ``current_conversion_time`` or ``voltage_conversion_time``
88+
8689
+----------------------------------+------------------+
8790
| ``ConversionTime`` | Time |
8891
+==================================+==================+
@@ -102,6 +105,7 @@ class ConversionTime:
102105
+----------------------------------+------------------+
103106
| ``ConversionTime.TIME_8_244_ms`` | 8.244 ms |
104107
+----------------------------------+------------------+
108+
105109
"""
106110

107111
TIME_140_us = const(0x0)
@@ -131,6 +135,7 @@ def get_seconds(time_enum):
131135

132136
class AveragingCount:
133137
"""Options for ``averaging_count``
138+
134139
+-------------------------------+------------------------------------+
135140
| ``AveragingCount`` | Number of measurements to average |
136141
+===============================+====================================+
@@ -150,6 +155,7 @@ class AveragingCount:
150155
+-------------------------------+------------------------------------+
151156
| ``AveragingCount.COUNT_1024`` | 1024 |
152157
+-------------------------------+------------------------------------+
158+
153159
"""
154160

155161
COUNT_1 = const(0x0)
@@ -173,8 +179,10 @@ def get_averaging_count(avg_count):
173179

174180
class INA260:
175181
"""Driver for the INA260 power and current sensor.
182+
176183
:param ~busio.I2C i2c_bus: The I2C bus the INA260 is connected to.
177184
:param address: The I2C device address for the sensor. Default is ``0x40``.
185+
178186
"""
179187

180188
def __init__(self, i2c_bus, address=0x40):

0 commit comments

Comments
 (0)