More on my electrical woes.
Today I checked wiring continuity on EPB system - all good, which led me to suspect either an instrument cluster or EPB module fault. I connected my spare EPB module and no amber parkbrake fault light!
I then reconnected the original EPB module and still no fault light. Have I somehow erased a latched fault?
I've since operated the EPB half a dozen times and can't reproduce the fault light - happy days.
The only down side is that my suspension fault light is back with the RH height sensor message. I'm suspecting that the connectors in the LH rear wheel arch may have dirty pins as that is the only part of the suspension system that I have disturbed.
These machines can be a bit sensitive!!

