update weather-forecast sketch

Author: lucarin91

examples/weather-forecast/sketch/sketch.ino

@@ -2,45 +2,47 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <Arduino_LED_Matrix.h>
 #include <Arduino_RouterBridge.h>
 
 #include "weather_frames.h"
 
-// TODO: those will go into an header file.
-extern "C" void matrixWrite(const uint32_t* buf);
-extern "C" void matrixBegin();
+String city = "Turin";
+
+Arduino_LED_Matrix matrix;
 
 void setup() {
-  matrixBegin();
+  matrix.begin();
+  matrix.clear();
 
   Bridge.begin();
 }
 
-void playAnimation(const uint32_t* frames[], int frameCount, int repeat, int frameDelay) {
-  for (int r = 0; r < repeat; r++) {
-    for (int i = 0; i < frameCount; i++) {
-      matrixWrite(frames[i]);
-      delay(frameDelay);
-    }
-  }
-}
-
-String city = "Turin";
-
 void loop() {
   String weather_forecast;
-  bool ok =  Bridge.call("get_weather_forecast", city).result(weather_forecast);
+  bool ok = Bridge.call("get_weather_forecast", city).result(weather_forecast);
   if (ok) {
-    if (weather_forecast == "sunny") {
-      playAnimation(SunnyFrames, 2, 20, 500);
-    } else if (weather_forecast == "cloudy") {
-      playAnimation(CloudyFrames, 4, 20, 500);
-    } else if (weather_forecast == "rainy") {
-      playAnimation(RainyFrames, 3, 16, 200);
-    } else if (weather_forecast == "snowy") {
-      playAnimation(SnowyFrames, 3, 5, 650);
-    } else if (weather_forecast == "foggy") {
-      playAnimation(FoggyFrames, 2, 5, 660);
+    if ("sunny" == sequence_name) {
+      matrix.loadSequence(Sunny);
+      playRepeat(10);
+    } else if ("cloudy" == sequence_name) {
+      matrix.loadSequence(Cloudy);
+      playRepeat(10);
+    } else if ("rainy" == sequence_name) {
+      matrix.loadSequence(Rainy);
+      playRepeat(20);
+    } else if ("snowy" == sequence_name) {
+      matrix.loadSequence(Snowy);
+      playRepeat(10);
+    } else if ("foggy" == sequence_name) {
+      matrix.loadSequence(Foggy);
+      playRepeat(5);
     }
   }
 }
+
+void playRepeat(int repeat_count) {
+  for (int i = 0; i < repeat_count; i++) {
+    matrix.playSequence();
+  }
+}

examples/weather-forecast/sketch/weather_frames.h

@@ -4,97 +4,33 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-const uint32_t Sunny[] = {
-    0xa0148120,
-    0x9c1c801,
-    0x409402c0,
-    0x2
+const uint32_t Sunny[][5] = {
+    {0x04812805, 0x80138390, 0x03402902, 0x40000000, 500},
+    {0x12005201, 0xa072009c, 0x0b009400, 0x90000000, 500},
+    {0x04812805, 0x80138390, 0x03402902, 0x40000000, 500},
 };
-const uint32_t Sunny2[] = {
-    0x804a0048,
-    0x39004e05,
-    0x2900d0,
-    0x9
-};
-const uint32_t* SunnyFrames[] = { Sunny, Sunny2 };
 
-const uint32_t Cloudy[] = {
-    0x701c0000,
-    0x20211104,
-    0x7f0404,
-    0x0
-};
-const uint32_t Cloudy2[] = {
-    0xe0380000,
-    0x40422208,
-    0xfe0808,
-    0x0
-};
-const uint32_t Cloudy3[] = {
-    0xc0700000,
-    0x80844411,
-    0x1fc1010,
-    0x0
+const uint32_t Cloudy[][5] = {
+    {0x0000380e, 0x20888404, 0x2020fe00, 0x00000000, 500},
+    {0x00001c07, 0x10444202, 0x10107f00, 0x00000000, 500},
+    {0x00000e03, 0x88222101, 0x08083f80, 0x00000000, 500},
+    {0x00001c07, 0x10444202, 0x10107f00, 0x00000000, 500},
 };
-const uint32_t Cloudy4[] = {
-    0xe0380000,
-    0x40422208,
-    0xfe0808,
-    0x0
-};
-const uint32_t* CloudyFrames[] = { Cloudy, Cloudy2, Cloudy3, Cloudy4 };
 
-const uint32_t Rainy[]  = {
-    0x104301e0,
-    0x3f820210,
-    0x8a0510,
-    0x5
-};
-const uint32_t Rainy2[] = {
-    0x104301e0,
-    0x3f820210,
-    0x40a20140,
-    0x11
+const uint32_t Rainy[][5] = {
+    {0x0780c208, 0x084041fc, 0x08a05100, 0xa0000000, 200},
+    {0x0780c208, 0x084041fc, 0x02804502, 0x88000000, 200},
+    {0x0780c208, 0x084041fc, 0x0a201402, 0x28000000, 200},
 };
-const uint32_t Rainy3[] = {
-    0x104301e0,
-    0x3f820210,
-    0x40280450,
-    0x14
-};
-const uint32_t* RainyFrames[] = { Rainy, Rainy2, Rainy3 };
 
-const uint32_t Snowy[]  = {
-    0x104301e0,
-    0x3f820210,
-    0x220040,
-    0x11
-};
-const uint32_t Snowy2[] = {
-    0x104301e0,
-    0x3f820210,
-    0x40080400,
-    0x4
-};
-const uint32_t Snowy3[] = {
-    0x104301e0,
-    0x3f820210,
-    0x800110,
-    0x1
+const uint32_t Snowy[][5] = {
+    {0x0780c208, 0x084041fc, 0x02004400, 0x88000000, 650},
+    {0x0780c208, 0x084041fc, 0x00201002, 0x20000000, 650},
+    {0x0780c208, 0x084041fc, 0x08800100, 0x80000000, 650},
 };
-const uint32_t* SnowyFrames[] = { Snowy, Snowy2, Snowy3 };
 
-const uint32_t Foggy[] = {
-    0xdf8000,
-    0x3f600,
-    0xef8,
-    0x0
+const uint32_t Foggy[][5] = {
+    {0x0001fb00, 0x006fc000, 0x1f700000, 0x00000000, 660},
+    {0x0001ef00, 0x0077c000, 0x1fb00000, 0x00000000, 660},
+    {0x0001fb00, 0x006fc000, 0x1f700000, 0x00000000, 660},
 };
-const uint32_t Foggy2[] = {
-    0xf78000,
-    0x3ee00,
-    0xdf8,
-    0x0
-};
-
-const uint32_t* FoggyFrames[] = { Foggy, Foggy2 };