plc_dio: sense all inputs.

fdc2644b · Tristan Gingold · 57dd9237 · fdc2644b
Commit fdc2644b authored May 04, 2020 by Tristan Gingold
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

plc_dio.c sw/plc_urv/plc_dio.c +9 -7

No files found.
--- a/sw/plc_urv/plc_dio.c
+++ b/sw/plc_urv/plc_dio.c
 #include <stdint.h>
 #include "plc_urv_regs.h"

-/* Ch0: input (bit 1)
-   ch1: -- (bit 0).
-   ch2: --
-   ch3: output (bit 5, en 8)  */
+/* Ch0: input  (bit 1, en 6)
+   ch1: --     (bit 0, en 7).
+   ch2: --     (bit 2, en 9)
+   ch3: output (bit 5, en 8)
+   ch4: output (bit 4, en 11)  */

 #define SLOT pins_5

-#define OEN ((1 << 6) | (1 << 7) | (0 << 8) | (0 << 9) | (0 << 11))
+//            ch0        ch1        ch3         ch2       ch4
+#define OEN ((1 << 6) | (1 << 7) | (1 << 8) | (1 << 9) | (0 << 11))

 void
 init (void)
@@ -28,10 +30,10 @@ main (void)
  while (1) {
    unsigned v = regs->loops.SLOT;

-    v = !! (v & 0x7);
+    v = !! (v & 0x27);
      // v = (v & 2) >> 1;
    //    v |= regs->loops.pins_4 & 1;

-    regs->relays.SLOT = (v << 5) | OEN;
+    regs->relays.SLOT = (v << 4) | OEN;
  }
 }