Merge branch 'master' into add-ax5206-support

2018-03-09 22:29:18 +01:00
parent 8ff61dc09c 04c896b6ae
commit 4582e05e09
9 changed files with 279 additions and 3 deletions
--- a/src/lcec_conf.c
+++ b/src/lcec_conf.c
@@ -123,6 +123,9 @@ static const LCEC_CONF_TYPELIST_T slaveTypes[] = {
  { "EL4122", lcecSlaveTypeEL4122 },
  { "EL4132", lcecSlaveTypeEL4132 },

+  // analog out, 4ch, 16 bits
+  { "EL4104", lcecSlaveTypeEL4104 },
+
  // encoder inputs
  { "EL5101", lcecSlaveTypeEL5101 },
  { "EL5151", lcecSlaveTypeEL5151 },