pvblocks 0.0.1__py3-none-any.whl → 0.1.1__py3-none-any.whl

pvblocks/__init__.py

@@ -1,2 +1,2 @@
-VERSION = '0.0.1'
-__version__ = VERSION
+VERSION = '0.1.1'
+__version__ = VERSION

pvblocks/constants.py

@@ -1,32 +1,43 @@
-from enum import IntEnum
+IDLE_COMMAND = 0
+BLINK_COMMAND = 1
+VOLTAGE_COMMAND = 2
+MPP_COMMAND = 3
+READ_COMMAND = 4
+CURVE_COMMAND = 5
+TRANSFER_CURVE_COMMAND = 6
+EXTERNAL_MPP_COMMAND = 7
+TRIGGERED_CURVE_COMMAND = 8
+GET_STATUS = 13
+WRITE_EEPROM_COMMAND = 14
+SET_TRIGGER_COMMAND = 15
+READ_EEPROM_COMMAND = 16
+UPDATE_CONFIG_COMMAND = 17
+GET_CONFIG_COMMAND = 18
+START_FIRMWARE_UPDATE = 19
+ENABLE_FAST_COMMUNICATIONS = 20
+DISABLE_BROADCAST = 21
+TRIGGERED_READ_COMMAND = 50
+ALIVE = 100
+LIST_MODULES = 101
+OPEN_MODULE = 106
+CLOSE_MODULE = 107
+RESET_MODULE = 108
+RESET_CONTROLLER = 109
+TRIGGER_ALL = 110
+BROADCAST_THRESHOLD_EXCEEDED = 111
+CURVE_RUNNING = 250
 
-class Rr1700Command(IntEnum):
-    IdleCommand = 0,
-    BlinkCommand = 1,
-    VoltageCommand = 2,
-    MppCommand = 3,
-    ReadCommand = 4,
-    CurveCommand = 5,
-    TransferCurveCommand = 6,
-    ExternalMppCommand = 7,
-    TriggeredCurveCommand = 8,
-    GetStatus = 13,
-    WriteEepromCommand = 14,
-    SetTriggerCommand = 15,
-    ReadEepromCommand = 16,
-    UpdateConfigCommand = 17,
-    GetConfigCommand = 18,
-    StartFirmwareUpdate = 19,
-    EnableFastCommunications = 20,
-    DisableBroadcast = 21,
-    TriggeredReadCommand = 50,
-    Alive = 100,
-    ListModules = 101,
-    OpenModule = 106,
-    CloseModule = 107,
-    ResetModule = 108,
-    ResetController = 109,
-    TriggerAll = 110,
-    BroadcastThresholdExceeded = 111,
-    CurveRunning = 250
+IVMPP_READ_IVPOINT = 20
+IVMPP_APPLY_STATE = 21
+PV_IRR_READ_IRRADIANCES = 30
 
+VOC = 0
+ISC = 1
+MPP = 2
+VOLTAGE_BIAS = 3
+
+ISC_TO_VOC = 0,
+SWEEP_VOC_TO_ISC = 1
+EXTENT_CURVE_DELAY = 2
+SWEEP_VOC_ISC_VOC = 4
+SWEEP_ISC_VOC_ISC = 8

pvblocks/exceptions.py

@@ -18,5 +18,19 @@ class NoReadDataImplementedException(Exception):
 class CannotOpenBlockException(Exception):
     '''Cannot open PVBlock.'''
 
+    def __str__(self):
+        return self.__doc__
+
+
+class MethodNotSupportedException(Exception):
+    '''Method not supported for PVBlock.'''
+
+    def __str__(self):
+        return self.__doc__
+
+
+class PvBlocksIsNoneException(Exception):
+    '''PVBlock is None'''
+
     def __str__(self):
         return self.__doc__

pvblocks/pvblocks_system.py

@@ -3,7 +3,10 @@ from . import exceptions
 from . import constants
 import serial
 import uuid
+import struct
 from time import sleep
+from enum import IntEnum
+
 
 
 def show_version():
@@ -21,7 +24,8 @@ class PvBlocks(object):
     TYPES = {
         20: 'IV/MPP IV-Curve control and measure PvBlock',
         30: 'PV-IRR 4x analog voltage readout block',
-        40: 'PV-TEMP 4x Pt100 readout block'
+        40: 'PV-TEMP 4x Pt100 readout block',
+        50: 'PV-MOD digital modbus module'
     }
 
     def __init__(self, serialport):
@@ -32,107 +36,283 @@ class PvBlocks(object):
                                   parity=serial.PARITY_NONE,
                                   stopbits=serial.STOPBITS_ONE,
                                   timeout=1)
+        self.Blocks = []
+        self.IvMppBlocks = []
+        self.PvIrrBlocks = []
 
     def init_system(self):
-        self.uart.write(serial.to_bytes([1, constants.Rr1700Command.Alive]))
+        self.uart.write(serial.to_bytes([1, constants.ALIVE]))
         sleep(0.5)
         bts = ReadSerial(self.uart)
         if len(bts) != 2:
             raise exceptions.NoResponseException()
-        return bts[0] == 3 and bts[1] == constants.Rr1700Command.Alive
+        return bts[0] == 3 and bts[1] == constants.ALIVE
+
+
+    def close_system(self):
+        self.uart.close()
+
 
-    def scanblocks(self):
-        self.uart.write(serial.to_bytes([1, constants.Rr1700Command.ListModules]))
+    def scan_blocks(self):
+        self.uart.write(serial.to_bytes([1, constants.LIST_MODULES]))
         sleep(2)
         bts = ReadSerial(self.uart)
 
-        if (bts[0] != 3) or (bts[1] != constants.Rr1700Command.ListModules):
+        if (bts[0] != 3) or (bts[1] != constants.LIST_MODULES):
             raise exceptions.UnexpectedResponseException()
 
         module_count = bts[3]
         self.Blocks = []
+        self.IvMppBlocks = []
+        self.PvIrrBlocks = []
         for index in range(module_count):
-            blck = PvBlock(bts[(index * 9) + 4: (index * 9) + 13])
-            self.Blocks.append(blck)
+            match bts[(index * 9) + 4 + 8]:
+                case 20:
+                    blck = IvMpp(bts[(index * 9) + 4: (index * 9) + 13], self.uart)
+                    self.IvMppBlocks.append(blck)
+                case 30:
+                    blck = PvIrr(bts[(index * 9) + 4: (index * 9) + 13], self.uart)
+                    self.PvIrrBlocks.append(blck)
+                case _:
+                    blck = PvBlock(bts[(index * 9) + 4: (index * 9) + 13], self.uart)
+                    self.Blocks.append(blck)
+
 
         return module_count > 0
 
-    def open_block(self, pvblock):
+    def reset_controller(self):
+        if not self.uart.is_open:
+            self.uart.open()
+
+        self.uart.write(serial.to_bytes([1, constants.RESET_CONTROLLER]))
+        sleep(3)
+
+
+class PvBlock(object):
+    def __init__(self, bytes, uart):
+        self.bytes = bytes[0:8]
+        id = int.from_bytes(bytearray(self.bytes), 'little')
+        self.Guid = uuid.UUID(int=id)
+        self.Type = bytes[8]
+        self.uart = uart
+
+    def open(self):
         self.uart.write(serial.to_bytes([1,
-                                         constants.Rr1700Command.OpenModule,
+                                         constants.OPEN_MODULE,
                                          0,
-                                         pvblock.bytes[0],
-                                         pvblock.bytes[1],
-                                         pvblock.bytes[2],
-                                         pvblock.bytes[3],
-                                         pvblock.bytes[4],
-                                         pvblock.bytes[5],
-                                         pvblock.bytes[6],
-                                         pvblock.bytes[7]]))
+                                         self.bytes[0],
+                                         self.bytes[1],
+                                         self.bytes[2],
+                                         self.bytes[3],
+                                         self.bytes[4],
+                                         self.bytes[5],
+                                         self.bytes[6],
+                                         self.bytes[7]]))
         sleep(0.5)
         bts = ReadSerial(self.uart)
 
         return len(bts) == 3
 
-    def close_block(self, pvblock):
+    def close(self):
         self.uart.write(serial.to_bytes([1,
-                                         constants.Rr1700Command.CloseModule,
-                                         pvblock.bytes[0],
-                                         pvblock.bytes[1],
-                                         pvblock.bytes[2],
-                                         pvblock.bytes[3],
-                                         pvblock.bytes[4],
-                                         pvblock.bytes[5],
-                                         pvblock.bytes[6],
-                                         pvblock.bytes[7]]))
+                                         constants.CLOSE_MODULE,
+                                         self.bytes[0],
+                                         self.bytes[1],
+                                         self.bytes[2],
+                                         self.bytes[3],
+                                         self.bytes[4],
+                                         self.bytes[5],
+                                         self.bytes[6],
+                                         self.bytes[7]]))
         sleep(0.5)
         bts = ReadSerial(self.uart)
 
         return len(bts) == 3
 
-    def read_data(self, pvblock):
-        try:
-            if pvblock.Type == 20:
-                return self.read_ivpoint(pvblock)
-            if pvblock.Type == 30:
-                return self.read_irradiances(pvblock)
-        except:
-            print("Exception raised")
-        finally:
-            self.close_block(pvblock)
-
-        raise exceptions.NoReadDataImplementedException()
-
-    def read_irradiances(self, pvblock):
-        if self.open_block(pvblock):
-            self.uart.write(serial.to_bytes([2, constants.Rr1700Command.ReadCommand]))
+
+    def read_statusbyte(self):
+        self.open()
+        self.uart.write(serial.to_bytes([2, constants.GET_STATUS]))
+        sleep(0.5)
+        bts = ReadSerial(self.uart)
+        self.close()
+        if len(bts) < 10:
+            raise exceptions.UnexpectedResponseException()
+        return StatusByte(bts)
+
+    def get_info(self):
+        status = self.read_statusbyte()
+        d = {'firmware': status.firmware, 'hardware': status.hardware}
+        return d
+
+
+class IvMpp(PvBlock):
+    def read_ivpoint(self):
+
+        self.open()
+        self.uart.write(serial.to_bytes([2, constants.READ_COMMAND]))
+        sleep(0.5)
+        bts = ReadSerial(self.uart)
+        self.close()
+        if len(bts) < 15:
+            raise exceptions.UnexpectedResponseException()
+
+        if bts[2] != 12:
+            raise exceptions.UnexpectedResponseException()
+
+        r1 = int.from_bytes(bts[3:7], "little") / 10000.0
+        r2 = int.from_bytes(bts[7:11], "little") / 100000.0
+        ivpoint = IvPoint(r1, r2)
+
+        return ivpoint
+
+    def ApplyVoc(self):
+        self.open()
+        self.uart.write(serial.to_bytes([2, constants.IDLE_COMMAND]))
+        sleep(0.5)
+        self.close()
+
+
+    def ApplyMpp(self):
+        self.open()
+        self.uart.write(serial.to_bytes([2, constants.MPP_COMMAND]))
+        sleep(0.5)
+        self.close()
+
+    def ApplyIsc(self):
+        voltage = 0.0;
+        self.open()
+        bytes = list(((int)(1000 * voltage)).to_bytes(4, "little"))
+        self.uart.write(serial.to_bytes([2, constants.Rr1700Command.VoltageCommand, bytes[0], bytes[1], bytes[2], bytes[3]]))
+        sleep(0.5)
+        self.close()
+
+    def ApplyVoltageBias(self, voltage):
+        self.open()
+        bytes = list(((int)(1000 * voltage)).to_bytes(4, "little"))
+        self.uart.write(
+            serial.to_bytes([2, constants.Rr1700Command.VoltageCommand, bytes[0], bytes[1], bytes[2], bytes[3]]))
+        sleep(0.5)
+        self.close()
+
+    def measure_ivcurve(self, points, delay_ms, sweepstyle):
+        self.open()
+
+        self.uart.write(
+            serial.to_bytes([2, constants.SET_TRIGGER_COMMAND, 0]))
+
+        sleep(0.5)
+
+        self.uart.write(
+            serial.to_bytes([2, constants.CURVE_COMMAND, points, delay_ms, 0, 0, 0, 0, sweepstyle]))
+
+        while self.uart.inWaiting() != 3:
+            sleep(0.01)
+
+        bts = ReadSerial(self.uart)
+
+        status = self.read_statusbyte()
+        while status.mode == 5:
             sleep(0.5)
-            bts = ReadSerial(self.uart)
-            if len(bts) < 10:
-                raise exceptions.UnexpectedResponseException()
+            status = self.read_statusbyte()
 
-            r1 = int.from_bytes(bts[3:7], "little") / 1000.0
-            r2 = int.from_bytes(bts[7:11], "little") / 1000.0
-            if bts[2] == 16:
-                r3 = int.from_bytes(bts[11:15], "little") / 1000.0
-                r4 = int.from_bytes(bts[15:19], "little") / 1000.0
-                return r1, r2, r3, r4
-            else:
-                return r1, r2
+        self.close()
 
+        points_measured = status.statusbytes[0]
+        curve = self.transfer_curve(points_measured)
 
-        else:
-            raise exceptions.CannotOpenBlockException()
+        return curve
 
-        return (0, 0, 0, 0)
+    def transfer_curve(self, points):
+        self.open()
+        self.uart.write(serial.to_bytes([2, constants.TRANSFER_CURVE_COMMAND]))
+        sleep(0.5)
+        availablebytes = 8 + (points * 8) + 1
+        toread = self.uart.inWaiting()
+        while toread != availablebytes:
+            toread = self.uart.inWaiting()
+            print(toread)
+            sleep(0.1)
+        bts = ReadSerial(self.uart)
+        self.close()
 
-    def read_ivpoint(self, pvblock):
-        return (0, 0)
+        voltages = []
+        currents = []
 
+        print(availablebytes)
+        for i in range(1, int((availablebytes - 1)/8)):
+            index = (i * 8) + 1
+            voltages.append(int.from_bytes(bts[index:(index+4)], "little") / 10000.0)
+            index = index + 4
+            currents.append(int.from_bytes(bts[index:(index+4)], "little") / 100000.0)
 
-class PvBlock(object):
+        return {'voltages': voltages, 'currents': currents}
+
+    def read_calibration(self):
+        c = {'A': 0.0, 'B': 0.0, 'C': 0.0, 'D': 0.0}
+        bts = self.read_eeprom(4, 16)
+        c['A'] = struct.unpack('<f', bytearray(bts[0:4]))
+        c['B'] = struct.unpack('<f', bytearray(bts[4:8]))
+        c['C'] = struct.unpack('<f', bytearray(bts[8:12]))
+        c['D'] = struct.unpack('<f', bytearray(bts[12:16]))
+
+        return c
+
+    def read_eeprom(self, address, length):
+        bts = list(address.to_bytes(2, 'little'))
+        self.open()
+        self.uart.write(
+            serial.to_bytes([2, constants.READ_EEPROM_COMMAND, length, bts[0], bts[1]]))
+
+        while self.uart.inWaiting() != length + 3:
+            sleep(0.01)
+
+        bts = ReadSerial(self.uart)
+        self.close()
+        return bts[3:]
+
+
+class PvIrr(PvBlock):
+
+    def ReadIrradiances(self):
+        self.open()
+        self.uart.write(serial.to_bytes([2, constants.READ_COMMAND]))
+        sleep(0.5)
+        bts = ReadSerial(self.uart)
+        if len(bts) < 10:
+            raise exceptions.UnexpectedResponseException()
+
+        irradiances = []
+
+        r1 = int.from_bytes(bts[3:7], "little") / 1000.0
+        r2 = int.from_bytes(bts[7:11], "little") / 1000.0
+        irradiances.append(r1)
+        irradiances.append(r2)
+        if bts[2] == 16:
+            r3 = int.from_bytes(bts[11:15], "little") / 1000.0
+            r4 = int.from_bytes(bts[15:19], "little") / 1000.0
+            irradiances.append(r3)
+            irradiances.append(r4)
+
+        self.close()
+        return irradiances
+
+class StatusByte(object):
     def __init__(self, bytes):
-        self.bytes = bytes[0:8]
-        id = int.from_bytes(bytearray(self.bytes), 'little')
-        self.Guid = uuid.UUID(int=id)
-        self.Type = bytes[8]
+        self.blocktype = bytes[2]
+        self.token = bytes[3]
+        self.mode = bytes[4]
+        self.statusbytes = bytes[5:]
+        self.firmware = bytes[9]
+        self.hardware = bytes[8]
+
+
+class IvPoint(object):
+    def __init__(self, voltage, current):
+        self.voltage = voltage
+        self.current = current
+        self.power = voltage * current
+
+    def __str__(self):
+        return "(%f, %f)" % (self.voltage, self.current)
+

{pvblocks-0.0.1.dist-info → pvblocks-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pvblocks
-Version: 0.0.1
+Version: 0.1.1
 Summary: Python package to directly control pvblocks modules
 Author-email: Erik Haverkamp <erik@rera.nl>
 Project-URL: Homepage, https://github.com/rerasolutions/pvblocks-python
@@ -10,7 +10,12 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 ### pvblocks
 
 Package to control pvblocks modules directly
+
+requires packages:
+
+pyserial

pvblocks-0.1.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+pvblocks/__init__.py,sha256=IIowXUr-xAaZCUhjyVsp1GPDlYaCN8kOX_OZ0i2mWnA,42
+pvblocks/__main__.py,sha256=fhvwtf6NzUeUsjP_ARtvxcmYjAvfwqz9_K1bHFwEjUg,84
+pvblocks/constants.py,sha256=MzQ_7Kgmks8F7KqRwEsGIdkFzP5pubjJzfxgbtwFvGk,889
+pvblocks/exceptions.py,sha256=we35JF-svaCDAFYqKFlDCp7ZwbCU0FQe7nksKpUfPnQ,850
+pvblocks/pvblocks_system.py,sha256=zrxS6_3v2OiQMuSqSGBTNBQhk61ZfxDcnHdpgj-6fZE,10056
+pvblocks-0.1.1.dist-info/licenses/LICENSE,sha256=8xnw0w04bL1ekO1BTZPbMkUbonvCNWVu6G6k4QIFRns,1091
+pvblocks-0.1.1.dist-info/METADATA,sha256=HLzD4VMcfEa5p6s0ZN5W6NLo4PxEKbIwuz7Bk8BDXmU,593
+pvblocks-0.1.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+pvblocks-0.1.1.dist-info/top_level.txt,sha256=3jm7rpxZDuLfYKWbVj6i1IZJib2hTFVYxbsR68po7O8,9
+pvblocks-0.1.1.dist-info/RECORD,,

{pvblocks-0.0.1.dist-info → pvblocks-0.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pvblocks-0.0.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-pvblocks/__init__.py,sha256=zcN732L9esRapW_Ntqw0NDmCJtHlHywlKzRPn8d2Rlg,40
-pvblocks/__main__.py,sha256=fhvwtf6NzUeUsjP_ARtvxcmYjAvfwqz9_K1bHFwEjUg,84
-pvblocks/constants.py,sha256=Wdp6NcBqOcEYjaz0PjKG0P8sh03zi6PAZdZD8WMHiMo,811
-pvblocks/exceptions.py,sha256=yCxzusmdwVpaoXA-NKEFODGqWa5S-umYCuL7WZ8sje8,570
-pvblocks/pvblocks_system.py,sha256=mQLmaliU7Xc_e90a4OCpcZQlLBF6h-XzC0bVUPYQBxw,4807
-pvblocks-0.0.1.dist-info/LICENSE,sha256=8xnw0w04bL1ekO1BTZPbMkUbonvCNWVu6G6k4QIFRns,1091
-pvblocks-0.0.1.dist-info/METADATA,sha256=-4KllHggt5l0t8Jv7leF18RnEZbmWdMTGq4VljX5rO4,536
-pvblocks-0.0.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-pvblocks-0.0.1.dist-info/top_level.txt,sha256=3jm7rpxZDuLfYKWbVj6i1IZJib2hTFVYxbsR68po7O8,9
-pvblocks-0.0.1.dist-info/RECORD,,