merge main

Author: Dilmi Wickramanayake

examples/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input.py

@@ -1,9 +1,10 @@
-"""This is the logic that will read/set values to panel."""
+"""Streamlit application script for displaying values from nidaqmx_continuous_analog_input.py"""
 
 import pathlib
-import time
 
 import nidaqmx
+from nidaqmx.constants import AcquisitionType
+
 
 import nipanel
 
@@ -13,25 +14,27 @@
 panel = nipanel.StreamlitPanel(
     panel_id="nidaqmx_continuous_analog_input_panel",
     streamlit_script_path=panel_script_path,
+
 )
 
-data_arr = []
 with nidaqmx.Task() as task:
+    # User needs simulated hardware to run script, and user should use NI MAX to setup cDAQ1 Model NI 9201
     task.ai_channels.add_ai_voltage_chan("Mod1/ai2")
     task.ai_channels.add_ai_thrmcpl_chan("Mod1/ai3")
+    task.timing.cfg_samp_clk_timing(
+        rate=1000.0,  # Sample rate in Hz
+        sample_mode=AcquisitionType.CONTINUOUS,
+        samps_per_chan=3000  # Buffer size per channel
+    )
+    task.start()
     try:
         total_read = 0
         while True:
-            data = task.read(number_of_samples_per_channel=3)
-            read = len(data)
-            total_read += read
-
-            data_arr.append(data)
-            time.sleep(1)
-            panel.set_value("amplitude", data_arr[-1][-1])
-            panel.set_value("Volts", data_arr[-1][0])
+            print(f"\nPress Ctrl + C to stop")
+            data = task.read(number_of_samples_per_channel=1000)
+            panel.set_value("voltage_data", data[0])
+            panel.set_value("thermocouple_data", data[1])
     except KeyboardInterrupt:
         pass
     finally:
         task.stop()
-        print(f"\nAcquired {total_read} total samples.")

examples/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input_panel.py

@@ -1,18 +1,13 @@
-"""This is the panel that will use the logic."""
+"""Streamlit application script for displaying values using nipanel package."""
 
 import streamlit as st
-import streamlit.components.v1 as components
 from streamlit_echarts import st_echarts
 
 import nipanel
 
 panel = nipanel.StreamlitPanelValueAccessor(panel_id="nidaqmx_continuous_analog_input_panel")
 
-add_refresh_component = components.declare_component(
-    "panelRefreshComponent",
-    url=f"http://localhost:42001/panels/refresh/{panel.panel_id}",
-)
-add_refresh_component()
+panel = nipanel.initialize_panel()
 
 
 st.title("Analog Input - Voltage and Thermocouple in a Single Task")
@@ -30,81 +25,33 @@
 )
 
 
-list_of_therm_amp = panel.get_value("amplitude")
-list_of_voltage_amp = panel.get_value("Volts")
-
-if "therm_history" not in st.session_state:
-    st.session_state.therm_history = []
-if "volts_history" not in st.session_state:
-    st.session_state.volts_history = []
+list_of_therm_amp = panel.get_value("thermocouple_data", [0.0])
+list_of_voltage_amp = panel.get_value("voltage_data", [0.0])
 
-for therm_amp in list_of_therm_amp:
-    st.session_state.therm_history.append(therm_amp)
-for voltage_amp in list_of_voltage_amp:
-    st.session_state.volts_history.append(voltage_amp)
-
-therm_amp_graph = {
-    "tooltip": {"trigger": "axis"},
-    "legend": {"data": ["thermocouple_amplitude"]},
-    "xAxis": {
-        "type": "category",
-        "data": list(range(len(st.session_state.therm_history))),
-        "name": "Time",
-    },
-    "yAxis": {"type": "value", "name": "Thermocouple Amplitude"},
-    "series": [
-        {
-            "name": "thermocouple_amplitude",
-            "type": "line",
-            "data": st.session_state.therm_history,
-            "color": "red",
-        },
-    ],
-}
-st_echarts(options=therm_amp_graph, height="400px")
-
-voltage_amp_graph = {
-    "tooltip": {"trigger": "axis"},
-    "legend": {"data": ["voltage_amplitude"]},
-    "xAxis": {
-        "type": "category",
-        "data": list(range(len(st.session_state.volts_history))),
-        "name": "Time",
-    },
-    "yAxis": {"type": "value", "name": "Voltage Amplitude"},
-    "series": [
-        {
-            "name": "voltage_amplitude",
-            "type": "line",
-            "data": st.session_state.volts_history,
-        },
-    ],
-}
-st_echarts(options=voltage_amp_graph, height="400px")
 
 st.header("Voltage & Thermocouple")
 voltage_therm_graph = {
     "tooltip": {"trigger": "axis"},
     "legend": {"data": ["voltage_amplitude", "thermocouple_amplitude"]},
     "xAxis": {
         "type": "category",
-        "data": list(range(len(st.session_state.volts_history))),
+        "data": list(range(len(list_of_voltage_amp))), 
         "name": "Time",
     },
     "yAxis": {"type": "value", "name": "Voltage and Thermocouple Amplitude"},
     "series": [
         {
             "name": "voltage_amplitude",
             "type": "line",
-            "data": st.session_state.volts_history,
+            "data": list_of_voltage_amp,
             "emphasis": {"focus": "series"},
             "smooth": True,
             "seriesLayoutBy": "row",
         },
         {
             "name": "thermocouple_amplitude",
             "type": "line",
-            "data": st.session_state.therm_history,
+            "data": list_of_therm_amp,
             "color": "red",
             "emphasis": {"focus": "series"},
             "smooth": True,