Skip to content

Commit c3b5aff

Browse files
committed
Update adafruit_ina260.py
add empty rows to resolve merge conflicts
1 parent dd23198 commit c3b5aff

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

adafruit_ina260.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
# pylint: disable=too-few-public-methods
4444
class Mode:
4545
"""Modes avaible to be set
46+
4647
+--------------------+---------------------------------------------------------------------+
4748
| Mode | Description |
4849
+====================+=====================================================================+
@@ -57,6 +58,7 @@ class Mode:
5758
| ``Mode.SHUTDOWN`` | Shutdown the sensor, reducing the quiescent current and turning off|
5859
| | current into the device inputs. Set another mode to re-enable |
5960
+--------------------+---------------------------------------------------------------------+
61+
6062
"""
6163

6264
SHUTDOWN = const(0x0)
@@ -66,6 +68,7 @@ class Mode:
6668

6769
class ConversionTime:
6870
"""Options for ``current_conversion_time`` or ``voltage_conversion_time``
71+
6972
+----------------------------------+------------------+
7073
| ``ConversionTime`` | Time |
7174
+==================================+==================+
@@ -85,6 +88,7 @@ class ConversionTime:
8588
+----------------------------------+------------------+
8689
| ``ConversionTime.TIME_8_244_ms`` | 8.244 ms |
8790
+----------------------------------+------------------+
91+
8892
"""
8993

9094
TIME_140_us = const(0x0)
@@ -114,6 +118,7 @@ def get_seconds(time_enum):
114118

115119
class AveragingCount:
116120
"""Options for ``averaging_count``
121+
117122
+-------------------------------+------------------------------------+
118123
| ``AveragingCount`` | Number of measurements to average |
119124
+===============================+====================================+
@@ -133,6 +138,7 @@ class AveragingCount:
133138
+-------------------------------+------------------------------------+
134139
| ``AveragingCount.COUNT_1024`` | 1024 |
135140
+-------------------------------+------------------------------------+
141+
136142
"""
137143

138144
COUNT_1 = const(0x0)
@@ -156,8 +162,10 @@ def get_averaging_count(avg_count):
156162

157163
class INA260:
158164
"""Driver for the INA260 power and current sensor.
165+
159166
:param ~busio.I2C i2c_bus: The I2C bus the INA260 is connected to.
160167
:param address: The I2C device address for the sensor. Default is ``0x40``.
168+
161169
"""
162170

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

0 commit comments

Comments
 (0)