Refactor raspi to use new adaptor interface