This paper describes the development and testing of a software based flickermeter used in order to assess the supply quality from the LIMPET wave-power station on Islay. It describes the phenomenon of voltage flicker and the effect that a wave-power station has on this quantity. The paper also explains techniques developed in order to improve flickermeter performance when used with pre-recorded data. It also shows that the standard flickermeter sample frequency may be reduced for wave-station applications. Finally the paper presents flicker results from preliminary data collected from the LIMPET station and shows that the device is operating well within acceptable limits. (5 pages)