Merge pull request #3 from arduino/main

Merge upstream

Author: SFE-Brudnerd

cores/arduino/cm_backtrace/fault_handler/gcc/cmb_fault.S

@@ -26,6 +26,8 @@
  * Created on: 2016-12-16
  */
 
+#ifdef BACKTRACE_SUPPORT
+
 .syntax unified
 .thumb
 .text
@@ -41,3 +43,5 @@ HardFault_Handler:
 
 Fault_Loop:
     BL      Fault_Loop              /* while(1) */
+
+#endif

libraries/Arduino_LED_Matrix/src/gallery.h

@@ -572,3 +572,26 @@ constexpr uint32_t LEDMATRIX_ANIMATION_WIFI_SEARCH[][4] = {
 	{ 0x0, 0x1f02084, 0xe4110040, 500 },
 	{ 0x3f840, 0x49f22084, 0xe4110040, 500 }
 };
+constexpr uint32_t LEDMATRIX_ANIMATION_HOURGLASS[][4] = {
+	{ 0xe07f99fe, 0x1fc1fc1f, 0xe1f99e07, 50  },
+	{ 0xe07f99fe, 0x1ff1fc1f, 0xe1f99e07, 50  },
+	{ 0xe07f99fe, 0x1ffdfc1f, 0xe1f99e07, 50  },
+	{ 0xe07f99fe, 0x1ffffc1f, 0xe1f99e07, 50  },
+	{ 0xe07f99fe, 0x1ffffc3f, 0xe1f99e07, 50  },
+	{ 0xe07f99fe, 0x1bfffc3f, 0xe1f99e07, 50  },
+	{ 0xe07f99fe, 0x3bffbc3f, 0xe1f99e07, 50  },
+	{ 0xe07f9bfe, 0x3bffbc3b, 0xe1f99e07, 50  },
+	{ 0xe07f9bfe, 0x3bffbc3b, 0xe3f99e07, 50  },
+	{ 0xe07f9bbe, 0x3bffbc3b, 0xe3f9be07, 50  },
+	{ 0xe07b9bbe, 0x3bffbc7b, 0xe3f9be07, 50  },
+	{ 0xe07b9bbe, 0x3bffbc7b, 0xe7b9be07, 50  },
+	{ 0xe07b9bbe, 0x39ffbc7b, 0xe7b9be07, 50  },
+	{ 0xe07b9bbe, 0x79ff9c7b, 0xe7b9be07, 50  },
+	{ 0xe07b9bbe, 0x79ff9c79, 0xe7b9fe07, 50  },
+	{ 0xe07b9f9e, 0x79ff9c79, 0xe7b9fe07, 50  },
+	{ 0xe07b9f9e, 0x78ff9cf9, 0xe7b9fe07, 50  },
+	{ 0xe0799f9e, 0xf8ff8cf9, 0xe799fe07, 50  },
+	{ 0xe0799f8e, 0xf8ff8cf8, 0xef99fe07, 50  },
+	{ 0xe0799f87, 0xf87f87f8, 0x7f99fe07, 50  },
+	{ 0xe0799f87, 0xf83f83f8, 0x7f99fe07, 300 }
+};