Added register description enumeration.

rombrew · Sep 14, 2024 · 79e35b6 · 79e35b6
1 parent 1522380
commit 79e35b6
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 123 deletions.
diff --git a/pgui/config.c b/pgui/config.c
@@ -239,6 +239,6 @@ void config_default(struct config_phobia *fe)
 
 	strcpy(fe->fuzzy, "setpoint");
 
-	fe->regfile = 490;
+	fe->regfile = 500;
 }
 
diff --git a/pgui/link.c b/pgui/link.c
@@ -267,6 +267,7 @@ link_reg_postproc(struct link_pmc *lp, struct link_reg *reg)
 	if (lk_stod(&dval, reg->val) != NULL) {
 
 		reg->mode |= LINK_REG_TYPE_FLOAT;
+
 		reg->fval = (float) dval;
 
 		if (reg->started != 0) {
@@ -301,6 +302,8 @@ link_reg_postproc(struct link_pmc *lp, struct link_reg *reg)
 			&& reg->lval >= 0
 			&& reg->lval < LINK_COMBO_MAX) {
 
+		reg->mode |= LINK_REG_TYPE_ENUM;
+
 		if (reg->combo[reg->lval] == NULL) {
 
 			reg->combo[reg->lval] = link_mballoc(lp, LINK_NAME_MAX);
@@ -882,6 +885,7 @@ void link_push(struct link_pmc *lp)
 				if (serial_fputs(priv->fd, priv->lbuf) == SERIAL_OK) {
 
 					reg->queued = lp->clock;
+
 					lp->locked = lp->clock + lp->quantum;
 				}
 
@@ -894,6 +898,23 @@ void link_push(struct link_pmc *lp)
 				if (serial_fputs(priv->fd, priv->lbuf) == SERIAL_OK) {
 
 					reg->queued = lp->clock;
+
+					lp->locked = lp->clock + lp->quantum;
+				}
+
+				break;
+			}
+
+			if (		(reg->mode & LINK_REG_TYPE_ENUM) != 0
+					&& reg->enumerated == 0) {
+
+				sprintf(priv->lbuf, "enum_reg %i" LINK_EOL, reg_ID);
+
+				if (serial_fputs(priv->fd, priv->lbuf) == SERIAL_OK) {
+
+					reg->queued = lp->clock;
+					reg->enumerated = lp->clock;
+
 					lp->locked = lp->clock + lp->quantum;
 				}
 

diff --git a/pgui/link.h b/pgui/link.h
@@ -18,6 +18,8 @@ enum {
 
 	LINK_REG_TYPE_INT	= (1UL << 8),
 	LINK_REG_TYPE_FLOAT	= (1UL << 9),
+
+	LINK_REG_TYPE_ENUM	= (1UL << 10)
 };
 
 enum {
@@ -43,6 +45,7 @@ struct link_reg {
 	int		modified;
 	int		fetched;
 	int		queued;
+	int		enumerated;
 
 	char		sym[LINK_NAME_MAX];
 	char		val[LINK_NAME_MAX];