Reworked coordinate solver axis specification

1 files changed, 11 insertions, 21 deletions

diff --git a/src/solvers/coord/utils.h b/src/solvers/coord/utils.h
index 5b8f538..93704cc 100644
--- a/src/solvers/coord/utils.h
+++ b/src/solvers/coord/utils.h
@@ -1,6 +1,5 @@
 STATIC coord_t *parse_coord(size_t, const char *);
-STATIC uint8_t parse_axis(const char [static 2]);
-STATIC void parse_coord_and_axis(const char *, coord_t **, uint8_t *);
+STATIC void parse_coord_and_trans(const char *, coord_t **, uint8_t *);
 STATIC long long dataid_coord(const char *, char [static NISSY_SIZE_DATAID]);
 
 STATIC coord_t *
@@ -8,6 +7,10 @@ parse_coord(size_t n, const char *coord)
 {
         int i;
 
+        /*
+        TODO Some coordinates are parsed incorrectly, e.g. DRFINNOE
+        TODO is matched by DRFIN. Check that strncmp is used correctly.
+        */
         for (i = 0; all_coordinates[i] != NULL; i++)
                 if (!strncmp(all_coordinates[i]->name, coord, n))
                         return all_coordinates[i];
@@ -15,25 +18,11 @@ parse_coord(size_t n, const char *coord)
         return NULL;
 }
 
-STATIC uint8_t
-parse_axis(const char axis[static 2])
-{
-        if (!strcmp(axis, "UD") || !strcmp(axis, "DU")) {
-                return AXIS_UD;
-        } else if (!strcmp(axis, "RL") || !strcmp(axis, "LR")) {
-                return AXIS_RL;
-        } else if (!strcmp(axis, "FB") || !strcmp(axis, "BF")) {
-                return AXIS_FB;
-        }
-
-        return UINT8_ERROR;
-}
-
 STATIC void
-parse_coord_and_axis(
+parse_coord_and_trans(
         const char *str,
         coord_t **coord,
-        uint8_t *axis
+        uint8_t *trans
 )
 {
         size_t i;
@@ -45,8 +34,9 @@ parse_coord_and_axis(
         if (coord != NULL)
                 *coord = parse_coord(i-6, str+6);
 
-        if (axis != NULL)
-                *axis = i == strlen(str) ? UINT8_ERROR : parse_axis(str+i+1);
+        if (trans != NULL)
+                *trans = i == strlen(str) ?
+                    UINT8_ERROR : readrotation(str+i+1);
 }
 
 STATIC long long
@@ -54,7 +44,7 @@ dataid_coord(const char *ca, char dataid[static NISSY_SIZE_DATAID])
 {
         coord_t *c;
 
-        parse_coord_and_axis(ca, &c, NULL);
+        parse_coord_and_trans(ca, &c, NULL);
 
         if (c == NULL) {
                 LOG("Error: cannot parse coordinate from '%s'\n", ca);