From 72db53ccd00ceb3f77cb82875888e3a7d385cd12 Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Tue, 17 Nov 2020 10:51:31 +0100
Subject: [PATCH] Removing pounder test, adding file

---
 pounder_test.py           | 111 --------------------------------------
 src/pounder/dds_output.rs |  62 +++++++++++++++++++++
 2 files changed, 62 insertions(+), 111 deletions(-)
 delete mode 100644 pounder_test.py
 create mode 100644 src/pounder/dds_output.rs

diff --git a/pounder_test.py b/pounder_test.py
deleted file mode 100644
index 5d43dd3..0000000
--- a/pounder_test.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/python3
-"""
-Description: Test Stabilizer communication and DDS configuration.
-
-Author: Ryan Summers
-"""
-
-import socket
-import json
-
-HOST = '10.0.16.99'
-PORT = 1235
-
-def do_request(s, request):
-    """ Perform a request with the Stabilizer.
-
-    Args:
-        s: The socket to the stabilizer.
-        request: The request to transmit.
-
-    Returns:
-        The received response object.
-    """
-    # Transform the value field.
-    request['value'] = json.dumps(request['value'], separators=[',', ':']).replace('"', "'")
-    data = (json.dumps(request, separators=[',', ':']) + '\n').encode('ascii')
-    s.send(data)
-
-    response = b''
-    while not response.endswith(b'\n'):
-        response += s.recv(1024)
-
-    # Decode the value array
-    response = json.loads(response.decode('ascii'))
-    response['value'] = response['value'].replace("'", '"')
-    response['value'] = json.loads(response['value'])
-
-    return response
-
-
-def read_attribute(s, attribute_name):
-    """ Read an attribute on the Stabilizer device.
-
-    Args:
-        s: The socket to the stabilizer.
-        attribute_name: The name of the endpoint to write to (the attribute name).
-
-    Returns:
-        The value of the attribute. May be a string or a dictionary.
-    """
-    request = {
-        "req": "Read",
-        "attribute": attribute_name,
-        "value": "",
-    }
-
-    response = do_request(s, request)
-
-    if 'code' not in response or response['code'] != 200:
-        raise Exception(f'Failed to read {attribute_name}: {response}')
-
-    return response['value']
-
-
-def write_attribute(s, attribute_name, attribute_value):
-    """ Write an attribute on the Stabilizer device.
-
-    Args:
-        s: The socket to the stabilizer.
-        attribute_name: The name of the endpoint to write to (the attribute name).
-        attribute_value: The value to write to the attribute. May be a string or a dictionary.
-    """
-    request = {
-        "req": "Write",
-        "attribute": attribute_name,
-        "value": attribute_value,
-    }
-
-    response = do_request(s, request)
-
-    if 'code' not in response or response['code'] != 200:
-        raise Exception(f'Failed to write {attribute_name}: {response}')
-
-
-def main():
-    """ Main program entry point. """
-    with socket.socket() as s:
-
-        # Connect to the stabilizer.
-        s.connect((HOST, PORT))
-
-        # A sample configuration for an output channel.
-        channel_config = {
-            'attenuation': 0.0,
-            'parameters': {
-                'phase_offset': 0.5,
-                'frequency': 100.0e6,
-                'amplitude': 1.0,
-                'enabled': True,
-            }
-        }
-
-        # Configure OUT0 and read it back.
-        write_attribute(s, "pounder/out0", channel_config)
-        print('Pounder OUT0: ', read_attribute(s, "pounder/out0"))
-
-        print('Pounder IN1: ', read_attribute(s, "pounder/in1"))
-        print('Pounder OUT1: ', read_attribute(s, "pounder/out1"))
-
-if __name__ == '__main__':
-    main()
diff --git a/src/pounder/dds_output.rs b/src/pounder/dds_output.rs
new file mode 100644
index 0000000..2c793e7
--- /dev/null
+++ b/src/pounder/dds_output.rs
@@ -0,0 +1,62 @@
+use crate::hrtimer::HighResTimerE;
+use stm32h7xx_hal as hal;
+
+pub struct DdsOutput {
+    profiles: heapless::spsc::Queue<[u32; 4], heapless::consts::U32>,
+    update_timer: hal::timer::Timer<hal::stm32::TIM3>,
+    io_update_trigger: HighResTimerE,
+}
+
+impl DdsOutput {
+    pub fn new(
+        mut timer: hal::timer::Timer<hal::stm32::TIM3>,
+        io_update_trigger: HighResTimerE,
+    ) -> Self {
+        timer.pause();
+        timer.reset_counter();
+        timer.listen(hal::timer::Event::TimeOut);
+
+        Self {
+            update_timer: timer,
+            io_update_trigger,
+            profiles: heapless::spsc::Queue::new(),
+        }
+    }
+
+    pub fn update_handler(&mut self) {
+        match self.profiles.dequeue() {
+            Some(profile) => self.write_profile(profile),
+            None => self.update_timer.pause(),
+        }
+    }
+
+    pub fn push(&mut self, profile: [u32; 4]) {
+        self.profiles.enqueue(profile).unwrap();
+        self.update_timer.resume();
+    }
+
+    fn write_profile(&mut self, profile: [u32; 4]) {
+        let regs = unsafe { &*hal::stm32::QUADSPI::ptr() };
+        unsafe {
+            core::ptr::write_volatile(
+                &regs.dr as *const _ as *mut u32,
+                profile[0],
+            );
+            core::ptr::write_volatile(
+                &regs.dr as *const _ as *mut u32,
+                profile[1],
+            );
+            core::ptr::write_volatile(
+                &regs.dr as *const _ as *mut u32,
+                profile[2],
+            );
+            core::ptr::write_volatile(
+                &regs.dr as *const _ as *mut u32,
+                profile[3],
+            );
+        }
+
+        // Trigger the IO_update signal generating timer to asynchronous create the IO_Update pulse.
+        self.io_update_trigger.trigger();
+    }
+}