Add bmctrl command and ramps

41d0b0ad · Tristan Gingold · Adam Wujek · 1fce913e · 41d0b0ad · 41d0b0ad
Commit 41d0b0ad authored May 15, 2023 by Tristan Gingold Committed by Adam Wujek Jun 02, 2023
6 changed files
--- a/software/include/wr2rf_init_regs.h
+++ b/software/include/wr2rf_init_regs.h
@@ -427,6 +427,20 @@ cs2: IQ DAC 2
 #define ADDR_MASK_WR2RF_INIT_REGS_XADC 0x3f00UL
 #define WR2RF_INIT_REGS_XADC_SIZE 256 /* 0x100 */

+/* Interface to play an ftw sequence */
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME 0x500UL
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_SIZE 4 /* 0x4 */
+
+/* None */
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_CTRL 0x500UL
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_CTRL_RESET 0x1UL
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_CTRL_EN 0x2UL
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_CTRL_UPDATE 0x4UL
+
+/* None */
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_STATUS 0x502UL
+#define WR2RF_INIT_REGS_BMCTRL_RFFRAME_STATUS_FIFO_RDY 0x1UL
+
 /* WR ptp core (peripheral only) */
 #define WR2RF_INIT_REGS_WRPC 0x2000UL
 #define ADDR_MASK_WR2RF_INIT_REGS_WRPC 0x2000UL
@@ -756,8 +770,17 @@ cs2: IQ DAC 2
  /* [0x400]: SUBMAP Xilinx ADC */
  uint32_t xadc[64];

+  /* [0x500]: BLOCK Interface to play an ftw sequence */
+  struct bmctrl_rfframe {
+    /* [0x0]: REG (rw) (no description) */
+    uint16_t ctrl;
+
+    /* [0x2]: REG (ro) (no description) */
+    uint16_t status;
+  } bmctrl_rfframe;
+
  /* padding to: 2048 words */
-  uint32_t __padding_8[1728];
+  uint32_t __padding_8[1727];

  /* [0x2000]: SUBMAP WR ptp core (peripheral only) */
  uint32_t wrpc[2048];

--- a/software/libwr2rf/wr2rf.c
+++ b/software/libwr2rf/wr2rf.c
--- a/software/ramps/ramp.h
+++ b/software/ramps/ramp.h
+#ifndef __RAMP_H_
+#define __RAMP_H_
+
+typedef struct ramp_ {
+    unsigned           ctrl;
+    unsigned long long ftw_h1;
+} ramp_t;
+
+#endif
--- a/software/ramps/ramp_fast_sftpro2.h
+++ b/software/ramps/ramp_fast_sftpro2.h
--- a/software/ramps/ramp_lhcpilot.h
+++ b/software/ramps/ramp_lhcpilot.h
--- a/software/ramps/ramp_sftpro2.h
+++ b/software/ramps/ramp_sftpro2.h