From dbd351247bc2e4db7212acf59a7fc7a5be81987b Mon Sep 17 00:00:00 2001
From: Dave Horton <61114342+DavesCodeMusings@users.noreply.github.com>
Date: Mon, 24 Mar 2025 20:35:29 -0500
Subject: [PATCH 1/3] bthome.py remove repetition

---
 bthome.py | 56 ++++++++++++++++---------------------------------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/bthome.py b/bthome.py
index d0a62bb..4851644 100644
--- a/bthome.py
+++ b/bthome.py
@@ -41,37 +41,22 @@ def _pack_device_name():
     device_name_bytes = bytes([len(device_name_bytes)]) + device_name_bytes
     return device_name_bytes
 
-# Functions to conver integer or float values to little endian fixed-point decimal
-def _pack_battery():
-    return pack('BB', BATTERY_UINT8, battery)
-
-def _pack_temperature(object_id):
-    if object_id == TEMPERATURE_SINT16:
-        temperature_bytes = pack('<Bh', TEMPERATURE_SINT16, round(temperature * _TEMPERATURE_SINT16_SCALING))
-    else:
-        temperature_bytes = bytes()
-    return temperature_bytes
-
-def _pack_humidity(object_id):
-    if object_id == HUMIDITY_UINT16:
-        humidity_bytes = pack('<Bh', HUMIDITY_UINT16, round(humidity * _HUMIDITY_UINT16_SCALING))
-    else:
-        humidity_bytes = bytes()
-    return humidity_bytes
-
-def _pack_pressure(object_id):
-    if object_id == PRESSURE_UINT24:
-        pressure_bytes = pack('<BL', PRESSURE_UINT24, round(pressure * _PRESSURE_UINT24_SCALING))[:-1]
-    else:
-        pressure_bytes = bytes()
-    return pressure_bytes
-
-def _pack_illuminance(object_id):
-    if object_id == ILLUMINANCE_UINT24:
-        illuminance_bytes = pack('<BL', ILLUMINANCE_UINT24, round(illuminance * _ILLUMINANCE_UINT24_SCALING))[:-1]
+# The BTHome object ID determines the number of bytes and fixed point decimal multiplier.
+def _pack_bthome_data(object_id):
+    if object_id == BATTERY_UINT8:
+        bthome_bytes = pack('BB', BATTERY_UINT8, battery)
+    elif object_id == TEMPERATURE_SINT16:
+        bthome_bytes = pack('<Bh', TEMPERATURE_SINT16, round(temperature * _TEMPERATURE_SINT16_SCALING))
+    elif object_id == HUMIDITY_UINT16:
+        bthome_bytes = pack('<Bh', HUMIDITY_UINT16, round(humidity * _HUMIDITY_UINT16_SCALING))
+    elif object_id == PRESSURE_UINT24:
+        bthome_bytes = pack('<BL', PRESSURE_UINT24, round(pressure * _PRESSURE_UINT24_SCALING))[:-1]
+    elif object_id == ILLUMINANCE_UINT24:
+        bthome_bytes = pack('<BL', ILLUMINANCE_UINT24, round(illuminance * _ILLUMINANCE_UINT24_SCALING))[:-1]
     else:
-        illuminance_bytes = bytes()
-    return illuminance_bytes
+        bthome_bytes = bytes()
+    print("Packing with data:", bthome_bytes.hex().upper())
+    return bthome_bytes
 
 # Concatenate an arbitrary number of sensor readings using parameters of sensor data constants to indicate what's included.
 def _pack_service_data(*args):
@@ -79,16 +64,7 @@ def _pack_service_data(*args):
     service_data_bytes += pack('<h', _SERVICE_UUID16)
     service_data_bytes += pack('B', _DEVICE_INFO_FLAGS)
     for object_id in args:
-        if object_id == BATTERY_UINT8:
-            service_data_bytes += _pack_battery()
-        if object_id == TEMPERATURE_SINT16:
-            service_data_bytes += _pack_temperature(TEMPERATURE_SINT16)
-        if object_id == HUMIDITY_UINT16:
-            service_data_bytes += _pack_humidity(HUMIDITY_UINT16)
-        if object_id == PRESSURE_UINT24:
-            service_data_bytes += _pack_pressure(PRESSURE_UINT24)
-        if object_id == ILLUMINANCE_UINT24:
-            service_data_bytes += _pack_illuminance(ILLUMINANCE_UINT24)
+        service_data_bytes += _pack_bthome_data(object_id)
     service_data_bytes = pack('B', len(service_data_bytes)) + service_data_bytes
     return service_data_bytes
 

From 25cc2bd0926c44e68b0ed272064b66dc1570f06b Mon Sep 17 00:00:00 2001
From: DavesCodeMusings <DavesCodeMusings@users.noreply.github.com>
Date: Tue, 25 Mar 2025 01:35:41 +0000
Subject: [PATCH 2/3] GitHub Actions

---
 bthome.mpy | Bin 1046 -> 896 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bthome.mpy b/bthome.mpy
index 5cd39ab4a3fa6390783a1e9b556cc504b1647145..5ca2c780efeefe79bec9db441e190047f3962260 100644
GIT binary patch
delta 586
zcmZ9IPiqrF7{+Hd+fCA%b~9Ng)y8DIe{5R2A;jrIMI>$_6trN4f{TY3x4{(u^$=)p
zJG<E+<km|+gU4Mzfh!*T1{yv0=Benxo3m*}kl`JkcYgD{!#pP$nijSNP^ogq!jr1f
zIp{hsI?o3EH?Mk~z3!k3c*_F9ZL6Pb4}j3`9RdID@uwfIcbG}lYxNoQkXiO$KbH^p
z2Yos5+yZZjNZ`}v`b&A7R$Hx>BWtRrY3(2z<bzo%a%*rYRpKybQ;}zSro?03&KD&?
zOq&oddiaWuuMY82fJ-BMP0Zjj#T6A`nbk5YMRfsI8vth;5a${kE;LdY?>Kx=m&GjA
z3}bb*hBQ<rkbZ5o&}{F#8Gk!(l9%R8_#s4P>5>V~VpK$0MBoibV00Eo&iL`BoYSeH
z8~O%Yo4T#nLvPaFM!Y!hp$c(RvGt3F{-nLjjuw1$9mxva`$-^S<U0+A7i7rD@;?&O
zFqpJ$<`Dx%l)q%ht#P}t<%FXPI$~7)kKRK?0%EkH!pN2KCXkQ`2xmu5aPXPZCMwW7
zRbyRWtFiIY3E|?1iOb6H_anlcP8&&~%|wTt`*R;7lzUI$X>8q0?oR_C-1PhY(K|M8
h9@8y#g$23DyjcR05rxp(U>3BH#HD!dmuaAp^9M@ZoAv+z

delta 716
zcmZ{hO>YuG7=U*G7f^v^3L{{(+x_T*Ere`VOcP_sLSvKKLrpz29w;uGlt>#wY0{o{
zfF-fLH75NH-ei09B%b^Siuc|;HD0{=?m`n|VkVQ!GxNM3Ged(HA$F5x7INsEeQjiF
z?Yi-{_NLzLnw=9SpzDk<-RheAZL?GF9(7EHeX8#<^V9vkqy1*1**&@8cE>zCoJlWk
zf}5=tXb1HJ!(`4+e?AKNi-qF57N?`#@=A+83yPIW#o#4TlBB8~ZrDL@gzUNZA5q#$
zCs;06LL}28_xogiKpxoS;gBqFA;MF#C^AHVDZ-Rs$|^&`Dk2fpM`Eg<#MJ=7>MfE`
zS&~$PB(-IP>>|&Fsg%#>as|AEc@5F;l?uLXPT}mw6x_mhN*4M&!hGUxiMbx*G+uHv
zw2U<5T#p^&IK@V29tXH+4=-wdqrbiyjVZJ!Z_A_pq`D0!Tpwq#AkfAy4Qc+dzJ}8p
z1EH=OSLhR09n91LsN%n>1#WvaiWT}y-jPT4q`CuX=WKAL8+Xep_+I^$8~lVq*Ia)%
z^M~Ne|M5?muauUhB;CyBS7cd{v)))PKp|pXXuh!nt9!!W_e;%p<pB|B*<Fun8`UqD
zy-D@CgCiPqHNJ#<uRA!_*AM{Q3?M%609psYwg=D`Kw{{E{>gGHd2g%vyqE1Ce}I;v
gDY~nO3j9(As)pVC4o;4Gk0Hpjg`V}z`z*)!1JOXvegFUf


From 396d848de0ba31f89285049e74927d5b95345682 Mon Sep 17 00:00:00 2001
From: Dave Horton <61114342+DavesCodeMusings@users.noreply.github.com>
Date: Mon, 24 Mar 2025 20:36:48 -0500
Subject: [PATCH 3/3] main.py remove misleading debug output

---
 main.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/main.py b/main.py
index f9c1ac7..d1f3a58 100644
--- a/main.py
+++ b/main.py
@@ -20,19 +20,14 @@
 print(hexlify(bluetooth_mac, ':').decode().upper())
 
 async def read_sensor():
-    bthome.temperature = 25
+    bthome.temperature = 25  # Mocked up data for testing purposes.
     bthome.humidity = 50.55
-    print(f"BTHome flags: {bthome._ADVERT_FLAGS.hex().upper()}")
-    print(f"Device name: {bthome._pack_device_name().hex().upper()}")
-    print(f"Temperature data: {bthome._pack_temperature(bthome.TEMPERATURE_SINT16).hex().upper()}")
-    print(f"Humidity data: {bthome._pack_humidity(bthome.HUMIDITY_UINT16).hex().upper()}")
-    print(f"BTHome advertisement: {bthome.pack_advertisement(bthome.TEMPERATURE_SINT16, bthome.HUMIDITY_UINT16).hex().upper()}")
     await asyncio.sleep(AWAKE_TIME_SECS)
     print("Going to sleep.")
     deepsleep(SLEEP_TIME_SECS * 1000)  # Helps mitigate sensor self-heating.
 
 async def communicate_readings():
-    print("Advertising availability of data.")
+    print("Constructing advertising payload")
     while True:
         async with await aioble.advertise(
             BLE_ADV_INTERVAL_uS,