Remove \y and \r dependency from \F1 and \F2
Merge branch 'my-rpi' into laptop