ents 2.3.4__py3-none-any.whl → 2.3.5__py3-none-any.whl

ents/__init__.py

@@ -3,10 +3,11 @@ from .proto.encode import (
     encode_power_measurement,
     encode_teros12_measurement,
     encode_phytos31_measurement,
+    encode_user_configuration,
     encode_bme280_measurement,
 )
 
-from .proto.decode import decode_response, decode_measurement
+from .proto.decode import decode_response, decode_measurement, decode_user_configuration
 
 from .proto.esp32 import encode_esp32command, decode_esp32command
 
@@ -20,4 +21,6 @@ __all__ = [
     "decode_measurement",
     "encode_esp32command",
     "decode_esp32command",
+    "encode_user_configuration",
+    "decode_user_configuration",
 ]

ents/cli.py

@@ -29,6 +29,13 @@ from .proto.encode import (
 from .proto.decode import decode_measurement, decode_response
 from .proto.esp32 import encode_esp32command, decode_esp32command
 
+from .proto.sensor import (
+    encode_repeated_sensor_measurements,
+    decode_repeated_sensor_measurements,
+    encode_sensor_response,
+    decode_sensor_response,
+)
+
 from .simulator.node import NodeSimulator
 
 
@@ -37,17 +44,68 @@ def entry():
 
     parser = argparse.ArgumentParser()
 
-    subparsers = parser.add_subparsers(help="Ents Utilities")
+    subparsers = parser.add_subparsers(help="Ents Utilities", required=True)
 
     create_encode_parser(subparsers)
+    create_encode_generic_parser(subparsers)
     create_decode_parser(subparsers)
+    create_decode_generic_parser(subparsers)
     create_calib_parser(subparsers)
     create_sim_parser(subparsers)
+    create_sim_generic_parser(subparsers)
 
     args = parser.parse_args()
     args.func(args)
 
 
+def create_sim_generic_parser(subparsers):
+    """Creates the generic simulation subparser
+
+    Args:
+        subparsers: Reference to subparser group
+    Returns:
+        Reference to new subparser
+    """
+
+    sim_p = subparsers.add_parser("sim_generic", help="Simluate generic sensor uploads")
+    sim_p.add_argument(
+        "--url",
+        required=True,
+        type=str,
+        help="URL of the dirtviz instance (default: http://localhost:8000)",
+    )
+    sim_p.add_argument(
+        "--mode",
+        required=True,
+        choices=["batch", "stream"],
+        type=str,
+        help="Upload mode",
+    )
+    sim_p.add_argument(
+        "--sensor",
+        required=True,
+        type=str,
+        nargs="+",
+        help="Type of sensor to simulate",
+    )
+    sim_p.add_argument(
+        "--min", type=float, default=-1.0, help="Minimum sensor value (default: -1.0)"
+    )
+    sim_p.add_argument(
+        "--max", type=float, default=1.0, help="Maximum sensor value (default: 1.0)"
+    )
+    sim_p.add_argument("--cell", required=True, type=int, help="Cell Id")
+    sim_p.add_argument("--logger", required=True, type=int, help="Logger Id")
+    sim_p.add_argument("--start", type=str, help="Start date")
+    sim_p.add_argument("--end", type=str, help="End date")
+    sim_p.add_argument(
+        "--freq", default=10.0, type=float, help="Frequency of uploads (default: 10s)"
+    )
+    sim_p.set_defaults(func=simulate_generic)
+
+    return sim_p
+
+
 def create_sim_parser(subparsers):
     """Creates the simulation subparser
 
@@ -90,6 +148,49 @@ def create_sim_parser(subparsers):
     return sim_p
 
 
+def simulate_generic(args):
+    simulation = NodeSimulator(
+        cell=args.cell,
+        logger=args.logger,
+        sensors=args.sensor,
+        _min=args.min,
+        _max=args.max,
+    )
+
+    if args.mode == "batch":
+        if (args.start is None) or (args.end is None):
+            raise ValueError("Start and end date must be provided for batch mode.")
+
+        # format dates
+        curr_dt = datetime.fromisoformat(args.start)
+        end_dt = datetime.fromisoformat(args.end)
+
+        # create list of measurements
+        while curr_dt <= end_dt:
+            ts = int(curr_dt.timestamp())
+            simulation.measure(ts)
+            curr_dt += timedelta(seconds=args.freq)
+
+        # send measurements
+        while simulation.send_next(args.url):
+            print(simulation)
+
+        print("Done!")
+
+    elif args.mode == "stream":
+        print("Use CTRL+C to stop the simulation")
+        try:
+            while True:
+                dt = datetime.now()
+                ts = int(dt.timestamp())
+                simulation.measure(ts)
+                while simulation.send_next(args.url):
+                    print(simulation)
+                time.sleep(args.freq)
+        except KeyboardInterrupt as _:
+            print("Stopping simulation")
+
+
 def simulate(args):
     simulation = NodeSimulator(
         cell=args.cell,
@@ -169,6 +270,133 @@ def create_calib_parser(subparsers):
     return calib_p
 
 
+def create_encode_generic_parser(subparsers):
+    """Create generic encode command subparser
+
+    Args:
+        subparsers: Reference to subparser group
+
+    Returns:
+        Reference to new subparser
+    """
+
+    encode_parser = subparsers.add_parser("encode_generic", help="Encode generic data")
+
+    print_format = encode_parser.add_mutually_exclusive_group()
+    print_format.add_argument(
+        "--hex", action="store_true", help="Print as hex values (default)"
+    )
+    print_format.add_argument(
+        "--raw", action="store_true", help="Print raw bytes object"
+    )
+    print_format.add_argument(
+        "--c", action="store_true", help="Print bytes for copying to c"
+    )
+
+    encode_subparsers = encode_parser.add_subparsers(
+        title="Message type", dest="type", required=True
+    )
+
+    # sensor measurement
+    measurement_parser = encode_subparsers.add_parser(
+        "meas", help='Proto "Measurement" message'
+    )
+    measurement_parser.add_argument("--ts", type=int, help="Unix epoch timestamp")
+    measurement_parser.add_argument("--cell", type=int, help="Cell Id")
+    measurement_parser.add_argument("--logger", type=int, help="Logger Id")
+    measurement_parser.add_argument("--idx", type=int, default=1, help="Upload index")
+    measurement_parser.add_argument(
+        "--sensor",
+        nargs=2,
+        metavar=("type", "value"),
+        action="append",
+        required=True,
+        help="Specify as: --sensor <type> <value>",
+    )
+    measurement_parser.set_defaults(func=handle_encode_generic_measurement)
+
+    # response
+    response_parser = encode_subparsers.add_parser(
+        "resp", help='Proto "Response" message'
+    )
+    response_parser.add_argument(
+        "--resp",
+        nargs=2,
+        metavar=("idx", "status"),
+        action="append",
+        required=True,
+        help="Specify as: --resp <idx> <status>",
+    )
+    response_parser.set_defaults(func=handle_encode_generic_response)
+
+    return encode_parser
+
+
+def parse_number(s: str) -> tuple:
+    try:
+        i = int(s)
+        if i >= 0:
+            return i, "unsignedInt"
+        return i, "signedInt"
+    except ValueError:
+        pass
+
+    try:
+        return float(s), "decimal"
+    except ValueError:
+        pass
+
+    raise ValueError(f"Invalid numeric value: {s}")
+
+
+def handle_encode_generic_measurement(args):
+    """Take arguments and encode a repeated senosr measurement message"""
+
+    meas = {
+        "meta": {
+            "ts": args.ts,
+            "cellId": args.cell,
+            "loggerId": args.logger,
+        },
+        "measurements": [],
+    }
+
+    for s in args.sensor:
+        val, val_type = parse_number(s[1])
+        meas["measurements"].append(
+            {
+                "type": s[0],
+                val_type: val,
+                "idx": args.idx,
+            }
+        )
+        args.idx += 1
+
+    data = encode_repeated_sensor_measurements(meas)
+    print_data(args, data)
+
+
+def handle_encode_generic_response(args):
+    """Takes arguments and encode a sensor response message"""
+
+    resp = {
+        "responses": [],
+    }
+
+    for r in args.resp:
+        idx = int(r[0])
+        status = r[1]
+        resp["responses"].append(
+            {
+                "uploadIndex": idx,
+                "status": status,
+            }
+        )
+
+    data = encode_sensor_response(resp)
+    print_data(args, data)
+
+
 def create_encode_parser(subparsers):
     """Create encode command subparser
 
@@ -192,14 +420,19 @@ def create_encode_parser(subparsers):
         "--c", action="store_true", help="Print bytes for copying to c"
     )
 
-    encode_subparsers = encode_parser.add_subparsers(title="Message type", dest="type")
+    encode_subparsers = encode_parser.add_subparsers(
+        title="Message type",
+        dest="type",
+        required=True,
+    )
 
     def create_measurement_parser(encode_subparsers):
         measurement_parser = encode_subparsers.add_parser(
             "measurement", help='Proto "Measurement" message'
         )
         measurement_subparser = measurement_parser.add_subparsers(
-            title="Measurement type"
+            title="Measurement type",
+            required=True,
         )
 
         # metadata
@@ -246,7 +479,9 @@ def create_encode_parser(subparsers):
             "esp32command", help='Proto "Esp32Command" message'
         )
         esp32command_subparser = esp32command_parser.add_subparsers(
-            title="type", help="PageCommand"
+            title="type",
+            help="PageCommand",
+            required=True,
         )
 
         test_parser = esp32command_subparser.add_parser("test", help="TestCommand")
@@ -383,6 +618,55 @@ def print_bytes_c(data: bytes) -> str:
     print(f"size_t data_len = {len(hex_str)};")
 
 
+def create_decode_generic_parser(subparsers):
+    """Create generic decode command parser
+
+    Args:
+        subparsers: Reference to subparser group
+
+    Returns:
+        Reference to new subparser
+    """
+
+    decode_parser = subparsers.add_parser("decode_generic", help="Decode generic data")
+
+    decode_subparsers = decode_parser.add_subparsers(
+        title="Message type",
+        dest="type",
+        required=True,
+    )
+
+    decode_parser.add_argument(
+        "data", type=str, help="Protobuf serialized data in hex format"
+    )
+
+    # sensor measurement
+    measurement_parser = decode_subparsers.add_parser(
+        "meas", help='Proto "Measurement" message'
+    )
+    measurement_parser.set_defaults(func=handle_decode_generic_measurement)
+
+    # response
+    response_parser = decode_subparsers.add_parser(
+        "resp", help='Proto "Response" message'
+    )
+    response_parser.set_defaults(func=handle_decode_generic_response)
+
+    return decode_parser
+
+
+def handle_decode_generic_measurement(args):
+    data = bytes.fromhex(args.data)
+    vals = decode_repeated_sensor_measurements(data)
+    print(vals)
+
+
+def handle_decode_generic_response(args):
+    data = bytes.fromhex(args.data)
+    vals = decode_sensor_response(data)
+    print(vals)
+
+
 def create_decode_parser(subparsers):
     """Create decode command parser
 
@@ -395,7 +679,11 @@ def create_decode_parser(subparsers):
 
     decode_parser = subparsers.add_parser("decode", help="Decode data")
 
-    decode_subparsers = decode_parser.add_subparsers(title="Message type", dest="type")
+    decode_subparsers = decode_parser.add_subparsers(
+        title="Message type",
+        dest="type",
+        required=True,
+    )
 
     # measurement
     measurement_parser = decode_subparsers.add_parser(

ents/config/user_config.py

@@ -24,10 +24,7 @@ import sys
 import serial
 import serial.tools.list_ports
 import re  # For validating URL input
-from ents.proto import (
-    encode_user_configuration,
-    decode_user_configuration,
-)
+from ..proto import encode_user_configuration, decode_user_configuration
 
 
 class Ui_MainWindow(object):

ents/proto/sensor.py

@@ -0,0 +1,290 @@
+"""Module for sensor measurements
+
+Encode/decoding functions are wrappers around the protobuf messages. These take
+in the json dictionary format of the messages and return serialized byte
+arrays.
+
+Format/parse functions implement the protocol for repeated sensor measurements.
+These take in a list of measurements and automatically optimize repeated
+metadata fields.
+"""
+
+from google.protobuf.json_format import MessageToDict, ParseDict
+
+from .sensor_pb2 import (
+    SensorMeasurement,
+    RepeatedSensorMeasurements,
+    SensorType,
+    RepeatedSensorResponses,
+)
+
+
+def parse_sensor_measurement(data: bytes) -> list:
+    """Parses a sensor measurement into a usable dictionary.
+
+    Function does the following:
+        1. Decodes the serialized byte array
+        2. Updates metadata for each measurement if missing
+        3. Adds names, descriptions, and units to metadata
+
+    Args:
+        data: Byte array of message.
+
+    Returns:
+        Dictionary of sensor measurement.
+    """
+
+    meas = decode_repeated_sensor_measurements(data)
+    meas = update_repeated_metadata(meas)
+    for m in meas["measurements"]:
+        sensor_data = get_sensor_data(m["type"])
+        m.update(sensor_data)
+
+    return meas
+
+
+def format_sensor_measurement(meas: list) -> bytes:
+    """Formats a sensor measurement dictionary into a serialized byte array.
+
+    Function does the following:
+        1. Uses top level metadata for duplicate measurement metadata fields
+        2. Encodes the dictionary into a serialized byte array
+
+    Args:
+        meas: Dictionary of sensor measurement.
+
+    Returns:
+        Byte array of serialized message.
+    """
+
+    # TODO Implement optimization of repeated metadata fields
+    meas_dict = {
+        "measurements": meas,
+    }
+
+    data = encode_repeated_sensor_measurements(meas_dict)
+    return data
+
+
+def get_sensor_data(meas_type: int) -> dict:
+    """Gets sensor data information.
+
+    Args:
+        meas_type: Sensor measurement dictionary.
+
+    Returns:
+        Metadata associated with the sensor type.
+    """
+
+    SENSOR_DATA = {
+        SensorType.POWER_VOLTAGE: {
+            "name": "Voltage",
+            "unit": "mV",
+        },
+        SensorType.POWER_CURRENT: {
+            "name": "Current",
+            "unit": "uA",
+        },
+        SensorType.TEROS12_VWC: {
+            "name": "Volumetric Water Content",
+            "unit": "%",
+        },
+        SensorType.TEROS12_TEMP: {
+            "name": "Temperature",
+            "unit": "C",
+        },
+        SensorType.TEROS12_EC: {
+            "name": "Electrical Conductivity",
+            "unit": "uS/cm",
+        },
+        SensorType.PHYTOS31_VOLTAGE: {
+            "name": "Voltage",
+            "unit": "mV",
+        },
+        SensorType.PHYTOS31_LEAF_WETNESS: {
+            "name": "Leaf Wetness",
+            "unit": "%",
+        },
+        SensorType.BME280_PRESSURE: {
+            "name": "Pressure",
+            "unit": "kPa",
+        },
+        SensorType.BME280_TEMP: {
+            "name": "Temperature",
+            "unit": "C",
+        },
+        SensorType.BME280_HUMIDITY: {
+            "name": "Humidity",
+            "unit": "%",
+        },
+        SensorType.TEROS21_MATRIC_POT: {
+            "name": "Matric Potential",
+            "unit": "kPa",
+        },
+        SensorType.TEROS21_TEMP: {
+            "name": "Temperature",
+            "unit": "C",
+        },
+        SensorType.SEN0308_VOLTAGE: {
+            "name": "Voltage",
+            "unit": "mV",
+        },
+        SensorType.SEN0308_HUMIDITY: {
+            "name": "Humidity",
+            "unit": "%",
+        },
+        SensorType.SEN0257_VOLTAGE: {
+            "name": "Voltage",
+            "unit": "mV",
+        },
+        SensorType.SEN0257_PRESSURE: {
+            "name": "Pressure",
+            "unit": "kPa",
+        },
+        SensorType.YFS210C_FLOW: {
+            "name": "Flow Rate",
+            "unit": "L/min",
+        },
+    }
+
+    meta = SENSOR_DATA[SensorType.Value(meas_type)]
+    return meta
+
+
+def encode_sensor_measurement(meas_dict: dict) -> bytes:
+    meas = SensorMeasurement()
+    ParseDict(meas_dict, meas)
+
+    return meas.SerializeToString()
+
+
+def encode_repeated_sensor_measurements(meas_dict: dict) -> bytes:
+    """Encodes a SensorMeasurement message
+
+    Args:
+        rep_meas: Repeated sensor measurement dictionary.
+
+    Returns:
+        Byte array of encoded RepeatedSensorMeasurements message.
+    """
+
+    meas = RepeatedSensorMeasurements()
+    ParseDict(meas_dict, meas)
+
+    return meas.SerializeToString()
+
+
+def decode_sensor_measurement(data: bytes) -> dict:
+    """Decodes a SensorMeasurement message
+
+    Args:
+        data: Byte array of SensorMeasurement message.
+
+    Returns:
+        Decoded sensor measurement dictionary.
+    """
+
+    meas = SensorMeasurement()
+    meas.ParseFromString(data)
+
+    parsed_meas = MessageToDict(meas)
+
+    return parsed_meas
+
+
+def decode_repeated_sensor_measurements(data: bytes) -> dict:
+    """Decodes repeated sensor measurements
+
+    Args:
+        data: Byte array from RepeatedSensorMeasurements
+
+    Returns:
+        List of decoded sensor measurement dictionaries.
+    """
+
+    rep_meas = RepeatedSensorMeasurements()
+    rep_meas.ParseFromString(data)
+    return MessageToDict(rep_meas)
+
+
+def update_repeated_metadata(meas: dict) -> dict:
+    """Ensures every measurements has metadata field set.
+
+    If a measurement is missing the metadata field, it is filled in from the
+    repeated sensor measurement. Existing measurement metadata fields are not
+    overwritten.
+
+    Args:
+        meas: Sensor measurement dictionary.
+
+    Returns:
+        Updated sensor measurement dictionary.
+    """
+
+    # if top level meta does not exist, ensure all measurements have meta
+    if "meta" not in meas:
+        for m in meas["measurements"]:
+            if "meta" not in m:
+                raise ValueError("Repeated measurement missing metadata field.")
+    # otherwise populate missing measurement meta from top level
+    else:
+        for m in meas["measurements"]:
+            if "meta" not in m:
+                m["meta"] = meas["meta"]
+        del meas["meta"]
+
+    return meas
+
+
+def encode_sensor_response(resp_dict: dict) -> bytes:
+    """Encodes a sensor response message.
+
+    {
+        responses: [
+            {
+                status: int,
+                message: str,
+            },
+            ...
+        ]
+    }
+
+    Args:
+        resp_dict: Sensor response dictionary.
+
+    Returns:
+        Byte array of encoded SensorResponse message.
+    """
+
+    resp = RepeatedSensorResponses()
+    ParseDict(resp_dict, resp)
+
+    return resp.SerializeToString()
+
+
+def decode_sensor_response(data: bytes) -> dict:
+    """Decodes a sensor response message.
+
+    {
+        responses: [
+            {
+                status: int,
+                message: str,
+            },
+            ...
+        ]
+    }
+
+    Args:
+        data: Byte array of SensorResponse message.
+
+    Returns:
+        Decoded sensor response dictionary.
+    """
+
+    resp = RepeatedSensorResponses()
+    resp.ParseFromString(data)
+
+    parsed_resp = MessageToDict(resp)
+
+    return parsed_resp

ents/proto/sensor_pb2.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: sensor.proto
+# Protobuf Python Version: 6.33.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    33,
+    1,
+    '',
+    'sensor.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0csensor.proto\":\n\x08Metadata\x12\x0f\n\x07\x63\x65ll_id\x18\x01 \x01(\r\x12\x11\n\tlogger_id\x18\x02 \x01(\r\x12\n\n\x02ts\x18\x03 \x01(\r\":\n\x0eSensorResponse\x12\x0b\n\x03idx\x18\x01 \x01(\r\x12\x1b\n\x05\x65rror\x18\x02 \x01(\x0e\x32\x0c.SensorError\"=\n\x17RepeatedSensorResponses\x12\"\n\tresponses\x18\x01 \x03(\x0b\x32\x0f.SensorResponse\"\x9e\x01\n\x11SensorMeasurement\x12\x17\n\x04meta\x18\x01 \x01(\x0b\x32\t.Metadata\x12\x19\n\x04type\x18\x02 \x01(\x0e\x32\x0b.SensorType\x12\x16\n\x0cunsigned_int\x18\x03 \x01(\rH\x00\x12\x14\n\nsigned_int\x18\x04 \x01(\x05H\x00\x12\x11\n\x07\x64\x65\x63imal\x18\x05 \x01(\x01H\x00\x12\x0b\n\x03idx\x18\x06 \x01(\rB\x07\n\x05value\"z\n\x1aRepeatedSensorMeasurements\x12\x17\n\x04meta\x18\x01 \x01(\x0b\x32\t.Metadata\x12\x19\n\x04type\x18\x02 \x01(\x0e\x32\x0b.SensorType\x12(\n\x0cmeasurements\x18\x03 \x03(\x0b\x32\x12.SensorMeasurement*\x9a\x03\n\nSensorType\x12\x08\n\x04NONE\x10\x00\x12\x11\n\rPOWER_VOLTAGE\x10\x01\x12\x11\n\rPOWER_CURRENT\x10\x02\x12\x0f\n\x0bTEROS12_VWC\x10\x03\x12\x13\n\x0fTEROS12_VWC_ADJ\x10\x04\x12\x10\n\x0cTEROS12_TEMP\x10\x05\x12\x0e\n\nTEROS12_EC\x10\x06\x12\x14\n\x10PHYTOS31_VOLTAGE\x10\x07\x12\x19\n\x15PHYTOS31_LEAF_WETNESS\x10\x08\x12\x13\n\x0f\x42ME280_PRESSURE\x10\t\x12\x0f\n\x0b\x42ME280_TEMP\x10\n\x12\x13\n\x0f\x42ME280_HUMIDITY\x10\x0b\x12\x16\n\x12TEROS21_MATRIC_POT\x10\x0c\x12\x10\n\x0cTEROS21_TEMP\x10\r\x12\x13\n\x0fSEN0308_VOLTAGE\x10\x0e\x12\x14\n\x10SEN0308_HUMIDITY\x10\x0f\x12\x13\n\x0fSEN0257_VOLTAGE\x10\x10\x12\x14\n\x10SEN0257_PRESSURE\x10\x11\x12\x10\n\x0cYFS210C_FLOW\x10\x12\x12\x16\n\x12PCAP02_CAPACITANCE\x10\x13*b\n\x0bSensorError\x12\x06\n\x02OK\x10\x00\x12\x0b\n\x07GENERAL\x10\x01\x12\n\n\x06LOGGER\x10\x02\x12\x08\n\x04\x43\x45LL\x10\x03\x12\x0f\n\x0bUNSUPPORTED\x10\x04\x12\x0b\n\x07INVALID\x10\x05\x12\n\n\x06\x44\x45\x43ODE\x10\x06\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'sensor_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_SENSORTYPE']._serialized_start=485
+  _globals['_SENSORTYPE']._serialized_end=895
+  _globals['_SENSORERROR']._serialized_start=897
+  _globals['_SENSORERROR']._serialized_end=995
+  _globals['_METADATA']._serialized_start=16
+  _globals['_METADATA']._serialized_end=74
+  _globals['_SENSORRESPONSE']._serialized_start=76
+  _globals['_SENSORRESPONSE']._serialized_end=134
+  _globals['_REPEATEDSENSORRESPONSES']._serialized_start=136
+  _globals['_REPEATEDSENSORRESPONSES']._serialized_end=197
+  _globals['_SENSORMEASUREMENT']._serialized_start=200
+  _globals['_SENSORMEASUREMENT']._serialized_end=358
+  _globals['_REPEATEDSENSORMEASUREMENTS']._serialized_start=360
+  _globals['_REPEATEDSENSORMEASUREMENTS']._serialized_end=482
+# @@protoc_insertion_point(module_scope)

ents/proto/soil_power_sensor_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: soil_power_sensor.proto
-# Protobuf Python Version: 6.31.1
+# Protobuf Python Version: 6.33.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -12,7 +12,7 @@ from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
     6,
-    31,
+    33,
     1,
     '',
     'soil_power_sensor.proto'
@@ -24,67 +24,95 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17soil_power_sensor.proto\"E\n\x13MeasurementMetadata\x12\x0f\n\x07\x63\x65ll_id\x18\x01 \x01(\r\x12\x11\n\tlogger_id\x18\x02 \x01(\r\x12\n\n\x02ts\x18\x03 \x01(\r\"4\n\x10PowerMeasurement\x12\x0f\n\x07voltage\x18\x02 \x01(\x01\x12\x0f\n\x07\x63urrent\x18\x03 \x01(\x01\"P\n\x12Teros12Measurement\x12\x0f\n\x07vwc_raw\x18\x02 \x01(\x01\x12\x0f\n\x07vwc_adj\x18\x03 \x01(\x01\x12\x0c\n\x04temp\x18\x04 \x01(\x01\x12\n\n\x02\x65\x63\x18\x05 \x01(\r\"6\n\x12Teros21Measurement\x12\x12\n\nmatric_pot\x18\x01 \x01(\x01\x12\x0c\n\x04temp\x18\x02 \x01(\x01\"<\n\x13Phytos31Measurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\x12\x14\n\x0cleaf_wetness\x18\x02 \x01(\x01\"L\n\x11\x42ME280Measurement\x12\x10\n\x08pressure\x18\x01 \x01(\r\x12\x13\n\x0btemperature\x18\x02 \x01(\x05\x12\x10\n\x08humidity\x18\x03 \x01(\r\"7\n\x12SEN0308Measurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\x12\x10\n\x08humidity\x18\x02 \x01(\x01\"7\n\x12SEN0257Measurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\x12\x10\n\x08pressure\x18\x02 \x01(\x01\"\"\n\x12YFS210CMeasurement\x12\x0c\n\x04\x66low\x18\x01 \x01(\x01\"\xfc\x02\n\x0bMeasurement\x12\"\n\x04meta\x18\x01 \x01(\x0b\x32\x14.MeasurementMetadata\x12\"\n\x05power\x18\x02 \x01(\x0b\x32\x11.PowerMeasurementH\x00\x12&\n\x07teros12\x18\x03 \x01(\x0b\x32\x13.Teros12MeasurementH\x00\x12(\n\x08phytos31\x18\x04 \x01(\x0b\x32\x14.Phytos31MeasurementH\x00\x12$\n\x06\x62me280\x18\x05 \x01(\x0b\x32\x12.BME280MeasurementH\x00\x12&\n\x07teros21\x18\x06 \x01(\x0b\x32\x13.Teros21MeasurementH\x00\x12&\n\x07sen0308\x18\x07 \x01(\x0b\x32\x13.SEN0308MeasurementH\x00\x12&\n\x07sen0257\x18\x08 \x01(\x0b\x32\x13.SEN0257MeasurementH\x00\x12&\n\x07yfs210c\x18\t \x01(\x0b\x32\x13.YFS210CMeasurementH\x00\x42\r\n\x0bmeasurement\"X\n\x08Response\x12$\n\x04resp\x18\x01 \x01(\x0e\x32\x16.Response.ResponseType\"&\n\x0cResponseType\x12\x0b\n\x07SUCCESS\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"\xe9\x01\n\x0c\x45sp32Command\x12$\n\x0cpage_command\x18\x01 \x01(\x0b\x32\x0c.PageCommandH\x00\x12$\n\x0ctest_command\x18\x02 \x01(\x0b\x32\x0c.TestCommandH\x00\x12$\n\x0cwifi_command\x18\x03 \x01(\x0b\x32\x0c.WiFiCommandH\x00\x12*\n\x0fmicrosd_command\x18\x04 \x01(\x0b\x32\x0f.MicroSDCommandH\x00\x12\x30\n\x12irrigation_command\x18\x05 \x01(\x0b\x32\x12.IrrigationCommandH\x00\x42\t\n\x07\x63ommand\"\xb6\x01\n\x0bPageCommand\x12.\n\x0c\x66ile_request\x18\x01 \x01(\x0e\x32\x18.PageCommand.RequestType\x12\x17\n\x0f\x66ile_descriptor\x18\x02 \x01(\r\x12\x12\n\nblock_size\x18\x03 \x01(\r\x12\x11\n\tnum_bytes\x18\x04 \x01(\r\"7\n\x0bRequestType\x12\x08\n\x04OPEN\x10\x00\x12\t\n\x05\x43LOSE\x10\x01\x12\x08\n\x04READ\x10\x02\x12\t\n\x05WRITE\x10\x03\"\x82\x01\n\x0bTestCommand\x12\'\n\x05state\x18\x01 \x01(\x0e\x32\x18.TestCommand.ChangeState\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x05\"<\n\x0b\x43hangeState\x12\x0b\n\x07RECEIVE\x10\x00\x12\x13\n\x0fRECEIVE_REQUEST\x10\x01\x12\x0b\n\x07REQUEST\x10\x02\"\xfe\x01\n\x0bWiFiCommand\x12\x1f\n\x04type\x18\x01 \x01(\x0e\x32\x11.WiFiCommand.Type\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0e\n\x06passwd\x18\x03 \x01(\t\x12\x0b\n\x03url\x18\x04 \x01(\t\x12\x0c\n\x04port\x18\x08 \x01(\r\x12\n\n\x02rc\x18\x05 \x01(\r\x12\n\n\x02ts\x18\x06 \x01(\r\x12\x0c\n\x04resp\x18\x07 \x01(\x0c\"o\n\x04Type\x12\x0b\n\x07\x43ONNECT\x10\x00\x12\x08\n\x04POST\x10\x01\x12\t\n\x05\x43HECK\x10\x02\x12\x08\n\x04TIME\x10\x03\x12\x0e\n\nDISCONNECT\x10\x04\x12\x0e\n\nCHECK_WIFI\x10\x05\x12\r\n\tCHECK_API\x10\x06\x12\x0c\n\x08NTP_SYNC\x10\x07\"\x86\x03\n\x0eMicroSDCommand\x12\"\n\x04type\x18\x01 \x01(\x0e\x32\x14.MicroSDCommand.Type\x12\x10\n\x08\x66ilename\x18\x02 \x01(\t\x12&\n\x02rc\x18\x03 \x01(\x0e\x32\x1a.MicroSDCommand.ReturnCode\x12\x1c\n\x04meas\x18\x04 \x01(\x0b\x32\x0c.MeasurementH\x00\x12 \n\x02uc\x18\x05 \x01(\x0b\x32\x12.UserConfigurationH\x00\" \n\x04Type\x12\x08\n\x04SAVE\x10\x00\x12\x0e\n\nUSERCONFIG\x10\x01\"\xab\x01\n\nReturnCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x11\n\rERROR_GENERAL\x10\x01\x12\x1e\n\x1a\x45RROR_MICROSD_NOT_INSERTED\x10\x02\x12#\n\x1f\x45RROR_FILE_SYSTEM_NOT_MOUNTABLE\x10\x03\x12\x1d\n\x19\x45RROR_PAYLOAD_NOT_DECODED\x10\x04\x12\x19\n\x15\x45RROR_FILE_NOT_OPENED\x10\x05\x42\x06\n\x04\x64\x61ta\"\x94\x01\n\x11IrrigationCommand\x12%\n\x04type\x18\x01 \x01(\x0e\x32\x17.IrrigationCommand.Type\x12\'\n\x05state\x18\x02 \x01(\x0e\x32\x18.IrrigationCommand.State\"\x11\n\x04Type\x12\t\n\x05\x43HECK\x10\x00\"\x1c\n\x05State\x12\x08\n\x04OPEN\x10\x00\x12\t\n\x05\x43LOSE\x10\x01\"\xdc\x02\n\x11UserConfiguration\x12\x11\n\tlogger_id\x18\x01 \x01(\r\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\r\x12$\n\rUpload_method\x18\x03 \x01(\x0e\x32\r.Uploadmethod\x12\x17\n\x0fUpload_interval\x18\x04 \x01(\r\x12\'\n\x0f\x65nabled_sensors\x18\x05 \x03(\x0e\x32\x0e.EnabledSensor\x12\x15\n\rVoltage_Slope\x18\x06 \x01(\x01\x12\x16\n\x0eVoltage_Offset\x18\x07 \x01(\x01\x12\x15\n\rCurrent_Slope\x18\x08 \x01(\x01\x12\x16\n\x0e\x43urrent_Offset\x18\t \x01(\x01\x12\x11\n\tWiFi_SSID\x18\n \x01(\t\x12\x15\n\rWiFi_Password\x18\x0b \x01(\t\x12\x18\n\x10\x41PI_Endpoint_URL\x18\x0c \x01(\t\x12\x19\n\x11\x41PI_Endpoint_Port\x18\r \x01(\r*O\n\rEnabledSensor\x12\x0b\n\x07Voltage\x10\x00\x12\x0b\n\x07\x43urrent\x10\x01\x12\x0b\n\x07Teros12\x10\x02\x12\x0b\n\x07Teros21\x10\x03\x12\n\n\x06\x42ME280\x10\x04*\"\n\x0cUploadmethod\x12\x08\n\x04LoRa\x10\x00\x12\x08\n\x04WiFi\x10\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17soil_power_sensor.proto\"E\n\x13MeasurementMetadata\x12\x0f\n\x07\x63\x65ll_id\x18\x01 \x01(\r\x12\x11\n\tlogger_id\x18\x02 \x01(\r\x12\n\n\x02ts\x18\x03 \x01(\r\"4\n\x10PowerMeasurement\x12\x0f\n\x07voltage\x18\x02 \x01(\x01\x12\x0f\n\x07\x63urrent\x18\x03 \x01(\x01\"*\n\x17VoltageDeltaMeasurement\x12\x0f\n\x07voltage\x18\x01 \x01(\r\"*\n\x17\x43urrentDeltaMeasurement\x12\x0f\n\x07\x63urrent\x18\x01 \x01(\r\"%\n\x12VoltageMeasurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\"%\n\x12\x43urrentMeasurement\x12\x0f\n\x07\x63urrent\x18\x01 \x01(\x01\"K\n\x0fPowerDeltaEntry\x12\n\n\x02ts\x18\x01 \x01(\r\x12\x15\n\rvoltage_delta\x18\x02 \x01(\r\x12\x15\n\rcurrent_delta\x18\x03 \x01(\r\"E\n\x15PowerMeasurementDelta\x12\x15\n\rvoltage_delta\x18\x02 \x01(\r\x12\x15\n\rcurrent_delta\x18\x03 \x01(\r\"\\\n\x13RepeatedPowerDeltas\x12\x11\n\tlogger_id\x18\x01 \x01(\r\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\r\x12!\n\x07\x65ntries\x18\x03 \x03(\x0b\x32\x10.PowerDeltaEntry\"P\n\x12Teros12Measurement\x12\x0f\n\x07vwc_raw\x18\x02 \x01(\x01\x12\x0f\n\x07vwc_adj\x18\x03 \x01(\x01\x12\x0c\n\x04temp\x18\x04 \x01(\x01\x12\n\n\x02\x65\x63\x18\x05 \x01(\r\"6\n\x12Teros21Measurement\x12\x12\n\nmatric_pot\x18\x01 \x01(\x01\x12\x0c\n\x04temp\x18\x02 \x01(\x01\"<\n\x13Phytos31Measurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\x12\x14\n\x0cleaf_wetness\x18\x02 \x01(\x01\"L\n\x11\x42ME280Measurement\x12\x10\n\x08pressure\x18\x01 \x01(\r\x12\x13\n\x0btemperature\x18\x02 \x01(\x05\x12\x10\n\x08humidity\x18\x03 \x01(\r\"7\n\x12SEN0308Measurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\x12\x10\n\x08humidity\x18\x02 \x01(\x01\"7\n\x12SEN0257Measurement\x12\x0f\n\x07voltage\x18\x01 \x01(\x01\x12\x10\n\x08pressure\x18\x02 \x01(\x01\"\"\n\x12YFS210CMeasurement\x12\x0c\n\x04\x66low\x18\x01 \x01(\x01\"(\n\x11PCAP02Measurement\x12\x13\n\x0b\x63\x61pacitance\x18\x01 \x01(\x01\"\xa2\x03\n\x0bMeasurement\x12\"\n\x04meta\x18\x01 \x01(\x0b\x32\x14.MeasurementMetadata\x12\"\n\x05power\x18\x02 \x01(\x0b\x32\x11.PowerMeasurementH\x00\x12&\n\x07teros12\x18\x03 \x01(\x0b\x32\x13.Teros12MeasurementH\x00\x12(\n\x08phytos31\x18\x04 \x01(\x0b\x32\x14.Phytos31MeasurementH\x00\x12$\n\x06\x62me280\x18\x05 \x01(\x0b\x32\x12.BME280MeasurementH\x00\x12&\n\x07teros21\x18\x06 \x01(\x0b\x32\x13.Teros21MeasurementH\x00\x12&\n\x07sen0308\x18\x07 \x01(\x0b\x32\x13.SEN0308MeasurementH\x00\x12&\n\x07sen0257\x18\x08 \x01(\x0b\x32\x13.SEN0257MeasurementH\x00\x12&\n\x07yfs210c\x18\t \x01(\x0b\x32\x13.YFS210CMeasurementH\x00\x12$\n\x06pcap02\x18\n \x01(\x0b\x32\x12.PCAP02MeasurementH\x00\x42\r\n\x0bmeasurement\"X\n\x08Response\x12$\n\x04resp\x18\x01 \x01(\x0e\x32\x16.Response.ResponseType\"&\n\x0cResponseType\x12\x0b\n\x07SUCCESS\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"\xc4\x02\n\x0c\x45sp32Command\x12$\n\x0cpage_command\x18\x01 \x01(\x0b\x32\x0c.PageCommandH\x00\x12$\n\x0ctest_command\x18\x02 \x01(\x0b\x32\x0c.TestCommandH\x00\x12$\n\x0cwifi_command\x18\x03 \x01(\x0b\x32\x0c.WiFiCommandH\x00\x12*\n\x0fmicrosd_command\x18\x04 \x01(\x0b\x32\x0f.MicroSDCommandH\x00\x12\x30\n\x12irrigation_command\x18\x05 \x01(\x0b\x32\x12.IrrigationCommandH\x00\x12\x31\n\x13user_config_command\x18\x06 \x01(\x0b\x32\x12.UserConfigCommandH\x00\x12&\n\rpower_command\x18\x07 \x01(\x0b\x32\r.PowerCommandH\x00\x42\t\n\x07\x63ommand\"\xb6\x01\n\x0bPageCommand\x12.\n\x0c\x66ile_request\x18\x01 \x01(\x0e\x32\x18.PageCommand.RequestType\x12\x17\n\x0f\x66ile_descriptor\x18\x02 \x01(\r\x12\x12\n\nblock_size\x18\x03 \x01(\r\x12\x11\n\tnum_bytes\x18\x04 \x01(\r\"7\n\x0bRequestType\x12\x08\n\x04OPEN\x10\x00\x12\t\n\x05\x43LOSE\x10\x01\x12\x08\n\x04READ\x10\x02\x12\t\n\x05WRITE\x10\x03\"\x82\x01\n\x0bTestCommand\x12\'\n\x05state\x18\x01 \x01(\x0e\x32\x18.TestCommand.ChangeState\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x05\"<\n\x0b\x43hangeState\x12\x0b\n\x07RECEIVE\x10\x00\x12\x13\n\x0fRECEIVE_REQUEST\x10\x01\x12\x0b\n\x07REQUEST\x10\x02\"\xc5\x02\n\x0bWiFiCommand\x12\x1f\n\x04type\x18\x01 \x01(\x0e\x32\x11.WiFiCommand.Type\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0e\n\x06passwd\x18\x03 \x01(\t\x12\x0b\n\x03url\x18\x04 \x01(\t\x12\x0c\n\x04port\x18\x08 \x01(\r\x12\n\n\x02rc\x18\x05 \x01(\r\x12\n\n\x02ts\x18\x06 \x01(\r\x12\x0c\n\x04resp\x18\x07 \x01(\x0c\x12\x0b\n\x03mac\x18\t \x01(\t\x12\x0f\n\x07\x63lients\x18\n \x01(\r\"\x97\x01\n\x04Type\x12\x0b\n\x07\x43ONNECT\x10\x00\x12\x08\n\x04POST\x10\x01\x12\t\n\x05\x43HECK\x10\x02\x12\x08\n\x04TIME\x10\x03\x12\x0e\n\nDISCONNECT\x10\x04\x12\x0e\n\nCHECK_WIFI\x10\x05\x12\r\n\tCHECK_API\x10\x06\x12\x0c\n\x08NTP_SYNC\x10\x07\x12\x08\n\x04HOST\x10\x08\x12\r\n\tSTOP_HOST\x10\t\x12\r\n\tHOST_INFO\x10\n\"\xad\x01\n\x11UserConfigCommand\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.UserConfigCommand.RequestType\x12\'\n\x0b\x63onfig_data\x18\x02 \x01(\x0b\x32\x12.UserConfiguration\"A\n\x0bRequestType\x12\x12\n\x0eREQUEST_CONFIG\x10\x00\x12\x13\n\x0fRESPONSE_CONFIG\x10\x01\x12\t\n\x05START\x10\x02\"\x86\x03\n\x0eMicroSDCommand\x12\"\n\x04type\x18\x01 \x01(\x0e\x32\x14.MicroSDCommand.Type\x12\x10\n\x08\x66ilename\x18\x02 \x01(\t\x12&\n\x02rc\x18\x03 \x01(\x0e\x32\x1a.MicroSDCommand.ReturnCode\x12\x1c\n\x04meas\x18\x04 \x01(\x0b\x32\x0c.MeasurementH\x00\x12 \n\x02uc\x18\x05 \x01(\x0b\x32\x12.UserConfigurationH\x00\" \n\x04Type\x12\x08\n\x04SAVE\x10\x00\x12\x0e\n\nUSERCONFIG\x10\x01\"\xab\x01\n\nReturnCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x11\n\rERROR_GENERAL\x10\x01\x12\x1e\n\x1a\x45RROR_MICROSD_NOT_INSERTED\x10\x02\x12#\n\x1f\x45RROR_FILE_SYSTEM_NOT_MOUNTABLE\x10\x03\x12\x1d\n\x19\x45RROR_PAYLOAD_NOT_DECODED\x10\x04\x12\x19\n\x15\x45RROR_FILE_NOT_OPENED\x10\x05\x42\x06\n\x04\x64\x61ta\"\x94\x01\n\x11IrrigationCommand\x12%\n\x04type\x18\x01 \x01(\x0e\x32\x17.IrrigationCommand.Type\x12\'\n\x05state\x18\x02 \x01(\x0e\x32\x18.IrrigationCommand.State\"\x11\n\x04Type\x12\t\n\x05\x43HECK\x10\x00\"\x1c\n\x05State\x12\x08\n\x04OPEN\x10\x00\x12\t\n\x05\x43LOSE\x10\x01\"\xab\x03\n\x0cPowerCommand\x12 \n\x04type\x18\x01 \x01(\x0e\x32\x12.PowerCommand.Type\x12*\n\x06reason\x18\x02 \x01(\x0e\x32\x1a.PowerCommand.WakeupReason\x12\x12\n\nboot_count\x18\x03 \x01(\r\"\x1d\n\x04Type\x12\t\n\x05SLEEP\x10\x00\x12\n\n\x06WAKEUP\x10\x01\"\x99\x02\n\x0cWakeupReason\x12\x15\n\x11POWER_WAKEUP_EXT0\x10\x00\x12\x15\n\x11POWER_WAKEUP_EXT1\x10\x01\x12\x16\n\x12POWER_WAKEUP_TIMER\x10\x02\x12\x19\n\x15POWER_WAKEUP_TOUCHPAD\x10\x03\x12\x14\n\x10POWER_WAKEUP_ULP\x10\x04\x12\x15\n\x11POWER_WAKEUP_GPIO\x10\x05\x12\x15\n\x11POWER_WAKEUP_UART\x10\x06\x12\x15\n\x11POWER_WAKEUP_WIFI\x10\x07\x12\x16\n\x12POWER_WAKEUP_COCPU\x10\x08\x12 \n\x1cPOWER_WAKEUP_COCPU_TRAP_TRIG\x10\t\x12\x13\n\x0fPOWER_WAKEUP_BT\x10\n\"\xdc\x02\n\x11UserConfiguration\x12\x11\n\tlogger_id\x18\x01 \x01(\r\x12\x0f\n\x07\x63\x65ll_id\x18\x02 \x01(\r\x12$\n\rUpload_method\x18\x03 \x01(\x0e\x32\r.Uploadmethod\x12\x17\n\x0fUpload_interval\x18\x04 \x01(\r\x12\'\n\x0f\x65nabled_sensors\x18\x05 \x03(\x0e\x32\x0e.EnabledSensor\x12\x15\n\rVoltage_Slope\x18\x06 \x01(\x01\x12\x16\n\x0eVoltage_Offset\x18\x07 \x01(\x01\x12\x15\n\rCurrent_Slope\x18\x08 \x01(\x01\x12\x16\n\x0e\x43urrent_Offset\x18\t \x01(\x01\x12\x11\n\tWiFi_SSID\x18\n \x01(\t\x12\x15\n\rWiFi_Password\x18\x0b \x01(\t\x12\x18\n\x10\x41PI_Endpoint_URL\x18\x0c \x01(\t\x12\x19\n\x11\x41PI_Endpoint_Port\x18\r \x01(\r\"\x17\n\x08\x61\x64\x63Value\x12\x0b\n\x03\x61\x64\x63\x18\x01 \x01(\r*\x90\x01\n\rEnabledSensor\x12\x0b\n\x07Voltage\x10\x00\x12\x0b\n\x07\x43urrent\x10\x01\x12\x0b\n\x07Teros12\x10\x02\x12\x0b\n\x07Teros21\x10\x03\x12\n\n\x06\x42ME280\x10\x04\x12\x0c\n\x08Phytos31\x10\x05\x12\x0b\n\x07SEN0308\x10\x06\x12\x0b\n\x07SEN0257\x10\x07\x12\x0b\n\x07YFS210C\x10\x08\x12\n\n\x06PCAP02\x10\t*\"\n\x0cUploadmethod\x12\x08\n\x04LoRa\x10\x00\x12\x08\n\x04WiFi\x10\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'soil_power_sensor_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
-  _globals['_ENABLEDSENSOR']._serialized_start=2759
-  _globals['_ENABLEDSENSOR']._serialized_end=2838
-  _globals['_UPLOADMETHOD']._serialized_start=2840
-  _globals['_UPLOADMETHOD']._serialized_end=2874
+  _globals['_ENABLEDSENSOR']._serialized_start=4041
+  _globals['_ENABLEDSENSOR']._serialized_end=4185
+  _globals['_UPLOADMETHOD']._serialized_start=4187
+  _globals['_UPLOADMETHOD']._serialized_end=4221
   _globals['_MEASUREMENTMETADATA']._serialized_start=27
   _globals['_MEASUREMENTMETADATA']._serialized_end=96
   _globals['_POWERMEASUREMENT']._serialized_start=98
   _globals['_POWERMEASUREMENT']._serialized_end=150
-  _globals['_TEROS12MEASUREMENT']._serialized_start=152
-  _globals['_TEROS12MEASUREMENT']._serialized_end=232
-  _globals['_TEROS21MEASUREMENT']._serialized_start=234
-  _globals['_TEROS21MEASUREMENT']._serialized_end=288
-  _globals['_PHYTOS31MEASUREMENT']._serialized_start=290
-  _globals['_PHYTOS31MEASUREMENT']._serialized_end=350
-  _globals['_BME280MEASUREMENT']._serialized_start=352
-  _globals['_BME280MEASUREMENT']._serialized_end=428
-  _globals['_SEN0308MEASUREMENT']._serialized_start=430
-  _globals['_SEN0308MEASUREMENT']._serialized_end=485
-  _globals['_SEN0257MEASUREMENT']._serialized_start=487
-  _globals['_SEN0257MEASUREMENT']._serialized_end=542
-  _globals['_YFS210CMEASUREMENT']._serialized_start=544
-  _globals['_YFS210CMEASUREMENT']._serialized_end=578
-  _globals['_MEASUREMENT']._serialized_start=581
-  _globals['_MEASUREMENT']._serialized_end=961
-  _globals['_RESPONSE']._serialized_start=963
-  _globals['_RESPONSE']._serialized_end=1051
-  _globals['_RESPONSE_RESPONSETYPE']._serialized_start=1013
-  _globals['_RESPONSE_RESPONSETYPE']._serialized_end=1051
-  _globals['_ESP32COMMAND']._serialized_start=1054
-  _globals['_ESP32COMMAND']._serialized_end=1287
-  _globals['_PAGECOMMAND']._serialized_start=1290
-  _globals['_PAGECOMMAND']._serialized_end=1472
-  _globals['_PAGECOMMAND_REQUESTTYPE']._serialized_start=1417
-  _globals['_PAGECOMMAND_REQUESTTYPE']._serialized_end=1472
-  _globals['_TESTCOMMAND']._serialized_start=1475
-  _globals['_TESTCOMMAND']._serialized_end=1605
-  _globals['_TESTCOMMAND_CHANGESTATE']._serialized_start=1545
-  _globals['_TESTCOMMAND_CHANGESTATE']._serialized_end=1605
-  _globals['_WIFICOMMAND']._serialized_start=1608
-  _globals['_WIFICOMMAND']._serialized_end=1862
-  _globals['_WIFICOMMAND_TYPE']._serialized_start=1751
-  _globals['_WIFICOMMAND_TYPE']._serialized_end=1862
-  _globals['_MICROSDCOMMAND']._serialized_start=1865
-  _globals['_MICROSDCOMMAND']._serialized_end=2255
-  _globals['_MICROSDCOMMAND_TYPE']._serialized_start=2041
-  _globals['_MICROSDCOMMAND_TYPE']._serialized_end=2073
-  _globals['_MICROSDCOMMAND_RETURNCODE']._serialized_start=2076
-  _globals['_MICROSDCOMMAND_RETURNCODE']._serialized_end=2247
-  _globals['_IRRIGATIONCOMMAND']._serialized_start=2258
-  _globals['_IRRIGATIONCOMMAND']._serialized_end=2406
-  _globals['_IRRIGATIONCOMMAND_TYPE']._serialized_start=2359
-  _globals['_IRRIGATIONCOMMAND_TYPE']._serialized_end=2376
-  _globals['_IRRIGATIONCOMMAND_STATE']._serialized_start=2378
-  _globals['_IRRIGATIONCOMMAND_STATE']._serialized_end=2406
-  _globals['_USERCONFIGURATION']._serialized_start=2409
-  _globals['_USERCONFIGURATION']._serialized_end=2757
+  _globals['_VOLTAGEDELTAMEASUREMENT']._serialized_start=152
+  _globals['_VOLTAGEDELTAMEASUREMENT']._serialized_end=194
+  _globals['_CURRENTDELTAMEASUREMENT']._serialized_start=196
+  _globals['_CURRENTDELTAMEASUREMENT']._serialized_end=238
+  _globals['_VOLTAGEMEASUREMENT']._serialized_start=240
+  _globals['_VOLTAGEMEASUREMENT']._serialized_end=277
+  _globals['_CURRENTMEASUREMENT']._serialized_start=279
+  _globals['_CURRENTMEASUREMENT']._serialized_end=316
+  _globals['_POWERDELTAENTRY']._serialized_start=318
+  _globals['_POWERDELTAENTRY']._serialized_end=393
+  _globals['_POWERMEASUREMENTDELTA']._serialized_start=395
+  _globals['_POWERMEASUREMENTDELTA']._serialized_end=464
+  _globals['_REPEATEDPOWERDELTAS']._serialized_start=466
+  _globals['_REPEATEDPOWERDELTAS']._serialized_end=558
+  _globals['_TEROS12MEASUREMENT']._serialized_start=560
+  _globals['_TEROS12MEASUREMENT']._serialized_end=640
+  _globals['_TEROS21MEASUREMENT']._serialized_start=642
+  _globals['_TEROS21MEASUREMENT']._serialized_end=696
+  _globals['_PHYTOS31MEASUREMENT']._serialized_start=698
+  _globals['_PHYTOS31MEASUREMENT']._serialized_end=758
+  _globals['_BME280MEASUREMENT']._serialized_start=760
+  _globals['_BME280MEASUREMENT']._serialized_end=836
+  _globals['_SEN0308MEASUREMENT']._serialized_start=838
+  _globals['_SEN0308MEASUREMENT']._serialized_end=893
+  _globals['_SEN0257MEASUREMENT']._serialized_start=895
+  _globals['_SEN0257MEASUREMENT']._serialized_end=950
+  _globals['_YFS210CMEASUREMENT']._serialized_start=952
+  _globals['_YFS210CMEASUREMENT']._serialized_end=986
+  _globals['_PCAP02MEASUREMENT']._serialized_start=988
+  _globals['_PCAP02MEASUREMENT']._serialized_end=1028
+  _globals['_MEASUREMENT']._serialized_start=1031
+  _globals['_MEASUREMENT']._serialized_end=1449
+  _globals['_RESPONSE']._serialized_start=1451
+  _globals['_RESPONSE']._serialized_end=1539
+  _globals['_RESPONSE_RESPONSETYPE']._serialized_start=1501
+  _globals['_RESPONSE_RESPONSETYPE']._serialized_end=1539
+  _globals['_ESP32COMMAND']._serialized_start=1542
+  _globals['_ESP32COMMAND']._serialized_end=1866
+  _globals['_PAGECOMMAND']._serialized_start=1869
+  _globals['_PAGECOMMAND']._serialized_end=2051
+  _globals['_PAGECOMMAND_REQUESTTYPE']._serialized_start=1996
+  _globals['_PAGECOMMAND_REQUESTTYPE']._serialized_end=2051
+  _globals['_TESTCOMMAND']._serialized_start=2054
+  _globals['_TESTCOMMAND']._serialized_end=2184
+  _globals['_TESTCOMMAND_CHANGESTATE']._serialized_start=2124
+  _globals['_TESTCOMMAND_CHANGESTATE']._serialized_end=2184
+  _globals['_WIFICOMMAND']._serialized_start=2187
+  _globals['_WIFICOMMAND']._serialized_end=2512
+  _globals['_WIFICOMMAND_TYPE']._serialized_start=2361
+  _globals['_WIFICOMMAND_TYPE']._serialized_end=2512
+  _globals['_USERCONFIGCOMMAND']._serialized_start=2515
+  _globals['_USERCONFIGCOMMAND']._serialized_end=2688
+  _globals['_USERCONFIGCOMMAND_REQUESTTYPE']._serialized_start=2623
+  _globals['_USERCONFIGCOMMAND_REQUESTTYPE']._serialized_end=2688
+  _globals['_MICROSDCOMMAND']._serialized_start=2691
+  _globals['_MICROSDCOMMAND']._serialized_end=3081
+  _globals['_MICROSDCOMMAND_TYPE']._serialized_start=2867
+  _globals['_MICROSDCOMMAND_TYPE']._serialized_end=2899
+  _globals['_MICROSDCOMMAND_RETURNCODE']._serialized_start=2902
+  _globals['_MICROSDCOMMAND_RETURNCODE']._serialized_end=3073
+  _globals['_IRRIGATIONCOMMAND']._serialized_start=3084
+  _globals['_IRRIGATIONCOMMAND']._serialized_end=3232
+  _globals['_IRRIGATIONCOMMAND_TYPE']._serialized_start=3185
+  _globals['_IRRIGATIONCOMMAND_TYPE']._serialized_end=3202
+  _globals['_IRRIGATIONCOMMAND_STATE']._serialized_start=3204
+  _globals['_IRRIGATIONCOMMAND_STATE']._serialized_end=3232
+  _globals['_POWERCOMMAND']._serialized_start=3235
+  _globals['_POWERCOMMAND']._serialized_end=3662
+  _globals['_POWERCOMMAND_TYPE']._serialized_start=3349
+  _globals['_POWERCOMMAND_TYPE']._serialized_end=3378
+  _globals['_POWERCOMMAND_WAKEUPREASON']._serialized_start=3381
+  _globals['_POWERCOMMAND_WAKEUPREASON']._serialized_end=3662
+  _globals['_USERCONFIGURATION']._serialized_start=3665
+  _globals['_USERCONFIGURATION']._serialized_end=4013
+  _globals['_ADCVALUE']._serialized_start=4015
+  _globals['_ADCVALUE']._serialized_end=4038
 # @@protoc_insertion_point(module_scope)

ents/simulator/node.py

@@ -10,6 +10,8 @@ from ..proto.encode import (
     encode_bme280_measurement,
 )
 
+from ..proto.sensor import encode_repeated_sensor_measurements
+
 
 class NodeSimulator:
     """Simulation class to simulate measurements for different sensors"""
@@ -159,3 +161,122 @@ class NodeSimulator:
             )
             self.measurements.append(meas)
             self.measurement_buffer.append(meas)
+
+
+class NodeSimulatorGeneric:
+    """Simulation class to simulate measurements for different sensors"""
+
+    # temporary storage for measurements to be uploaded
+    measurement_buffer: list[bytes] = []
+    # all measurements uploaded
+    measurements: list[bytes] = []
+    # all responses
+    responses: list[str] = []
+
+    # metrics for uploads
+    metrics: dict[str, int] = {
+        "total_requests": 0,
+        "failed_requests": 0,
+        "successful_requests": 0,
+    }
+
+    latency: list[float] = []
+
+    def __init__(
+        self, cell: int, logger: int, sensors: list[str], _min=-1, _max=1, fn=sin
+    ):
+        """Initializes the simulation class.
+
+        Args:
+            cell: Cell ID of the node.
+            logger: Logger ID of the node.
+            sensors: List of sensors to simulate.
+            _min: Minimum value for the simulated sensor data.
+            _max: Maximum value for the simulated sensor data.
+            fn: Function to generate the simulated sensor data.
+        """
+
+        self.cell = cell
+        self.logger = logger
+        self.sensors = sensors
+        self.fn = fn
+        self._min = _min
+        self._max = _max
+
+    def __str__(self):
+        """String representation of the simulation class
+
+        Shows the current upload metrics
+        """
+        avg = np.array(self.latency).mean()
+
+        last = 0
+        if len(self.latency) > 0:
+            last = self.latency[-1]
+
+        return "total: {}, failed: {}, avg (ms): {}, last (ms): {}".format(
+            self.metrics["total_requests"],
+            self.metrics["failed_requests"],
+            avg * 100,
+            last * 100,
+        )
+
+    def send_next(self, url: str) -> bool:
+        """Sends measurements to a dirtviz instance
+
+        Args:
+            url: URL of the dirtviz instance
+
+        Returns:
+            True if there are measurements to send, False otherwise
+        """
+
+        # get next measurement
+        try:
+            meas = self.measurements.pop()
+        except IndexError as _:
+            return False
+
+        headers = {"Content-Type": "application/octet-stream"}
+        result = requests.post(url, data=meas, headers=headers)
+
+        # store result
+        self.responses.append(result.text)
+        self.metrics["total_requests"] += 1
+        if result.status_code == 200:
+            self.metrics["successful_requests"] += 1
+        else:
+            self.metrics["failed_requests"] += 1
+        self.latency.append(result.elapsed.total_seconds())
+
+        return True
+
+    def measure(self, ts: int):
+        """Simulate measurements
+
+        Args:
+            ts: Timestamp of the measurement
+        """
+
+        meas = {
+            "meta": {
+                "ts": ts,
+                "loggerId": self.logger,
+                "cellId": self.cell,
+            },
+            "measurements": [],
+        }
+
+        scale = (self._max - self._min) / 2
+        offset = (self._max + self._min) / 2
+
+        for s in self.sensors:
+            meas["measurements"].append(
+                {
+                    "type": s,
+                    "decimal": self.fn(ts) * scale + offset,
+                }
+            )
+
+        serialized = encode_repeated_sensor_measurements(meas)
+        self.measurement_buffer.append(serialized)

{ents-2.3.4.dist-info → ents-2.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ents
-Version: 2.3.4
+Version: 2.3.5
 Summary: Python package for Environmental NeTworked Sensor (ENTS)
 Project-URL: Homepage, https://github.com/jlab-sensing/soil-power-sensor-firmware
 Project-URL: Issues, https://github.com/jlab-sensing/soil-power-sensor-firmware/issues
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Requires-Dist: matplotlib
 Requires-Dist: pandas
-Requires-Dist: protobuf==6.31.1
+Requires-Dist: protobuf==6.33.2
 Requires-Dist: pyserial
 Requires-Dist: requests
 Requires-Dist: scikit-learn

{ents-2.3.4.dist-info → ents-2.3.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ents/__init__.py,sha256=KyqH3dz_BdFHWxD9n4DFItgsrxO7rDtt2IObWkdLsns,582
-ents/cli.py,sha256=O071Ot2u7yeMFZyoOY--hp4UepXOHEX2nNiiQ5TxpI4,16573
+ents/__init__.py,sha256=IVe193OL25_F5AMMx272iGabJ1e4jPVNLFAJDktA0oU,706
+ents/cli.py,sha256=rMZoyJ_FlA8OiYKpIoRK3vvCtFAgl5VoVGcLWcENtZE,24412
 ents/calibrate/PingSMU.py,sha256=1iXozKaPE0ucgB3qsTI5mVk__n6pqC8Z2nV_GRfU2gA,1253
 ents/calibrate/PingSPS.py,sha256=pNQN1ngWQ2Z7Q1DoWCIe4DN02hZfNOrKpLH7I0bAd8U,1876
 ents/calibrate/README.md,sha256=ctdpfS5tN-PnDBn8sCTAn4gi0E-ZLUDXYnLZuqleDmM,109
@@ -10,17 +10,18 @@ ents/calibrate/recorder.py,sha256=fce5cW2DiCSOMQ-CSRL7raghbR2Yeg8Nx9obyY-0yOg,18
 ents/config/README.md,sha256=SRtr5YuM64MSZQdy60F8Ib_AI2MR-MbbAdjS3jcjVD4,4447
 ents/config/__init__.py,sha256=3eyHUKg-ZPx82h2CGiNyzaaI7Y7koEOUX9pzrlnVcJw,51
 ents/config/adv_trace.py,sha256=hEDBNbVslJ2lJ-8tfJhPXxQMZN9Nylqv8RK42waRhsM,1290
-ents/config/user_config.py,sha256=SAudV12wyE-5Z0weZJQzBELRXR3-oevIgbrimUF2TmI,39198
-ents/demo/demoPullRequests.py,sha256=YSTVa59puMtER8sjOppiMshUCDjdsIikXLNOM0U6zmU,3864
+ents/config/user_config.py,sha256=evaM3Lb0IU_qFugEeRiXUCMiCUyEbtnRNTXayqE6Qig,39182
 ents/proto/__init__.py,sha256=5THafGlxirjEUATIXB2EVpdOY5APEjztzOAHlRGNG2c,720
 ents/proto/decode.py,sha256=_dn9Agv41YgUtMVHZ7l5-Y13ci3hnjyXrRPGKDIHzvo,2964
 ents/proto/encode.py,sha256=kPAD5-bL6zNEjh6z1n1FusdM9z5UretypxHHAiuGGA4,7753
 ents/proto/esp32.py,sha256=4QOHZNH1SqkJg4TLvJgrAbhdJg88ZNtqoMNLBcWUX2U,4657
-ents/proto/soil_power_sensor_pb2.py,sha256=sNf-97udroXqmimooH0x1IWOTSm-4IoRsFzbyb9aLRg,9491
+ents/proto/sensor.py,sha256=zdZXG-TtX5kpSc6aETOywHApM8xLMY_J2OO8oBlEqU4,7148
+ents/proto/sensor_pb2.py,sha256=Kxe7ZMeaJwQbqv4MHWUK5_4LxTY8Ou1n1bXMDq4KfQ0,3673
+ents/proto/soil_power_sensor_pb2.py,sha256=r7lcuo8A3YW-vsiR7gT0dvG2UMdolpMe3r8kGfKx54U,13442
 ents/simulator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ents/simulator/node.py,sha256=vDdt_Q2BiEo1Z-aMZnm9_Y-aAtPU_lhcWW-xSDYR54c,4444
-ents-2.3.4.dist-info/METADATA,sha256=FMxd6PnezpUeq3ZBVty08iRL-CzgVo5YTugULlzxHZ4,5258
-ents-2.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ents-2.3.4.dist-info/entry_points.txt,sha256=1U6ViZDTy4vv1jFp5RisBPC0NFqmtV3f18eUnWKX0Nk,95
-ents-2.3.4.dist-info/licenses/LICENSE,sha256=2WLObzfS99jXXcPS5INqnmDVZ1nlO8Rj8mzQn2xkn14,1086
-ents-2.3.4.dist-info/RECORD,,
+ents/simulator/node.py,sha256=RRPsKKA8_7u0Ka-1hXzO_3gNj91heXIZaDxRaG0Nw_o,7797
+ents-2.3.5.dist-info/METADATA,sha256=x8PN37a25YxVbtL2hZIF6CwaxJ1NVXGQ0xiGWLXQeQA,5258
+ents-2.3.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ents-2.3.5.dist-info/entry_points.txt,sha256=1U6ViZDTy4vv1jFp5RisBPC0NFqmtV3f18eUnWKX0Nk,95
+ents-2.3.5.dist-info/licenses/LICENSE,sha256=2WLObzfS99jXXcPS5INqnmDVZ1nlO8Rj8mzQn2xkn14,1086
+ents-2.3.5.dist-info/RECORD,,

{ents-2.3.4.dist-info → ents-2.3.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

ents/demo/demoPullRequests.py

@@ -1,119 +0,0 @@
-import requests
-from datetime import datetime, timezone
-import pandas as pd
-from tabulate import tabulate
-
-
-class DirtVizClient:
-    BASE_URL = "https://dirtviz.jlab.ucsc.edu/api/"
-
-    def __init__(self):
-        self.session = requests.Session()
-
-    def cell_from_name(self, name, start=None, end=None):
-        """Get power data for a specific cell"""
-
-    def get_power_data(self, cell_id, start=None, end=None):
-        """Get power data for a specific cell"""
-        endpoint = f"power/{cell_id}"
-        params = {}
-
-        if start and end:
-            params = {
-                "startTime": start.strftime("%a, %d %b %Y %H:%M:%S GMT"),
-                "endTime": end.strftime("%a, %d %b %Y %H:%M:%S GMT"),
-            }
-
-        response = self.session.get(f"{self.BASE_URL}{endpoint}", params=params)
-        response.raise_for_status()
-        return response.json()
-
-
-def format_data_display(df, cell_id):
-    """Format the data output with timestamp as first column"""
-
-    # Ensure timestamp exists and is first column
-    if "timestamp" in df.columns:
-        cols = ["timestamp"] + [col for col in df.columns if col != "timestamp"]
-        df = df[cols]
-
-        # Format timestamp nicely
-        df["timestamp"] = pd.to_datetime(df["timestamp"])
-        df["timestamp"] = df["timestamp"].dt.strftime("%m-%d-%Y %H:%M:%S")
-
-    # Calculate statistics
-    stats = {
-        "Cell ID": cell_id,
-        "Time Range": (
-            f"{df['timestamp'].iloc[0]} to {df['timestamp'].iloc[-1]}"
-            if len(df) > 0
-            else "N/A"
-        ),
-        "Data Points": len(df),
-        "Avg Voltage (mV)": f"{df['v'].mean():.2f}" if "v" in df.columns else "N/A",
-        "Max Voltage (mV)": f"{df['v'].max():.2f}" if "v" in df.columns else "N/A",
-        "Avg Current (µA)": f"{df['i'].mean():.2f}" if "i" in df.columns else "N/A",
-        "Avg Power (µW)": f"{df['p'].mean():.2f}" if "p" in df.columns else "N/A",
-    }
-
-    column_rename = {
-        "timestamp": "Measurement Times",
-        "v": "Voltage (mV)",
-        "i": "Current (µA)",
-        "p": "Power (µW)",
-    }
-    # Apply renaming
-    df = df.rename(columns=column_rename)
-
-    # Display header
-    print("\n" + "=" * 60)
-    print(f"CELL {cell_id} POWER DATA SUMMARY".center(60))
-    for key, value in stats.items():
-        print(f"• {key:<20}: {value}")  # Display the summary information
-    print("=" * 60 + "\n")
-
-    # Display sample data with timestamp first
-    if len(df) > 0:
-        print("DATA BY TIMESTAMPS:")
-        print(
-            tabulate(
-                df,
-                headers="keys",
-                tablefmt="grid",  # Changed to grid for better column alignment
-                stralign="center",  # Right-align numbers
-                showindex=False,
-                numalign="center",
-            )
-        )
-    else:
-        print("No data available to display")
-
-    print("\n" + "=" * 80)
-
-
-if __name__ == "__main__":
-    client = DirtVizClient()
-
-    try:
-        cell_id = 893  # Figure out how to do by name on DirtViz
-        start = datetime(2025, 8, 12, tzinfo=timezone.utc)
-        end = datetime.now(timezone.utc)
-
-        print(f"\nFetching power data for cell {cell_id}...")
-        data = client.get_power_data(cell_id, start, end)
-
-        if data:
-            df = pd.DataFrame(data)
-            format_data_display(df, cell_id)
-
-            # Save to CSV with timestamp first
-            # df.to_csv(f"cell_{cell_id}_power_data.csv", index=False)
-            # print(f"Data saved to cell_{cell_id}_power_data.csv")
-        else:
-            print("No data received for the specified time range.")
-
-    except requests.exceptions.HTTPError as e:
-        print(f"\nHTTP Error: {e}")
-        print(f"Response: {e.response.text[:500]}...")
-    except Exception as e:
-        print(f"\n⚠️ Unexpected error: {str(e)}")