From dd3f293cca606ff2d21555fc513cf89794238043 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 8 Apr 2021 14:17:38 +0200 Subject: [PATCH 1/8] Fixing ACR write padding --- ad9959/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ad9959/src/lib.rs b/ad9959/src/lib.rs index 206d90a..f5d80a9 100644 --- a/ad9959/src/lib.rs +++ b/ad9959/src/lib.rs @@ -582,7 +582,9 @@ impl ProfileSerializer { } if let Some(acr) = acr { - self.add_write(Register::ACR, &acr.to_be_bytes()); + let mut data = [0; 3]; + data[1..=2].copy_from_slice(&acr.to_be_bytes()); + self.add_write(Register::ACR, &data); } } From bf3dae814da274052c05f4dde3d3a835fe907af5 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 8 Apr 2021 14:58:28 +0200 Subject: [PATCH 2/8] Updating ACR to 32-bit --- ad9959/src/lib.rs | 11 +++++------ src/hardware/pounder/dds_output.rs | 5 +++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ad9959/src/lib.rs b/ad9959/src/lib.rs index f5d80a9..a8fc48e 100644 --- a/ad9959/src/lib.rs +++ b/ad9959/src/lib.rs @@ -558,13 +558,14 @@ impl ProfileSerializer { /// * `channels` - A list of channels to apply the configuration to. /// * `ftw` - If provided, indicates a frequency tuning word for the channels. /// * `pow` - If provided, indicates a phase offset word for the channels. - /// * `acr` - If provided, indicates the amplitude control register for the channels. + /// * `acr` - If provided, indicates the amplitude control register for the channels. The ACR + /// should be stored in the 3 LSB of the word. pub fn update_channels( &mut self, channels: &[Channel], ftw: Option, pow: Option, - acr: Option, + acr: Option, ) { let mut csr: u8 = *0u8.set_bits(1..3, self.mode as u8); for channel in channels.iter() { @@ -582,9 +583,7 @@ impl ProfileSerializer { } if let Some(acr) = acr { - let mut data = [0; 3]; - data[1..=2].copy_from_slice(&acr.to_be_bytes()); - self.add_write(Register::ACR, &data); + self.add_write(Register::ACR, &acr.to_be_bytes()[1..=4]); } } @@ -608,7 +607,6 @@ impl ProfileSerializer { // Pad the buffer to 32-bit alignment by adding dummy writes to CSR and LSRR. let padding = 4 - (self.index % 4); match padding { - 0 => {} 1 => { // For a pad size of 1, we have to pad with 5 bytes to align things. self.add_write(Register::CSR, &[(self.mode as u8) << 1]); @@ -616,6 +614,7 @@ impl ProfileSerializer { } 2 => self.add_write(Register::CSR, &[(self.mode as u8) << 1]), 3 => self.add_write(Register::LSRR, &[0, 0, 0]), + 4 => {} _ => unreachable!(), } diff --git a/src/hardware/pounder/dds_output.rs b/src/hardware/pounder/dds_output.rs index c7c5e6d..e755482 100644 --- a/src/hardware/pounder/dds_output.rs +++ b/src/hardware/pounder/dds_output.rs @@ -144,14 +144,15 @@ impl<'a> ProfileBuilder<'a> { /// * `channels` - A list of channels to apply the configuration to. /// * `ftw` - If provided, indicates a frequency tuning word for the channels. /// * `pow` - If provided, indicates a phase offset word for the channels. - /// * `acr` - If provided, indicates the amplitude control register for the channels. + /// * `acr` - If provided, indicates the amplitude control register for the channels. The + /// 24-bits of the ACR should be stored in the last 3 LSB. #[allow(dead_code)] pub fn update_channels( mut self, channels: &[Channel], ftw: Option, pow: Option, - acr: Option, + acr: Option, ) -> Self { self.serializer.update_channels(channels, ftw, pow, acr); self From 4a2d4af5088ec91f78097bed80f3b7efc303c1ec Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 8 Apr 2021 15:00:30 +0200 Subject: [PATCH 3/8] Fixing end index --- ad9959/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ad9959/src/lib.rs b/ad9959/src/lib.rs index a8fc48e..9b7d77b 100644 --- a/ad9959/src/lib.rs +++ b/ad9959/src/lib.rs @@ -583,7 +583,7 @@ impl ProfileSerializer { } if let Some(acr) = acr { - self.add_write(Register::ACR, &acr.to_be_bytes()[1..=4]); + self.add_write(Register::ACR, &acr.to_be_bytes()[1..=3]); } } From 35aa3eb606fde3c090418512c67b1d724c064269 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 8 Apr 2021 15:04:34 +0200 Subject: [PATCH 4/8] Fixing other AD9959 profile issues --- ad9959/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ad9959/src/lib.rs b/ad9959/src/lib.rs index 9b7d77b..89192b6 100644 --- a/ad9959/src/lib.rs +++ b/ad9959/src/lib.rs @@ -610,10 +610,10 @@ impl ProfileSerializer { 1 => { // For a pad size of 1, we have to pad with 5 bytes to align things. self.add_write(Register::CSR, &[(self.mode as u8) << 1]); - self.add_write(Register::LSRR, &[0, 0, 0]); + self.add_write(Register::LSRR, &[0, 0]); } 2 => self.add_write(Register::CSR, &[(self.mode as u8) << 1]), - 3 => self.add_write(Register::LSRR, &[0, 0, 0]), + 3 => self.add_write(Register::LSRR, &[0, 0]), 4 => {} _ => unreachable!(), From 090ec4650d5817f9770cfebbff1e2528dd090815 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 8 Apr 2021 16:05:51 +0200 Subject: [PATCH 5/8] Update ad9959/src/lib.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Jördens --- ad9959/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ad9959/src/lib.rs b/ad9959/src/lib.rs index 89192b6..21dfa21 100644 --- a/ad9959/src/lib.rs +++ b/ad9959/src/lib.rs @@ -559,7 +559,8 @@ impl ProfileSerializer { /// * `ftw` - If provided, indicates a frequency tuning word for the channels. /// * `pow` - If provided, indicates a phase offset word for the channels. /// * `acr` - If provided, indicates the amplitude control register for the channels. The ACR - /// should be stored in the 3 LSB of the word. + /// should be stored in the 3 LSB of the word. Note that if amplitude scaling is to be used, + /// the "Amplitude multiplier enable" bit must be set. pub fn update_channels( &mut self, channels: &[Channel], From 7372bcc2e237504be33006b31edccd075e65d28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 8 Apr 2021 16:20:28 +0200 Subject: [PATCH 6/8] miniconf.py: add iir example --- miniconf.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/miniconf.py b/miniconf.py index 019ebcb..0901127 100644 --- a/miniconf.py +++ b/miniconf.py @@ -83,9 +83,12 @@ class Miniconf: def main(): parser = argparse.ArgumentParser( description='Miniconf command line interface.', - epilog='''Example: - %(prog)s -v -b mqtt dt/sinara/stabilizer afe/0 '"G10"' - ''') + formatter_class=argparse.RawDescriptionHelpFormatter, + epilog='''Examples: +%(prog)s dt/sinara/stabilizer afe/0 '"G10"' +%(prog)s dt/sinara/stabilizer iir_ch/0/0 \ +'{"y_min": -32767, "y_max": 32767, "y_offset": 0, "ba": [1.0, 0, 0, 0, 0]}' +''') parser.add_argument('-v', '--verbose', action='count', default=0, help='Increase logging verbosity') parser.add_argument('--broker', '-b', default='mqtt', type=str, From a3511f522315ffbe287742bb826fb109cd55f72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 8 Apr 2021 16:26:22 +0200 Subject: [PATCH 7/8] cli: print response directly --- miniconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniconf.py b/miniconf.py index 0901127..d7fd615 100644 --- a/miniconf.py +++ b/miniconf.py @@ -111,7 +111,7 @@ def main(): async def configure_settings(): interface = await Miniconf.create(args.prefix, args.broker) response = await interface.command(args.path, json.loads(args.value)) - print(f"Response: {response}") + print(response) loop.run_until_complete(configure_settings()) From 7329d0f24151cb49d46fb5e81145c6c4bfeb5a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 8 Apr 2021 17:11:44 +0200 Subject: [PATCH 8/8] cli,hitl: allow more settings per invokation, expand example --- hitl/run.sh | 4 +++- miniconf.py | 15 +++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hitl/run.sh b/hitl/run.sh index a01a472..8fe9a3a 100755 --- a/hitl/run.sh +++ b/hitl/run.sh @@ -22,4 +22,6 @@ python3 -m pip install -r requirements.txt ping -c 5 -w 20 stabilizer-hitl # Test the MQTT interface. -python3 miniconf.py dt/sinara/stabilizer afe/0 '"G2"' +python3 miniconf.py dt/sinara/stabilizer afe/0='"G2"' +python3 miniconf.py dt/sinara/stabilizer afe/0='"G1"' iir_ch/0/0=\ +'{"y_min": -32767, "y_max": 32767, "y_offset": 0, "ba": [1.0, 0, 0, 0, 0]}' diff --git a/miniconf.py b/miniconf.py index d7fd615..b059f78 100644 --- a/miniconf.py +++ b/miniconf.py @@ -85,8 +85,7 @@ def main(): description='Miniconf command line interface.', formatter_class=argparse.RawDescriptionHelpFormatter, epilog='''Examples: -%(prog)s dt/sinara/stabilizer afe/0 '"G10"' -%(prog)s dt/sinara/stabilizer iir_ch/0/0 \ +%(prog)s dt/sinara/stabilizer afe/0='"G2"' iir_ch/0/0=\ '{"y_min": -32767, "y_max": 32767, "y_offset": 0, "ba": [1.0, 0, 0, 0, 0]}' ''') parser.add_argument('-v', '--verbose', action='count', default=0, @@ -95,10 +94,8 @@ def main(): help='The MQTT broker address') parser.add_argument('prefix', type=str, help='The MQTT topic prefix of the target') - parser.add_argument('path', type=str, - help='The setting path to configure') - parser.add_argument('value', type=str, - help='The value of setting in JSON format') + parser.add_argument('settings', metavar="KEY=VALUE", nargs='+', + help='JSON encoded values for settings path keys.') args = parser.parse_args() @@ -110,8 +107,10 @@ def main(): async def configure_settings(): interface = await Miniconf.create(args.prefix, args.broker) - response = await interface.command(args.path, json.loads(args.value)) - print(response) + for kv in args.settings: + path, value = kv.split("=", 1) + response = await interface.command(path, json.loads(value)) + print(response) loop.run_until_complete(configure_settings())