docs: update reader

Author: nmb735

src/reader.py

@@ -3,7 +3,6 @@
 # Obtains data. It connects to the MQTT broker and subscribes to the topics 'data/meas' and 'rfid/tde'. The script sends a message to # 
 # the topic 'data/meas' with the parameters 'pos_x', 'pos_y', 'pos_z', and 'moist'. The script receives the RFID data from the topic  #
 # 'rfid/tde' and writes the data to a file.                                                                                           #
-# Filepath: RFID-Reader-FX7500/src/reader.py                                                                                          #
 # =================================================================================================================================== #
 
 
@@ -14,8 +13,7 @@
 import time  # Time access and conversions.                                                                                           #
 import paho.mqtt.client as mqtt  # MQTT version 3.1/3.1.1 client class.                                                               #
 import os  # Miscellaneous operating system interfaces.                                                                               #
-import datetime # Basic date and time types.                                                                                          #
-import pytz # World Timezone Definitions.                                                                                             #
+import pytz  # World Timezone Definitions.                                                                                            #
 # =================================================================================================================================== #
 
 
@@ -53,7 +51,7 @@ def filename_generator(tag: int, freq: float, distance: float, obstacle: int) ->
     Returns:
         str: The generated filename.
     """
-    tags = ['Belt_G2iL', 'Belt_9XM', 'Dogbone_Monza 4D', 'Frog_3D', 'Miniweb_G2iL', 'Shortdipole_G2iL', 'Shortdipole_Monza_R6', 
+    tags = ['Belt_G2iL', 'Belt_9XM', 'Dogbone_Monza_4D', 'Frog_3D', 'Miniweb_G2iL', 'Shortdipole_G2iL', 'Shortdipole_Monza_R6', 
             'Spine', 'Trap', 'Viper', 'Web_G2iL', 'Web_U9']
     obstacles = ['None', 'Cardboard', 'Metal', 'Wood', 'Human_Hand', 'Human_Body', 'Soil_(Dry)']
 
@@ -71,7 +69,7 @@ def filename_generator(tag: int, freq: float, distance: float, obstacle: int) ->
         raise ValueError(f"Invalid distance: {distance}")
     # Get the current date and time with timezone
     tz = pytz.timezone('CET')
-    current_time = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+    current_time = datetime.datetime.now(tz).strftime("%Y%m%d_%H%M%S")
 
     return f"./data/03022025/{current_time}_{tags[tag]}_{freq}MHz_{distance}m_{obstacles[obstacle]}.csv"
 
@@ -88,24 +86,15 @@ def validate_filename(filename: str) -> bool:
     try:
         directory = os.path.dirname(filename)
         if not os.path.exists(directory):
-            os.makedirs(directory, exist_ok=True)
-            print(f"Directory created: {directory}")
-        else:
-            print(f"Directory already exists: {directory}")
+            os.makedirs(directory)
         # Try opening the file to ensure it can be written to
-        with open(filename, 'a+') as f:
-            if os.path.getsize(filename) == 0:
-                headers = [
-                    'n_group', 'eventNum', 'peakRssi', 'phase', 'channel', 'pos_x', 'pos_y', 'pos_z', 'moist', 
-                    'antenna', 'reads', 'idHex', 'format', 'PC', 'CRC', 'MAC', 'hostName', 'time_utc', 'type'
-                ]
-                f.write(','.join(headers) + '\n')
-        print(f"Filename is valid: {filename}")
+        with open(filename, 'w') as f:
+            pass
         return True
     except Exception as e:
         print(f"Error validating filename: {e}")
         return False
-    
+
 def on_connect(client: mqtt.Client, userdata: dict, flags: dict, reason_code: int, properties: dict) -> None:
     """
     This function is called when the client is connected to the MQTT broker.
@@ -124,7 +113,6 @@ def on_connect(client: mqtt.Client, userdata: dict, flags: dict, reason_code: in
     client.subscribe("data/meas")
     client.subscribe("rfid/tde")
 
-
 def on_message(client: mqtt.Client, userdata: dict, msg: mqtt.MQTTMessage, filename: str) -> None:
     """
     This function is called when a message is received from the MQTT broker.
@@ -139,29 +127,11 @@ def on_message(client: mqtt.Client, userdata: dict, msg: mqtt.MQTTMessage, filen
         None.
     """
     if msg.topic == 'rfid/tde':
-        userdata['n_reads'] += 1
-        data = json.loads(msg.payload)
-        time_utc = time.strptime(data["timestamp"], '%Y-%m-%dT%H:%M:%S.%f%z')
-        time_utc = time.mktime(time_utc) + float(data["timestamp"][-9:-5]) + 6 * 3600.
-        print(msg.topic + f' ({datetime.datetime.fromtimestamp(time_utc)}) ' + str(msg.payload))
-
-        pos_y = userdata['pos_y'] + (.0 if 'e200' in data['data']['idHex'] else -.11)
-        n_group, pos_x, pos_z, moist = userdata['n_group'], userdata['pos_x'], userdata['pos_z'], userdata['moist']
-        with open(filename, 'a+') as f:
-            f.write(
-                '{n_group},\t{eventNum},\t{peakRssi},\t{phase},\t{channel},\t{pos_x},\t{pos_y},\t{pos_z},\t'
-                '{moist},\t{antenna},\t{reads},\t{idHex},\t{format},\t{PC},\t{CRC},\t{MAC},\t{hostName}'.format(
-                    **data['data'], n_group=n_group, pos_y=pos_y, pos_x=pos_x, pos_z=pos_z, moist=moist
-                ) + f',\t{time_utc},\t{data["type"]}\n'
-            )
-        if userdata['n_reads'] > 100:
-            # client.publish('rfid/c', b'{"command": "stop", "command_id": "321", "payload": {}}')
-            # client.disconnect()
-            pass
+        with open(filename, 'a') as f:
+            f.write(msg.payload.decode() + '\n')
     elif msg.topic == 'data/meas':
-        userdata['n_group'] += 1
-        userdata.update(json.loads(msg.payload))
-        # mosquitto_pub -h 158.109.74.35 -p 1883 -t 'data/meas' -m '{"pos_x": 0, "pos_y": -.5, "pos_z": 0, "moist": 0}'
+        data = json.loads(msg.payload.decode())
+        userdata.update(data)
 # =================================================================================================================================== #
 
 
@@ -180,9 +150,11 @@ def read(filename: str, server_ip: str, server_port: int, duration: float) -> No
     Returns:
         None
     """
-    validate_filename(filename)
+    if not validate_filename(filename):
+        raise ValueError("Invalid filename or directory cannot be created.")
+    
     state = {'n_reads': 0, 'n_group': 0, 'pos_x': .0, 'pos_y': -1.205, 'pos_z': .0, 'depth': .0, 'moist': .0}  # angle
-    mqttc = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
+    mqttc = mqtt.Client()
     mqttc.on_connect = on_connect
     mqttc.on_message = lambda client, userdata, msg: on_message(client, userdata, msg, filename)
     mqttc.user_data_set(state)
@@ -192,16 +164,12 @@ def read(filename: str, server_ip: str, server_port: int, duration: float) -> No
 
     try:
         mqttc.loop_start()
-        start_time = time.monotonic()
-        while time.monotonic() - start_time < duration:
-            mqttc.publish('data/meas', '{{"pos_x": {pos_x}, "pos_y": {pos_y}, "pos_z": {pos_z},'
-                                       ' "moist": {moist}}}'.format(**state).encode())
-            time.sleep(1.)
-        # mqttc.loop_forever()
+        time.sleep(duration)
     except FileNotFoundError as e:
-        print(e)
+        print(f"File not found: {e}")
     finally:
-        mqttc.publish('rfid/c', b'{"command": "stop", "command_id": "321", "payload": {}}')
         mqttc.loop_stop()
+        mqttc.disconnect()
+        
     print('FINISH')
 # =================================================================================================================================== #