Silence the tone for pauses in legato tunes. Some tunes sound better now.

Add new, distinctive error/notification tones.

Reduce the amount of data space consumed by the largest tune.

1 files changed, 142 insertions, 141 deletions

diff --git a/apps/drivers/stm32/tone_alarm/tone_alarm.cpp b/apps/drivers/stm32/tone_alarm/tone_alarm.cpp
index d281c8f44..baa652d8a 100644
--- a/apps/drivers/stm32/tone_alarm/tone_alarm.cpp
+++ b/apps/drivers/stm32/tone_alarm/tone_alarm.cpp
@@ -309,153 +309,153 @@ private:
 // predefined tune array
 const char * const ToneAlarm::_default_tunes[] = {
 	"MFT240L8 O4aO5dc O4aO5dc O4aO5dc L16dcdcdcdc",		// startup tune
-	"MBMLA",						// continuous A
-	"MFO4MLT60c",						// 1second c4 (placeholder)
-	"MFO4MLT60d",						// 1second d4 (placeholder)
-	"MFO4MLT60e",						// 1second e4 (placeholder)
+	"MBT200a8a8a8PaaaP",					// ERROR tone
+	"MFT200e8a8a",						// NotifyPositive tone
+	"MFT200e8e",						// NotifyNeutral tone
+	"MFT200e8c8e8c8e8c8",					// NotifyNegative tone
 	"MFT90O3C16.C32C16.C32C16.C32G16.E32G16.E32G16.E32C16.C32C16.C32C16.C32G16.E32G16.E32G16.E32C4", // charge!
 	"MFT60O3C32O2A32F16F16F32G32A32A+32O3C16C16C16O2A16",	// dixie
 	"MFT90O2C16C16C16F8.A8C16C16C16F8.A4P16P8",		// cucuracha
 	"MNT150L8O2GGABGBADGGABL4GL8F+",			// yankee
 	"MFT200O3C4.O2A4.G4.F4.D8E8F8D4F8C2.O2G4.O3C4.O2A4.F4.D8E8F8G4A8G2P8", // daisy
 	"T200O2B4P8B16B16B4P8B16B16B8G+8E8G+8B8G+8B8O3E8"	// william tell
-	"T200O2B8G+8E8G+8B8G+8B8O3E8O2B4P8B16B16B4P8B16"
-	"T200O2B16B4P8B16B16B4P8B16B16B8B16B16B8B8B8B16"
-	"T200O2B16B8B8B8B16B16B8B8B8B16B16B8B8B2B2B8P8"
-	"T200P4P4P8O1B16B16B8B16B16B8B16B16O2E8F+8G+8"
-	"T200O1B16B16B8B16B16O2E8G+16G+16F+8D+8O1B8B16"
-	"T200O1B16B8B16B16B8B16B16O2E8F+8G+8E16G+16B4"
-	"T200O2B16A16G+16F+16E8G+8E8O3B16B16B8B16B16B8"
-	"T200O3B16B16O4E8F+8G+8O3B16B16B8B16B16O4E8G+16"
-	"T200O4G+16F+8D+8O3B8B16B16B8B16B16B8B16B16O4E8"
-	"T200O4F+8G+8E16G+16B4B16A16G+16F+16E8G+8E8O3G+16"
-	"T200O3G+16G+8G+16G+16G+8G+16G+16G+8O4C+8O3G+8"
-	"T200O4C+8O3G+8O4C+8O3G+8F+8E8D+8C+8G+16G+16G+8"
-	"T200O3G+16G+16G+8G+16G+16G+8O4C+8O3G+8O4C+8O3G+8"
-	"T200O4C+8O3B8A+8B8A+8B8G+16G+16G+8G+16G+16G+8"
-	"T200O3G+16G+16G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3G+8"
-	"T200O3F+8E8D+8C+8G+16G+16G+8G+16G+16G+8G+16G+16"
-	"T200O3G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3B8A+8B8O2B16"
-	"T200O2B16B8F+16F+16F+8F+16F+16F+8G+8A8F+4A8G+8"
-	"T200O2E4G+8F+8F+8F+8O3F+16F+16F+8F+16F+16F+8"
-	"T200O3G+8A8F+4A8G+8E4G+8F+8O2B16B16B8O1B16B16"
-	"T200O1B8B16B16B8B16B16O2E8F+8G+8O1B16B16B8B16"
-	"T200O1B16O2E8G+16G+16F+8D+8O1B8B16B16B8B16B16"
-	"T200O1B8B16B16O2E8F+8G+8E16G+16B4B16A16G+16F+16"
-	"T200O2E8G+8E8O3B16B16B8B16B16B8B16B16O4E8F+8"
-	"T200O4G+8O3B16B16B8B16B16O4E8G+16G+16F+8D+8O3B8"
-	"T200O3B16B16B8B16B16B8B16B16O4E8F+8G+8E16G+16"
-	"T200O4B4B16A16G+16F+16E8G+8E8O3E64F64G64A64B64"
-	"T200O4C64D64E8E16E16E8E8G+4.F+8E8D+8E8C+8O3B16"
-	"T200O4C+16O3B16O4C+16O3B16O4C+16D+16E16O3A16"
-	"T200O3B16A16B16A16B16O4C+16D+16O3G+16A16G+16"
-	"T200O3A16G+16A16B16O4C+16O3F+16G+16F+16G+16F+16"
-	"T200O3G+16F+16G+16F+16G+16F+16D+16O2B16O3B16"
-	"T200O4C+16D+16E8D+8E8C+8O3B16O4C+16O3B16O4C+16"
-	"T200O3B16O4C+16D+16E16O3A16B16A16B16A16B16O4C+16"
-	"T200O4D+16O3G+16A16G+16A16G+16A16B16O4C+16O3F+16"
-	"T200O3G+16F+16G+16F+16A16F+16E16E8P8C+4C+16O2C16"
-	"T200O3C+16O2C16O3D+16C+16O2B16A16A16G+16E16C+16"
-	"T200O2C+16C+16C+16C+16E16D+16O1C16G+16G+16G+16"
-	"T200O1G+16G+16G+16O2C+16E16G+16O3C+16C+16C+16"
-	"T200O3C+16C+16O2C16O3C+16O2C16O3D+16C+16O2B16"
-	"T200O2A16A16G+16E16C+16C+16C+16C+16C+16E16D+16"
-	"T200O1C16G+16G+16G+16G+16G+16G+16O2C+16E16G+16"
-	"T200O3C+16E16D+16C+16D+16O2C16G+16G+16G+16O3G+16"
-	"T200O3E16C+16D+16O2C16G+16G+16G+16O3G+16E16C+16"
-	"T200O3D+16O2B16G+16G+16A+16G16D+16D+16G+16G16"
-	"T200O2G+16G16G+16A16G+16F+16E16O1B16A+16B16O2E16"
-	"T200O1B16O2F+16O1B16O2G+16E16D+16E16G+16E16A16"
-	"T200O2F+16B16O3G+16F+16E16D+16F+16E16C+16O2B16"
-	"T200O3C+16O2B16O3C+16D+16E16F+16G+16O2A16B16"
-	"T200O2A16B16O3C+16D+16E16F+16O2G+16A16G+16A16"
-	"T200O2C16O3C+16D+16E16O2F+16G+16F+16G+16F+16"
-	"T200O2G+16F+16G+16F+16G+16F+16D+16O1B16C16O2C+16"
-	"T200O2D+16E16O1B16A+16B16O2E16O1B16O2F+16O1B16"
-	"T200O2G+16E16D+16E16G+16E16A16F+16B16O3G+16F+16"
-	"T200O3E16D+16F+16E16C+16O2B16O3C+16O2B16O3C+16"
-	"T200O3D+16E16F+16G+16O2A16B16A16B16O3C+16D+16"
-	"T200O3E16F+16O2G+16A16G+16A16B16O3C+16D+16E16"
-	"T200O2F+16O3C+16O2C16O3C+16D+16C+16O2A16F+16"
-	"T200O2E16O3E16F+16G+16A16B16O4C+16D+16E8E16E16"
-	"T200O4E8E8G+4.F8E8D+8E8C+8O3B16O4C+16O3B16O4C+16"
-	"T200O3B16O4C+16D+16E16O3A16B16A16B16A16B16O4C+16"
-	"T200O4D+16O3G+16A16G+16A16G+16A16B16O4C+16O3F+16"
-	"T200O3G+16F+16G+16F+16G+16F+16G+16F+16G+16F+16"
-	"T200O3D+16O2B16O3B16O4C+16D+16E8E16E16E8E8G+4."
-	"T200O4F+8E8D+8E8C+8O3B16O4C+16O3B16O4C+16O3B16"
-	"T200O4C+16D+16E16O3A16B16A16B16A16B16O4C+16D+16"
-	"T200O3G+16A16G+16A16G+16A16B16O4C+16O3F+16G+16"
-	"T200O3F+16G+16F+16A16G+16F+16E8O2B8O3E8G+16G+16"
-	"T200O3G+8G+16G+16G+8G+16G+16G+8O4C+8O3G+8O4C+8"
-	"T200O3G+8O4C+8O3G+8F+8E8D+8C+8G+16G+16G+8G+16"
-	"T200O3G+16G+8G+16G+16G+8O4C+8O3G+8O4C+8O3G+8"
-	"T200O4C+8O3B8A+8B8A+8B8G+16G+16G+8G+16G+16G+8"
-	"T200O3G+16G+16G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3G+8"
-	"T200O3F+8E8D+8C+8G+16G+16G+8G+16G+16G+8G+16G+16"
-	"T200O3G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3B8A+8B8A+8"
-	"T200O3B8O2F+16F+16F+8F+16F+16F+8G+8A8F+4A8G+8"
-	"T200O2E4G+8F+8B8O1B8O2F+16F+16F+8F+16F+16F+8"
-	"T200O2G+8A8F+4A8G+8E4G+8F+8B16B16B8O1B16B16B8"
-	"T200O1B16B16B8B16B16O2E8F+8G+8O1B16B16B8B16B16"
-	"T200O2E8G+16G+16F+8D+8O1B8B16B16B8B16B16B8B16"
-	"T200O1B16O2E8F+8G+8E16G+16B4B16A16G+16F+16E8"
-	"T200O1B8O2E8O3B16B16B8B16B16B8B16B16O4E8F+8G+8"
-	"T200O3B16B16B8B16B16O4E8G+16G+16F+8D+8O3B8B16"
-	"T200O3B16B8B16B16B8B16B16O4E8F+8G+8O3E16G+16"
-	"T200O3B4B16A16G+16F+16E16F+16G+16A16G+16A16B16"
-	"T200O4C+16O3B16O4C+16D+16E16D+16E16F+16G+16A16"
-	"T200O3B16O4A16O3B16O4A16O3B16O4A16O3B16O4A16"
-	"T200O3B16O4A16O3B16O4A16O3B16O4A16O3B16E16F+16"
-	"T200O3G+16A16G+16A16B16O4C+16O3B16O4C+16D+16"
-	"T200O4E16D+16E16F+16G+16A16O3B16O4A16O3B16O4A16"
-	"T200O3B16O4A16O3B16O4A16O3B16O4A16O3B16O4A16"
-	"T200O3B16O4A16O3B16P16G+16O4G+16O3G+16P16D+16"
-	"T200O4D+16O3D+16P16E16O4E16O3E16P16A16O4A16O3A16"
-	"T200P16O3G+16O4G+16O3G+16P16D+16O4D+16O3D+16"
-	"T200P16O3E16O4E16O3E16P16A16O4A16O3A16O4G16O3G16"
-	"T200O4G16O3G16O4G16O3G16O4G16O3G16O4G8E8C8E8"
-	"T200O4G+16O3G+16O4G+16O3G+16O4G+16O3G+16O4G+16"
-	"T200O3G+16O4G+8E8O3B8O4E8G+16O3G+16O4G+16O3G+16"
-	"T200O4G+16O3G+16O4G+16O3G+16O4G+8F8C+8F8A+16"
-	"T200O3A+16O4A+16O3A+16O4A+16O3A+16O4A+16O3A+16"
-	"T200O4A+8G8E8G8B8P16A+16P16A16P16G+16P16F+16"
-	"T200P16O4E16P16D+16P16C+16P16O3B16P16A+16P16"
-	"T200O3A16P16G+16P16F+16P16E16P16D+16P16F+16E16"
-	"T200O3F+16G+16A16G+16A16B16O4C+16O3B16O4C+16"
-	"T200O4D+16E16D+16E16F+16G+16A16O3B16O4A16O3B16"
-	"T200O4A16O3B16O4A16O3B16O4A16O3B16O4A16O3B16"
-	"T200O4A16O3B16O4A16O3B16E16F+16G+16A16G+16A16"
-	"T200O3B16O4C+16O3B16O4C+16D+16E16D+16E16F+16"
-	"T200O4G+16A16O3B16O4A16O3B16O4A16O3B16O4A16O3B16"
-	"T200O4A16O3B16O4A16O3B16O4A16O3B16O4A16O3B16"
-	"T200P16O3G+16O4G+16O3G+16P16D+16O4D+16O3D+16"
-	"T200P16O3E16O4E16O3E16P16A16O4A16O3A16P16G+16"
-	"T200O4G+16O3G+16P16D+16O4D+16O3D+16P16E16O4E16"
-	"T200O3E16P16A16O4A16O3A16O4G16O3G16O4G16O3G16"
-	"T200O4G16O3G16O4G16O3G16O4G8E8C8E8G+16O3G+16"
-	"T200O4G+16O3G+16O4G+16O3G+16O4G+16O3G+16O4G+8"
-	"T200O4E8O3B8O4E8G+16O3G+16O4G+16O3G+16O4G+16"
-	"T200O3G+16O4G+16O3G+16O4G+8F8C+8F8A+16O3A+16"
-	"T200O4A+16O3A+16O4A+16O3A+16O4A+16O3A+16O4A+8"
-	"T200O4G8E8G8B8P16A+16P16A16P16G+16P16F+16P16"
-	"T200O4E16P16D+16P16C+16P16O3B16P16A+16P16A16"
-	"T200P16O3G+16P16F+16P16E16P16D+16P16F16E16D+16"
-	"T200O3E16D+16E8B16B16B8B16B16B8B16B16O4E8F+8"
-	"T200O4G+8O3B16B16B8B16B16B8B16B16O4G+8A8B8P8"
-	"T200O4E8F+8G+8P8O3G+8A8B8P8P2O2B16C16O3C+16D16"
-	"T200O3D+16E16F16F+16G16G+16A16A+16B16C16O4C+16"
-	"T200O4D+16E16D+16F+16D+16E16D+16F+16D+16E16D+16"
-	"T200O4F+16D+16E16D+16F+16D+16E16D+16F+16D+16"
-	"T200O4E16D+16F+16D+16E16D+16F+16D+16E16D+16F+16"
-	"T200O4D+16E8E16O3E16O4E16O3E16O4E16O3E16O4E8"
-	"T200O3B16O2B16O3B16O2B16O3B16O2B16O3B8G+16O2G+16"
-	"T200O3G+16O2G+16O3G+16O2G+16O3G8E16O2E16O3E16"
-	"T200O2E16O3E16O2E16O3E8E16E16E8E8E8O2B16B16B8"
-	"T200O2B8B8G+16G+16G+8G+8G+8E16E16E8E8E8O1B8O2E8"
-	"T200O1B8O2G+8E8B8G+8O3E8O2B8O3E8O2B8O3G+8E8B8"
-	"T200O3G+8O4E4P8E16E16E8E8E8E8E4P8E16E4P8O2E16"
-	"T200O2E2P64",
+	"O2B8G+8E8G+8B8G+8B8O3E8O2B4P8B16B16B4P8B16"
+	"O2B16B4P8B16B16B4P8B16B16B8B16B16B8B8B8B16"
+	"O2B16B8B8B8B16B16B8B8B8B16B16B8B8B2B2B8P8"
+	"P4P4P8O1B16B16B8B16B16B8B16B16O2E8F+8G+8"
+	"O1B16B16B8B16B16O2E8G+16G+16F+8D+8O1B8B16"
+	"O1B16B8B16B16B8B16B16O2E8F+8G+8E16G+16B4"
+	"O2B16A16G+16F+16E8G+8E8O3B16B16B8B16B16B8"
+	"O3B16B16O4E8F+8G+8O3B16B16B8B16B16O4E8G+16"
+	"O4G+16F+8D+8O3B8B16B16B8B16B16B8B16B16O4E8"
+	"O4F+8G+8E16G+16B4B16A16G+16F+16E8G+8E8O3G+16"
+	"O3G+16G+8G+16G+16G+8G+16G+16G+8O4C+8O3G+8"
+	"O4C+8O3G+8O4C+8O3G+8F+8E8D+8C+8G+16G+16G+8"
+	"O3G+16G+16G+8G+16G+16G+8O4C+8O3G+8O4C+8O3G+8"
+	"O4C+8O3B8A+8B8A+8B8G+16G+16G+8G+16G+16G+8"
+	"O3G+16G+16G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3G+8"
+	"O3F+8E8D+8C+8G+16G+16G+8G+16G+16G+8G+16G+16"
+	"O3G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3B8A+8B8O2B16"
+	"O2B16B8F+16F+16F+8F+16F+16F+8G+8A8F+4A8G+8"
+	"O2E4G+8F+8F+8F+8O3F+16F+16F+8F+16F+16F+8"
+	"O3G+8A8F+4A8G+8E4G+8F+8O2B16B16B8O1B16B16"
+	"O1B8B16B16B8B16B16O2E8F+8G+8O1B16B16B8B16"
+	"O1B16O2E8G+16G+16F+8D+8O1B8B16B16B8B16B16"
+	"O1B8B16B16O2E8F+8G+8E16G+16B4B16A16G+16F+16"
+	"O2E8G+8E8O3B16B16B8B16B16B8B16B16O4E8F+8"
+	"O4G+8O3B16B16B8B16B16O4E8G+16G+16F+8D+8O3B8"
+	"O3B16B16B8B16B16B8B16B16O4E8F+8G+8E16G+16"
+	"O4B4B16A16G+16F+16E8G+8E8O3E64F64G64A64B64"
+	"O4C64D64E8E16E16E8E8G+4.F+8E8D+8E8C+8O3B16"
+	"O4C+16O3B16O4C+16O3B16O4C+16D+16E16O3A16"
+	"O3B16A16B16A16B16O4C+16D+16O3G+16A16G+16"
+	"O3A16G+16A16B16O4C+16O3F+16G+16F+16G+16F+16"
+	"O3G+16F+16G+16F+16G+16F+16D+16O2B16O3B16"
+	"O4C+16D+16E8D+8E8C+8O3B16O4C+16O3B16O4C+16"
+	"O3B16O4C+16D+16E16O3A16B16A16B16A16B16O4C+16"
+	"O4D+16O3G+16A16G+16A16G+16A16B16O4C+16O3F+16"
+	"O3G+16F+16G+16F+16A16F+16E16E8P8C+4C+16O2C16"
+	"O3C+16O2C16O3D+16C+16O2B16A16A16G+16E16C+16"
+	"O2C+16C+16C+16C+16E16D+16O1C16G+16G+16G+16"
+	"O1G+16G+16G+16O2C+16E16G+16O3C+16C+16C+16"
+	"O3C+16C+16O2C16O3C+16O2C16O3D+16C+16O2B16"
+	"O2A16A16G+16E16C+16C+16C+16C+16C+16E16D+16"
+	"O1C16G+16G+16G+16G+16G+16G+16O2C+16E16G+16"
+	"O3C+16E16D+16C+16D+16O2C16G+16G+16G+16O3G+16"
+	"O3E16C+16D+16O2C16G+16G+16G+16O3G+16E16C+16"
+	"O3D+16O2B16G+16G+16A+16G16D+16D+16G+16G16"
+	"O2G+16G16G+16A16G+16F+16E16O1B16A+16B16O2E16"
+	"O1B16O2F+16O1B16O2G+16E16D+16E16G+16E16A16"
+	"O2F+16B16O3G+16F+16E16D+16F+16E16C+16O2B16"
+	"O3C+16O2B16O3C+16D+16E16F+16G+16O2A16B16"
+	"O2A16B16O3C+16D+16E16F+16O2G+16A16G+16A16"
+	"O2C16O3C+16D+16E16O2F+16G+16F+16G+16F+16"
+	"O2G+16F+16G+16F+16G+16F+16D+16O1B16C16O2C+16"
+	"O2D+16E16O1B16A+16B16O2E16O1B16O2F+16O1B16"
+	"O2G+16E16D+16E16G+16E16A16F+16B16O3G+16F+16"
+	"O3E16D+16F+16E16C+16O2B16O3C+16O2B16O3C+16"
+	"O3D+16E16F+16G+16O2A16B16A16B16O3C+16D+16"
+	"O3E16F+16O2G+16A16G+16A16B16O3C+16D+16E16"
+	"O2F+16O3C+16O2C16O3C+16D+16C+16O2A16F+16"
+	"O2E16O3E16F+16G+16A16B16O4C+16D+16E8E16E16"
+	"O4E8E8G+4.F8E8D+8E8C+8O3B16O4C+16O3B16O4C+16"
+	"O3B16O4C+16D+16E16O3A16B16A16B16A16B16O4C+16"
+	"O4D+16O3G+16A16G+16A16G+16A16B16O4C+16O3F+16"
+	"O3G+16F+16G+16F+16G+16F+16G+16F+16G+16F+16"
+	"O3D+16O2B16O3B16O4C+16D+16E8E16E16E8E8G+4."
+	"O4F+8E8D+8E8C+8O3B16O4C+16O3B16O4C+16O3B16"
+	"O4C+16D+16E16O3A16B16A16B16A16B16O4C+16D+16"
+	"O3G+16A16G+16A16G+16A16B16O4C+16O3F+16G+16"
+	"O3F+16G+16F+16A16G+16F+16E8O2B8O3E8G+16G+16"
+	"O3G+8G+16G+16G+8G+16G+16G+8O4C+8O3G+8O4C+8"
+	"O3G+8O4C+8O3G+8F+8E8D+8C+8G+16G+16G+8G+16"
+	"O3G+16G+8G+16G+16G+8O4C+8O3G+8O4C+8O3G+8"
+	"O4C+8O3B8A+8B8A+8B8G+16G+16G+8G+16G+16G+8"
+	"O3G+16G+16G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3G+8"
+	"O3F+8E8D+8C+8G+16G+16G+8G+16G+16G+8G+16G+16"
+	"O3G+8O4C+8O3G+8O4C+8O3G+8O4C+8O3B8A+8B8A+8"
+	"O3B8O2F+16F+16F+8F+16F+16F+8G+8A8F+4A8G+8"
+	"O2E4G+8F+8B8O1B8O2F+16F+16F+8F+16F+16F+8"
+	"O2G+8A8F+4A8G+8E4G+8F+8B16B16B8O1B16B16B8"
+	"O1B16B16B8B16B16O2E8F+8G+8O1B16B16B8B16B16"
+	"O2E8G+16G+16F+8D+8O1B8B16B16B8B16B16B8B16"
+	"O1B16O2E8F+8G+8E16G+16B4B16A16G+16F+16E8"
+	"O1B8O2E8O3B16B16B8B16B16B8B16B16O4E8F+8G+8"
+	"O3B16B16B8B16B16O4E8G+16G+16F+8D+8O3B8B16"
+	"O3B16B8B16B16B8B16B16O4E8F+8G+8O3E16G+16"
+	"O3B4B16A16G+16F+16E16F+16G+16A16G+16A16B16"
+	"O4C+16O3B16O4C+16D+16E16D+16E16F+16G+16A16"
+	"O3B16O4A16O3B16O4A16O3B16O4A16O3B16O4A16"
+	"O3B16O4A16O3B16O4A16O3B16O4A16O3B16E16F+16"
+	"O3G+16A16G+16A16B16O4C+16O3B16O4C+16D+16"
+	"O4E16D+16E16F+16G+16A16O3B16O4A16O3B16O4A16"
+	"O3B16O4A16O3B16O4A16O3B16O4A16O3B16O4A16"
+	"O3B16O4A16O3B16P16G+16O4G+16O3G+16P16D+16"
+	"O4D+16O3D+16P16E16O4E16O3E16P16A16O4A16O3A16"
+	"P16O3G+16O4G+16O3G+16P16D+16O4D+16O3D+16"
+	"P16O3E16O4E16O3E16P16A16O4A16O3A16O4G16O3G16"
+	"O4G16O3G16O4G16O3G16O4G16O3G16O4G8E8C8E8"
+	"O4G+16O3G+16O4G+16O3G+16O4G+16O3G+16O4G+16"
+	"O3G+16O4G+8E8O3B8O4E8G+16O3G+16O4G+16O3G+16"
+	"O4G+16O3G+16O4G+16O3G+16O4G+8F8C+8F8A+16"
+	"O3A+16O4A+16O3A+16O4A+16O3A+16O4A+16O3A+16"
+	"O4A+8G8E8G8B8P16A+16P16A16P16G+16P16F+16"
+	"P16O4E16P16D+16P16C+16P16O3B16P16A+16P16"
+	"O3A16P16G+16P16F+16P16E16P16D+16P16F+16E16"
+	"O3F+16G+16A16G+16A16B16O4C+16O3B16O4C+16"
+	"O4D+16E16D+16E16F+16G+16A16O3B16O4A16O3B16"
+	"O4A16O3B16O4A16O3B16O4A16O3B16O4A16O3B16"
+	"O4A16O3B16O4A16O3B16E16F+16G+16A16G+16A16"
+	"O3B16O4C+16O3B16O4C+16D+16E16D+16E16F+16"
+	"O4G+16A16O3B16O4A16O3B16O4A16O3B16O4A16O3B16"
+	"O4A16O3B16O4A16O3B16O4A16O3B16O4A16O3B16"
+	"P16O3G+16O4G+16O3G+16P16D+16O4D+16O3D+16"
+	"P16O3E16O4E16O3E16P16A16O4A16O3A16P16G+16"
+	"O4G+16O3G+16P16D+16O4D+16O3D+16P16E16O4E16"
+	"O3E16P16A16O4A16O3A16O4G16O3G16O4G16O3G16"
+	"O4G16O3G16O4G16O3G16O4G8E8C8E8G+16O3G+16"
+	"O4G+16O3G+16O4G+16O3G+16O4G+16O3G+16O4G+8"
+	"O4E8O3B8O4E8G+16O3G+16O4G+16O3G+16O4G+16"
+	"O3G+16O4G+16O3G+16O4G+8F8C+8F8A+16O3A+16"
+	"O4A+16O3A+16O4A+16O3A+16O4A+16O3A+16O4A+8"
+	"O4G8E8G8B8P16A+16P16A16P16G+16P16F+16P16"
+	"O4E16P16D+16P16C+16P16O3B16P16A+16P16A16"
+	"P16O3G+16P16F+16P16E16P16D+16P16F16E16D+16"
+	"O3E16D+16E8B16B16B8B16B16B8B16B16O4E8F+8"
+	"O4G+8O3B16B16B8B16B16B8B16B16O4G+8A8B8P8"
+	"O4E8F+8G+8P8O3G+8A8B8P8P2O2B16C16O3C+16D16"
+	"O3D+16E16F16F+16G16G+16A16A+16B16C16O4C+16"
+	"O4D+16E16D+16F+16D+16E16D+16F+16D+16E16D+16"
+	"O4F+16D+16E16D+16F+16D+16E16D+16F+16D+16"
+	"O4E16D+16F+16D+16E16D+16F+16D+16E16D+16F+16"
+	"O4D+16E8E16O3E16O4E16O3E16O4E16O3E16O4E8"
+	"O3B16O2B16O3B16O2B16O3B16O2B16O3B8G+16O2G+16"
+	"O3G+16O2G+16O3G+16O2G+16O3G8E16O2E16O3E16"
+	"O2E16O3E16O2E16O3E8E16E16E8E8E8O2B16B16B8"
+	"O2B8B8G+16G+16G+8G+8G+8E16E16E8E8E8O1B8O2E8"
+	"O1B8O2G+8E8B8G+8O3E8O2B8O3E8O2B8O3G+8E8B8"
+	"O3G+8O4E4P8E16E16E8E8E8E8E4P8E16E4P8O2E16"
+	"O2E2P64",
 };
 
 const unsigned ToneAlarm::_default_ntunes = sizeof(_default_tunes) / sizeof(_default_tunes[0]);
@@ -723,6 +723,7 @@ ToneAlarm::next_note()
 			break;
 
 		case 'P':	// pause for a note length
+			stop_note();
 			hrt_call_after(&_note_call, 
 				(hrt_abstime)rest_duration(next_number(), next_dots()),
 				(hrt_callout)next_trampoline,