Diatonic scale

A diatonic scale is a major or minor scale with eight notes in a octave.

Chromatic scale

A chromatic scale is a scale that includes every note in a octave. It is made up of 12 half steps.