A system for mapping electrical activity of a patient's heart. The system includes a set of electrodes spaced from the heart wall and a set of electrodes in contact with the heart wall. Voltage measurements from the electrodes are used to generate three-dimensional and two-dimensional maps of the electrical activity of the heart.