pvblocks 0.1.0__tar.gz → 0.1.1__tar.gz

{pvblocks-0.1.0 → pvblocks-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pvblocks
-Version: 0.1.0
+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

{pvblocks-0.1.0 → pvblocks-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pvblocks"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
   { name="Erik Haverkamp", email="erik@rera.nl" },
 ]

pvblocks-0.1.1/src/pvblocks/__init__.py

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

pvblocks-0.1.1/src/pvblocks/constants.py

@@ -0,0 +1,43 @@
+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
+
+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-0.1.0 → pvblocks-0.1.1}/src/pvblocks/pvblocks_system.py

@@ -41,12 +41,12 @@ class PvBlocks(object):
         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):
@@ -54,11 +54,11 @@ class PvBlocks(object):
 
 
     def scan_blocks(self):
-        self.uart.write(serial.to_bytes([1, constants.Rr1700Command.ListModules]))
+        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]
@@ -84,37 +84,10 @@ class PvBlocks(object):
         if not self.uart.is_open:
             self.uart.open()
 
-        self.uart.write(serial.to_bytes([1, constants.Rr1700Command.ResetController]))
+        self.uart.write(serial.to_bytes([1, constants.RESET_CONTROLLER]))
         sleep(3)
 
 
-    def read_irradiances(self, pvblock):
-        if self.open_block(pvblock):
-            self.uart.write(serial.to_bytes([2, constants.Rr1700Command.ReadCommand]))
-            sleep(0.5)
-            bts = ReadSerial(self.uart)
-            if len(bts) < 10:
-                raise exceptions.UnexpectedResponseException()
-
-            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
-
-
-        else:
-            raise exceptions.CannotOpenBlockException()
-
-        return (0, 0, 0, 0)
-
-
-
-
-
 class PvBlock(object):
     def __init__(self, bytes, uart):
         self.bytes = bytes[0:8]
@@ -125,7 +98,7 @@ class PvBlock(object):
 
     def open(self):
         self.uart.write(serial.to_bytes([1,
-                                         constants.Rr1700Command.OpenModule,
+                                         constants.OPEN_MODULE,
                                          0,
                                          self.bytes[0],
                                          self.bytes[1],
@@ -142,7 +115,7 @@ class PvBlock(object):
 
     def close(self):
         self.uart.write(serial.to_bytes([1,
-                                         constants.Rr1700Command.CloseModule,
+                                         constants.CLOSE_MODULE,
                                          self.bytes[0],
                                          self.bytes[1],
                                          self.bytes[2],
@@ -159,7 +132,7 @@ class PvBlock(object):
 
     def read_statusbyte(self):
         self.open()
-        self.uart.write(serial.to_bytes([2, constants.Rr1700Command.GetStatus]))
+        self.uart.write(serial.to_bytes([2, constants.GET_STATUS]))
         sleep(0.5)
         bts = ReadSerial(self.uart)
         self.close()
@@ -177,7 +150,7 @@ class IvMpp(PvBlock):
     def read_ivpoint(self):
 
         self.open()
-        self.uart.write(serial.to_bytes([2, constants.Rr1700Command.ReadCommand]))
+        self.uart.write(serial.to_bytes([2, constants.READ_COMMAND]))
         sleep(0.5)
         bts = ReadSerial(self.uart)
         self.close()
@@ -195,14 +168,14 @@ class IvMpp(PvBlock):
 
     def ApplyVoc(self):
         self.open()
-        self.uart.write(serial.to_bytes([2, constants.Rr1700Command.IdleCommand]))
+        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.Rr1700Command.MppCommand]))
+        self.uart.write(serial.to_bytes([2, constants.MPP_COMMAND]))
         sleep(0.5)
         self.close()
 
@@ -226,12 +199,12 @@ class IvMpp(PvBlock):
         self.open()
 
         self.uart.write(
-            serial.to_bytes([2, constants.Rr1700Command.SetTriggerCommand, 0]))
+            serial.to_bytes([2, constants.SET_TRIGGER_COMMAND, 0]))
 
         sleep(0.5)
 
         self.uart.write(
-            serial.to_bytes([2, constants.Rr1700Command.CurveCommand, points, delay_ms, 0, 0, 0, 0, sweepstyle]))
+            serial.to_bytes([2, constants.CURVE_COMMAND, points, delay_ms, 0, 0, 0, 0, sweepstyle]))
 
         while self.uart.inWaiting() != 3:
             sleep(0.01)
@@ -252,7 +225,7 @@ class IvMpp(PvBlock):
 
     def transfer_curve(self, points):
         self.open()
-        self.uart.write(serial.to_bytes([2, constants.Rr1700Command.TransferCurveCommand]))
+        self.uart.write(serial.to_bytes([2, constants.TRANSFER_CURVE_COMMAND]))
         sleep(0.5)
         availablebytes = 8 + (points * 8) + 1
         toread = self.uart.inWaiting()
@@ -266,8 +239,8 @@ class IvMpp(PvBlock):
         voltages = []
         currents = []
 
-
-        for i in range(int((availablebytes - 1)/8)):
+        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
@@ -289,7 +262,7 @@ class IvMpp(PvBlock):
         bts = list(address.to_bytes(2, 'little'))
         self.open()
         self.uart.write(
-            serial.to_bytes([2, constants.Rr1700Command.ReadEepromCommand, length, bts[0], bts[1]]))
+            serial.to_bytes([2, constants.READ_EEPROM_COMMAND, length, bts[0], bts[1]]))
 
         while self.uart.inWaiting() != length + 3:
             sleep(0.01)
@@ -303,7 +276,7 @@ class PvIrr(PvBlock):
 
     def ReadIrradiances(self):
         self.open()
-        self.uart.write(serial.to_bytes([2, constants.Rr1700Command.ReadCommand]))
+        self.uart.write(serial.to_bytes([2, constants.READ_COMMAND]))
         sleep(0.5)
         bts = ReadSerial(self.uart)
         if len(bts) < 10:
@@ -343,10 +316,3 @@ class IvPoint(object):
     def __str__(self):
         return "(%f, %f)" % (self.voltage, self.current)
 
-
-class SweepStyle(IntEnum):
-    ISC_TO_VOC = 0,
-    SWEEP_VOC_TO_ISC = 1,
-    EXTENT_CURVE_DELAY = 2,
-    SWEEP_VOC_ISC_VOC = 4,
-    SWEEP_ISC_VOC_ISC = 8

{pvblocks-0.1.0 → pvblocks-0.1.1}/src/pvblocks.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pvblocks
-Version: 0.1.0
+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

{pvblocks-0.1.0 → pvblocks-0.1.1}/tests/test.py

@@ -37,6 +37,6 @@ if len(pvblocks.IvMppBlocks) > 0:
 #print(iv_mpp.get_info())
 ivpoint = iv_mpp.read_ivpoint()
 print(ivpoint)
-#curve = iv_mpp.MeasureIvCurve(100, 20, 0)
+curve = iv_mpp.measure_ivcurve(100, 20, 0)
 
-#pvblocks.close_system()
+pvblocks.close_system()

pvblocks-0.1.0/src/pvblocks/__init__.py

@@ -1,2 +0,0 @@
-VERSION = '0.0.2'
-__version__ = VERSION

pvblocks-0.1.0/src/pvblocks/constants.py

@@ -1,42 +0,0 @@
-from enum import IntEnum
-
-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
-
-class Rr1700Function(IntEnum):
-    IvMppReadIVPoint = 20,
-    IvMppApplyState = 21,
-    PvIrrReadIrradiances = 30
-
-class IvMppState(IntEnum):
-    Voc = 0,
-    Isc = 1,
-    Mpp = 2,
-    VoltageBias = 3