cbpi4-BLEHydrom 0.0.6__tar.gz → 0.0.8__tar.gz

{cbpi4-BLEHydrom-0.0.6/cbpi4_BLEHydrom.egg-info → cbpi4-BLEHydrom-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbpi4-BLEHydrom
-Version: 0.0.6
+Version: 0.0.8
 Summary: CraftBeerPi4 Plugin for Hydrom and Tilt (BLE connection)
 Home-page: https://github.com/avollkopf/cbpi4-BLEHydrom
 Author: Alexander Vollkopf
@@ -47,11 +47,12 @@ Python needs also special rights, to access the bluetooth resources. Therefore y
 2. Click the **Add** button in the Sensor section, and fill out the sensor properties:
     1. **Name**: Give the sensor a name. This is specific to this sensor reading, and does not need to match the Tilt color. It can be something like Wort Gravity or Tilt Temperature.
     2. **Type**: Choose BLEHydrom.
-    3. **Tilt Color**: This should be set to the color of your Tilt or color config of your Hydrom
-    4. **Data Type**: Each Tilt has three types of data that it reports, the Temperature,Gravity and RSSI, so select the one that you are configuring for this particular sensor. 
-    5. **Gravity Units**: *This field is only required if Data Type is set to Gravity*. The Tilt converts its readings into Specific Gravity by default. However you can choose one of three types here and it will be converted to that unit automatically. The choices are SG (Specific Gravity), Brix (or °Bx), and Plato (or °P).
-    6. **Calibration Point 1-3***: *Optional*. These fields allow you to calibrate your Tilt by entering an uncalibrated reading from the Tilt and then the desired, calibrated value. The format to use is ***uncalibrated value* = *actual value*** (spacing is optional). More info on calibration is in the section below.
-    7. Once you have filled out the sensor fields, click **Add**.
+    3. **Tilt Color**: This should be set to the color of your Tilt or color config of your Hydrom.
+    4. **Hardware**: Here you must select if you are using a Tilt / Hydrom or one of the Tilt pro series. Pro series devices can be used in parallel with a Tilt or Hydrom of the same color.
+    5. **Data Type**: Each Tilt has three types of data that it reports, the Temperature,Gravity and RSSI, so select the one that you are configuring for this particular sensor. 
+    6. **Gravity Units**: *This field is only required if Data Type is set to Gravity*. The Tilt converts its readings into Specific Gravity by default. However you can choose one of three types here and it will be converted to that unit automatically. The choices are SG (Specific Gravity), Brix (or °Bx), and Plato (or °P).
+    7. **Calibration Point 1-3***: *Optional*. These fields allow you to calibrate your Tilt by entering an uncalibrated reading from the Tilt and then the desired, calibrated value. The format to use is ***uncalibrated value* = *actual value*** (spacing is optional). More info on calibration is in the section below.
+    8. Once you have filled out the sensor fields, click **Add**.
 3. Repeat the above steps if you want additional sensors for the other data types that your Tilt reports, or if you have more than one Tilt, you can create sensors for those devices as well.
 4. You can now add any of the Tilt sensors to kettles or fermenters in your brewery, or you can view their data on the dashboard or graph their data with the charts.
 
@@ -66,13 +67,15 @@ You can use the Calibration Point fields to calibrate your Tilt, much like when
 
 ### Changelog:
 
-- 10.01.23: (0.0.6) Test with PyBluez Mod as interim solution
-- 01.12.23: (0.0.6.a1) updated requirements
-- 11.05.22: (0.0.5) Updated README (removed cbpi add)
-- 25.02.22: (0.0.4) Updated README
-- 16.01.22: (0.0.3) Reduced mqtt traffic (->cbpi 4.0.1.2 required!!)
-- 08.01.22: (0.0.2) Added RSSI value from blescan as parameter
-- 07.01.22: (0.0.1) Initial Commit
+- 13.07.24: (0.0.8) Addition of Tilt Pro series.
+- 13.04.24: (0.0.7) Test with new gattlib-dbus package.
+- 10.01.23: (0.0.6) Test with PyBluez Mod as interim solution.
+- 01.12.23: (0.0.6.a1) updated requirements.
+- 11.05.22: (0.0.5) Updated README (removed cbpi add).
+- 25.02.22: (0.0.4) Updated README.
+- 16.01.22: (0.0.3) Reduced mqtt traffic (->cbpi 4.0.1.2 required!!).
+- 08.01.22: (0.0.2) Added RSSI value from blescan as parameter.
+- 07.01.22: (0.0.1) Initial Commit.
 
 
 

{cbpi4-BLEHydrom-0.0.6 → cbpi4-BLEHydrom-0.0.8}/README.md

@@ -35,11 +35,12 @@ Python needs also special rights, to access the bluetooth resources. Therefore y
 2. Click the **Add** button in the Sensor section, and fill out the sensor properties:
     1. **Name**: Give the sensor a name. This is specific to this sensor reading, and does not need to match the Tilt color. It can be something like Wort Gravity or Tilt Temperature.
     2. **Type**: Choose BLEHydrom.
-    3. **Tilt Color**: This should be set to the color of your Tilt or color config of your Hydrom
-    4. **Data Type**: Each Tilt has three types of data that it reports, the Temperature,Gravity and RSSI, so select the one that you are configuring for this particular sensor. 
-    5. **Gravity Units**: *This field is only required if Data Type is set to Gravity*. The Tilt converts its readings into Specific Gravity by default. However you can choose one of three types here and it will be converted to that unit automatically. The choices are SG (Specific Gravity), Brix (or °Bx), and Plato (or °P).
-    6. **Calibration Point 1-3***: *Optional*. These fields allow you to calibrate your Tilt by entering an uncalibrated reading from the Tilt and then the desired, calibrated value. The format to use is ***uncalibrated value* = *actual value*** (spacing is optional). More info on calibration is in the section below.
-    7. Once you have filled out the sensor fields, click **Add**.
+    3. **Tilt Color**: This should be set to the color of your Tilt or color config of your Hydrom.
+    4. **Hardware**: Here you must select if you are using a Tilt / Hydrom or one of the Tilt pro series. Pro series devices can be used in parallel with a Tilt or Hydrom of the same color.
+    5. **Data Type**: Each Tilt has three types of data that it reports, the Temperature,Gravity and RSSI, so select the one that you are configuring for this particular sensor. 
+    6. **Gravity Units**: *This field is only required if Data Type is set to Gravity*. The Tilt converts its readings into Specific Gravity by default. However you can choose one of three types here and it will be converted to that unit automatically. The choices are SG (Specific Gravity), Brix (or °Bx), and Plato (or °P).
+    7. **Calibration Point 1-3***: *Optional*. These fields allow you to calibrate your Tilt by entering an uncalibrated reading from the Tilt and then the desired, calibrated value. The format to use is ***uncalibrated value* = *actual value*** (spacing is optional). More info on calibration is in the section below.
+    8. Once you have filled out the sensor fields, click **Add**.
 3. Repeat the above steps if you want additional sensors for the other data types that your Tilt reports, or if you have more than one Tilt, you can create sensors for those devices as well.
 4. You can now add any of the Tilt sensors to kettles or fermenters in your brewery, or you can view their data on the dashboard or graph their data with the charts.
 
@@ -54,11 +55,13 @@ You can use the Calibration Point fields to calibrate your Tilt, much like when
 
 ### Changelog:
 
-- 10.01.23: (0.0.6) Test with PyBluez Mod as interim solution
-- 01.12.23: (0.0.6.a1) updated requirements
-- 11.05.22: (0.0.5) Updated README (removed cbpi add)
-- 25.02.22: (0.0.4) Updated README
-- 16.01.22: (0.0.3) Reduced mqtt traffic (->cbpi 4.0.1.2 required!!)
-- 08.01.22: (0.0.2) Added RSSI value from blescan as parameter
-- 07.01.22: (0.0.1) Initial Commit
+- 13.07.24: (0.0.8) Addition of Tilt Pro series.
+- 13.04.24: (0.0.7) Test with new gattlib-dbus package.
+- 10.01.23: (0.0.6) Test with PyBluez Mod as interim solution.
+- 01.12.23: (0.0.6.a1) updated requirements.
+- 11.05.22: (0.0.5) Updated README (removed cbpi add).
+- 25.02.22: (0.0.4) Updated README.
+- 16.01.22: (0.0.3) Reduced mqtt traffic (->cbpi 4.0.1.2 required!!).
+- 08.01.22: (0.0.2) Added RSSI value from blescan as parameter.
+- 07.01.22: (0.0.1) Initial Commit.
 

{cbpi4-BLEHydrom-0.0.6 → cbpi4-BLEHydrom-0.0.8}/cbpi4-BLEHydrom/__init__.py

@@ -88,7 +88,15 @@ def readTilt(cache):
   
                 for beacon in beacons:
                     if beacon['uuid'] in TILTS.keys():
-                        cache[TILTS[beacon['uuid']]] = {'Temp': beacon['major'], 'Gravity': beacon['minor'], 'Time': time.time(),'RSSI': beacon['rssi']}
+                        if int(beacon['minor']) < 2000:
+                            # Tilt regular or Hydrom
+                            cache[TILTS[beacon['uuid']]+"_0"] = {'Temp': beacon['major'], 'Gravity': beacon['minor'], 'Time': time.time(),'RSSI': beacon['rssi']}
+                        else:
+                            # Tilt mini pro
+                            temp=float(beacon['major'])/10
+                            gravity=float(beacon['minor'])/10
+                            cache[TILTS[beacon['uuid']]+"_1"] = {'Temp': temp, 'Gravity': gravity, 'Time': time.time(),'RSSI': beacon['rssi']}
+                        logging.info(cache)
                         logging.info("Tilt data received: Temp: %s Gravity: %s RSSI: %s" % (beacon['major'], beacon['minor'], beacon['rssi']))
                         time.sleep(4)
         except Exception as e:
@@ -100,6 +108,7 @@ def readTilt(cache):
 
 
 @parameters([Property.Select(label="Sensor color", options=["Red", "Green", "Black", "Purple", "Orange", "Blue", "Yellow", "Pink"], description="Select the color of your Tilt"),
+             Property.Select(label="Hardware", options=["Hydrom / Tilt", "Tilt Pro / Pro Mini"], description="Select the device Type (Default is Hydrom / Tilt)"),
 	         Property.Select(label= "Data Type", options=["Temperature", "Gravity","RSSI"], description="Select which type of data to register for this sensor"),
 	         Property.Select(label="Gravity Units", options=["SG", "Brix", "Plato"], description="Converts the gravity reading to this unit if the Data Type is set to Gravity"),
 	         Property.Text(label="Calibration Point 1", configurable=True, default_value="", description="Optional field for calibrating your Tilt. Enter data in the format uncalibrated=actual"),
@@ -109,14 +118,16 @@ class BLESensor(CBPiSensor):
     
     def __init__(self, cbpi, id, props):
         super(BLESensor, self).__init__(cbpi, id, props)
-        global titl_cache
+        global tilt_cache
         self.value = 0
         self.calibration_equ=""
         self.x_cal_1=self.props.get("Calibration Point 1","")
         self.x_cal_2=self.props.get("Calibration Point 2","")
         self.x_cal_3=self.props.get("Calibration Point 3","")
 
-        self.color=self.props.get("Sensor color","")
+        self.device_color=self.props.get("Sensor color","Green")
+        self.device = "_0" if self.props.get("Hardware","Hydrom / Tilt") == "Hydrom / Tilt" else "_1"
+        self.color = self.device_color + self.device
         self.sensorType=self.props.get("Data Type","Temperature")
         self.unitsGravity=self.props.get("Gravity Units","Plato")
         self.time_old = float(0)
@@ -148,7 +159,7 @@ class BLESensor(CBPiSensor):
                     if current_time > self.time_old:
                         reading = calcGravity(tilt_cache[self.color]['Gravity'], self.unitsGravity)
                         reading = calibrate(reading, self.calibration_equ)
-                        reading = round(reading, 3)
+                        reading = round(reading, 4)
                         self.time_old = current_time
                         self.value = reading
                         self.log_data(self.value)

{cbpi4-BLEHydrom-0.0.6 → cbpi4-BLEHydrom-0.0.8/cbpi4_BLEHydrom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cbpi4-BLEHydrom
-Version: 0.0.6
+Version: 0.0.8
 Summary: CraftBeerPi4 Plugin for Hydrom and Tilt (BLE connection)
 Home-page: https://github.com/avollkopf/cbpi4-BLEHydrom
 Author: Alexander Vollkopf
@@ -47,11 +47,12 @@ Python needs also special rights, to access the bluetooth resources. Therefore y
 2. Click the **Add** button in the Sensor section, and fill out the sensor properties:
     1. **Name**: Give the sensor a name. This is specific to this sensor reading, and does not need to match the Tilt color. It can be something like Wort Gravity or Tilt Temperature.
     2. **Type**: Choose BLEHydrom.
-    3. **Tilt Color**: This should be set to the color of your Tilt or color config of your Hydrom
-    4. **Data Type**: Each Tilt has three types of data that it reports, the Temperature,Gravity and RSSI, so select the one that you are configuring for this particular sensor. 
-    5. **Gravity Units**: *This field is only required if Data Type is set to Gravity*. The Tilt converts its readings into Specific Gravity by default. However you can choose one of three types here and it will be converted to that unit automatically. The choices are SG (Specific Gravity), Brix (or °Bx), and Plato (or °P).
-    6. **Calibration Point 1-3***: *Optional*. These fields allow you to calibrate your Tilt by entering an uncalibrated reading from the Tilt and then the desired, calibrated value. The format to use is ***uncalibrated value* = *actual value*** (spacing is optional). More info on calibration is in the section below.
-    7. Once you have filled out the sensor fields, click **Add**.
+    3. **Tilt Color**: This should be set to the color of your Tilt or color config of your Hydrom.
+    4. **Hardware**: Here you must select if you are using a Tilt / Hydrom or one of the Tilt pro series. Pro series devices can be used in parallel with a Tilt or Hydrom of the same color.
+    5. **Data Type**: Each Tilt has three types of data that it reports, the Temperature,Gravity and RSSI, so select the one that you are configuring for this particular sensor. 
+    6. **Gravity Units**: *This field is only required if Data Type is set to Gravity*. The Tilt converts its readings into Specific Gravity by default. However you can choose one of three types here and it will be converted to that unit automatically. The choices are SG (Specific Gravity), Brix (or °Bx), and Plato (or °P).
+    7. **Calibration Point 1-3***: *Optional*. These fields allow you to calibrate your Tilt by entering an uncalibrated reading from the Tilt and then the desired, calibrated value. The format to use is ***uncalibrated value* = *actual value*** (spacing is optional). More info on calibration is in the section below.
+    8. Once you have filled out the sensor fields, click **Add**.
 3. Repeat the above steps if you want additional sensors for the other data types that your Tilt reports, or if you have more than one Tilt, you can create sensors for those devices as well.
 4. You can now add any of the Tilt sensors to kettles or fermenters in your brewery, or you can view their data on the dashboard or graph their data with the charts.
 
@@ -66,13 +67,15 @@ You can use the Calibration Point fields to calibrate your Tilt, much like when
 
 ### Changelog:
 
-- 10.01.23: (0.0.6) Test with PyBluez Mod as interim solution
-- 01.12.23: (0.0.6.a1) updated requirements
-- 11.05.22: (0.0.5) Updated README (removed cbpi add)
-- 25.02.22: (0.0.4) Updated README
-- 16.01.22: (0.0.3) Reduced mqtt traffic (->cbpi 4.0.1.2 required!!)
-- 08.01.22: (0.0.2) Added RSSI value from blescan as parameter
-- 07.01.22: (0.0.1) Initial Commit
+- 13.07.24: (0.0.8) Addition of Tilt Pro series.
+- 13.04.24: (0.0.7) Test with new gattlib-dbus package.
+- 10.01.23: (0.0.6) Test with PyBluez Mod as interim solution.
+- 01.12.23: (0.0.6.a1) updated requirements.
+- 11.05.22: (0.0.5) Updated README (removed cbpi add).
+- 25.02.22: (0.0.4) Updated README.
+- 16.01.22: (0.0.3) Reduced mqtt traffic (->cbpi 4.0.1.2 required!!).
+- 08.01.22: (0.0.2) Added RSSI value from blescan as parameter.
+- 07.01.22: (0.0.1) Initial Commit.
 
 
 

cbpi4-BLEHydrom-0.0.8/cbpi4_BLEHydrom.egg-info/requires.txt

@@ -0,0 +1,2 @@
+PyBluez@ https://github.com/AcrossTheCloud/pybluez/archive/master.zip#egg=PyBluez-0.30
+gattlib-dbus@ https://github.com/oscaracena/pygattlib/archive/dbus.zip#egg=gattlib-dbus-24.1.8

{cbpi4-BLEHydrom-0.0.6 → cbpi4-BLEHydrom-0.0.8}/setup.py

@@ -18,7 +18,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 
 setup(name='cbpi4-BLEHydrom',
-      version='0.0.6',
+      version='0.0.8',
       description='CraftBeerPi4 Plugin for Hydrom and Tilt (BLE connection)',
       author='Alexander Vollkopf',
       author_email='avollkopf@web.de',
@@ -31,7 +31,7 @@ setup(name='cbpi4-BLEHydrom',
       packages=['cbpi4-BLEHydrom'],
       install_requires=[
       'PyBluez @ https://github.com/AcrossTheCloud/pybluez/archive/master.zip#egg=PyBluez-0.30',
-      'gattlib==0.20210616',
+      'gattlib-dbus @ https://github.com/oscaracena/pygattlib/archive/dbus.zip#egg=gattlib-dbus-24.1.8',
       ],
       long_description=long_description,
       long_description_content_type='text/markdown'

cbpi4-BLEHydrom-0.0.6/cbpi4_BLEHydrom.egg-info/requires.txt

@@ -1,2 +0,0 @@
-PyBluez@ https://github.com/AcrossTheCloud/pybluez/archive/master.zip#egg=PyBluez-0.30
-gattlib==0.20210616