Merge branch 'master' into improved_io2
This commit is contained in:
commit
23787d0e21
|
@ -1011,11 +1011,12 @@ page = 10
|
|||
requiresPowerCycle = knock_trigger
|
||||
requiresPowerCycle = knock_pullup
|
||||
requiresPowerCycle = idleUpEnabled
|
||||
|
||||
requiresPowerCycle = caninput_sel0a
|
||||
requiresPowerCycle = caninput_sel0b
|
||||
requiresPowerCycle = caninput_sel1a
|
||||
requiresPowerCycle = caninput_sel1b
|
||||
requiresPowerCycle = caninput_sel2a
|
||||
requiresPowerCycle = caninput_sel2a
|
||||
requiresPowerCycle = caninput_sel2b
|
||||
requiresPowerCycle = caninput_sel3a
|
||||
requiresPowerCycle = caninput_sel3b
|
||||
|
|
|
@ -98,6 +98,10 @@ void initialiseADC()
|
|||
//currentStatus.canin[14] = 44; Dev test use only!
|
||||
auxIsEnabled = true;
|
||||
}
|
||||
//Channel is active and analog
|
||||
pinMode( pinNumber, INPUT);
|
||||
auxIsEnabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue