Merge branch 'dev' of https://github.com/ColinShorts/espurna into dev

xoseperez · Sep 15, 2018 · d83c0a9 · d83c0a9
2 parents a4afefa + 544385c
commit d83c0a9
Show file tree

Hide file tree

Showing 24 changed files with 2,514 additions and 2,431 deletions.
diff --git a/code/espurna/config/defaults.h b/code/espurna/config/defaults.h
@@ -574,8 +574,3 @@
 #ifndef LIGHT_PROVIDER
 #define LIGHT_PROVIDER          LIGHT_PROVIDER_NONE
 #endif
-
-// App revision, populated by the build script
-#ifndef APP_REVISION
-#define APP_REVISION            NULL
-#endif
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
@@ -1335,19 +1335,19 @@
 #endif
 
 #ifndef RFM69_NODE_ID
-#define RFM69_NODE_ID               2
+#define RFM69_NODE_ID               1
 #endif
 
 #ifndef RFM69_GATEWAY_ID
-#define RFM69_GATEWAY_ID            2
+#define RFM69_GATEWAY_ID            1
 #endif
 
 #ifndef RFM69_NETWORK_ID
 #define RFM69_NETWORK_ID            164
 #endif
 
 #ifndef RFM69_PROMISCUOUS
-#define RFM69_PROMISCUOUS           1
+#define RFM69_PROMISCUOUS           0
 #endif
 
 #ifndef RFM69_PROMISCUOUS_SENDS

diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/eeprom.ino b/code/espurna/eeprom.ino
@@ -38,6 +38,11 @@ String eepromSectors() {
 
 void _eepromInitCommands() {
 
+    settingsRegisterCommand(F("EEPROM"), [](Embedis* e) {
+        infoMemory("EEPROM", SPI_FLASH_SEC_SIZE, SPI_FLASH_SEC_SIZE - settingsSize());
+        DEBUG_MSG_P(PSTR("+OK\n"));
+    });
+
     settingsRegisterCommand(F("EEPROM.DUMP"), [](Embedis* e) {
         EEPROMr.dump(settingsSerial());
         DEBUG_MSG_P(PSTR("\n+OK\n"));

diff --git a/code/espurna/espurna.ino b/code/espurna/espurna.ino
@@ -53,6 +53,9 @@ void setup() {
     // Basic modules, will always run
     // -------------------------------------------------------------------------
 
+    // Cache initial free heap value
+    getInitialFreeHeap();
+
     // Serial debug
     #if DEBUG_SUPPORT
         debugSetup();

diff --git a/code/espurna/sensors/PMSX003Sensor.h b/code/espurna/sensors/PMSX003Sensor.h
@@ -12,9 +12,7 @@
 #include "Arduino.h"
 #include "BaseSensor.h"
 
-#if PMS_USE_SOFT
 #include <SoftwareSerial.h>
-#endif
 
 // Generic data
 #define PMS_BAUD_RATE       9600

diff --git a/code/espurna/settings.ino b/code/espurna/settings.ino
@@ -231,7 +231,12 @@ void _settingsInitCommands() {
     });
 
     settingsRegisterCommand(F("HEAP"), [](Embedis* e) {
-        DEBUG_MSG_P(PSTR("Free HEAP: %d bytes\n"), getFreeHeap());
+        infoMemory("Heap", getInitialFreeHeap(), getFreeHeap());
+        DEBUG_MSG_P(PSTR("+OK\n"));
+    });
+
+    settingsRegisterCommand(F("STACK"), [](Embedis* e) {
+        infoMemory("Stack", 4096, getFreeStack());
         DEBUG_MSG_P(PSTR("+OK\n"));
     });
 
@@ -293,6 +298,16 @@ void _settingsInitCommands() {
         DEBUG_MSG_P(PSTR("+OK\n"));
     });
 
+    settingsRegisterCommand(F("CONFIG"), [](Embedis* e) {
+        DynamicJsonBuffer jsonBuffer;
+        JsonObject& root = jsonBuffer.createObject();
+        settingsGetJson(root);
+        String output;
+        root.printTo(output);
+        DEBUG_MSG(output.c_str());
+        DEBUG_MSG_P(PSTR("\n+OK\n"));
+    });
+
 }
 
 // -----------------------------------------------------------------------------

diff --git a/code/espurna/static/index.all.html.gz.h b/code/espurna/static/index.all.html.gz.h
diff --git a/code/espurna/static/index.light.html.gz.h b/code/espurna/static/index.light.html.gz.h
diff --git a/code/espurna/static/index.rfbridge.html.gz.h b/code/espurna/static/index.rfbridge.html.gz.h
@@ -1,4 +1,4 @@
-#define webui_image_len 51280
+#define webui_image_len 51264
 const uint8_t webui_image[] PROGMEM = {
 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xec,0xbd,0xe9,0x7a,0xdb,0xc6,0xb2,0x28,0xfa,0x2a,
 0x10,0x9c,0xa5,0x10,0x11,0x38,0x69,0xb2,0x4c,0x1a,0xd6,0xa6,0x26,0x4b,0x89,0x2d,0xc9,0x92,0x1c,0xc7,
@@ -2497,71 +2497,71 @@ const uint8_t webui_image[] PROGMEM = {
 0xa0,0xe4,0x53,0x32,0xa7,0xf3,0xb0,0x4e,0x57,0x79,0x5a,0x47,0x52,0x86,0xbf,0x89,0xa8,0x96,0xce,0x2a,
 0xa7,0x9b,0xb1,0x5a,0x73,0xc6,0x01,0x47,0x6f,0x3e,0x73,0xa3,0xbd,0xfc,0xc5,0xbf,0x56,0x2d,0x74,0x55,
 0x38,0x89,0x93,0x99,0xf7,0xe8,0xc5,0xf7,0xdf,0x3f,0x79,0xf4,0xe6,0xc9,0x63,0x2f,0xf2,0xbe,0x7f,0xf1,
-0x66,0xd0,0xfc,0xa6,0x77,0xf2,0x7a,0xdd,0xf3,0xca,0xeb,0x7f,0x7c,0xff,0xe8,0x96,0x2e,0xaf,0x7e,0x80,
-0xf8,0x11,0xc9,0x87,0xed,0xa9,0xd2,0x24,0x50,0xa0,0x79,0x12,0x7e,0x0d,0x9a,0x6a,0x6f,0xb3,0x06,0x8e,
-0x81,0x1a,0xc0,0xe4,0x0c,0xf9,0x0a,0x31,0x8c,0xed,0xbd,0x1a,0x9e,0xc4,0xd5,0x9f,0xbe,0x9a,0x4c,0xad,
-0xfb,0x95,0x8a,0x84,0xe0,0xf2,0xcb,0xeb,0x1f,0xaf,0xe8,0xf1,0x9d,0x7b,0xee,0xe3,0x3b,0xf7,0xcc,0xe3,
-0x4d,0x5c,0x4d,0x93,0x78,0x33,0xf4,0x96,0x83,0x26,0xa2,0x62,0xc5,0x21,0x16,0xe7,0xd6,0x9d,0x25,0xdf,
-0xb9,0xb0,0xee,0x9c,0xf0,0x9d,0xca,0xdb,0xa1,0x96,0x75,0x78,0x1e,0x9e,0xb6,0x2d,0x01,0x66,0xfe,0xa7,
-0xa7,0x56,0xb4,0x82,0xef,0x78,0x88,0x9f,0xba,0xee,0xe1,0xa7,0x6d,0x99,0x3a,0x09,0xb4,0x67,0x78,0x5f,
-0x61,0x70,0x58,0xd8,0x95,0x91,0xbf,0x36,0x0f,0xd7,0x65,0x2a,0xc9,0xb9,0xc3,0xf3,0xe6,0x1e,0x60,0x62,
-0xe5,0xa6,0xbc,0xb4,0x1e,0x26,0xc3,0xf3,0x40,0x6d,0xa3,0xb3,0x7d,0xeb,0x76,0x7a,0x66,0xb7,0x7b,0x1d,
-0x9f,0xf5,0x7c,0xe2,0xac,0xfb,0x89,0x33,0x39,0xcb,0xd5,0x37,0xf8,0x13,0x17,0x71,0x5b,0x06,0x68,0x3e,
-0x72,0x61,0x7d,0xe4,0x82,0x5b,0x97,0x88,0xa7,0xdc,0x95,0xa5,0x08,0x49,0x44,0x1a,0xe3,0x4c,0x51,0x49,
-0xd0,0x27,0xdf,0xdc,0x5a,0xcc,0x19,0xa4,0xfb,0x16,0xab,0xec,0xfb,0xd4,0x2c,0xc9,0x3c,0x5f,0x28,0x1f,
-0x3c,0xab,0x2e,0xde,0xba,0x1f,0x63,0x3c,0x0c,0x69,0x27,0x59,0xda,0xc9,0x2b,0xe6,0x63,0xaf,0x94,0x9e,
-0x2f,0xfa,0xa8,0x35,0x7e,0x00,0xdc,0xb2,0xb9,0x8d,0x8f,0x3d,0xdc,0x86,0x61,0x91,0x3e,0xce,0xd3,0x45,
-0x3b,0xbc,0x8a,0x3d,0x99,0x20,0xf9,0x5c,0x3a,0x21,0x56,0xee,0xf0,0x34,0x45,0xa4,0x1b,0x4a,0x93,0x50,
-0x5b,0xe2,0x5a,0x5b,0x31,0xb0,0xf7,0x5d,0x33,0x04,0x00,0x6a,0xd8,0xf5,0x0f,0xc1,0xb1,0x0c,0xc1,0xe7,
-0xd8,0x56,0xe4,0x3b,0xfd,0x3c,0xee,0xef,0xe7,0xbe,0xce,0x7d,0x96,0xce,0x21,0x07,0x82,0xf9,0x2a,0x7f,
-0xe9,0x03,0x71,0x3d,0xc4,0x82,0x34,0x13,0xfa,0x41,0x5a,0xf0,0x28,0xfe,0x40,0x2d,0x68,0x0f,0x96,0xe1,
-0x67,0xe6,0x8a,0x13,0xc7,0x27,0x1e,0x91,0x2c,0x8d,0xaf,0xcc,0x2d,0x1e,0x5c,0xee,0xcb,0xb5,0x5a,0x00,
-0xf8,0xfe,0x23,0x41,0xf0,0xb2,0x7b,0x4d,0x84,0x26,0xbf,0xcf,0x6d,0x60,0xf6,0x6a,0x9a,0x0f,0x87,0x81,
-0x2d,0x9b,0x00,0xea,0x49,0xc2,0x37,0xae,0xf3,0x9d,0x0e,0x00,0x9a,0xe3,0x3a,0x64,0x87,0x7b,0xbc,0x77,
-0x2d,0x19,0xa8,0x89,0x9d,0xd1,0x32,0x50,0x58,0x4f,0x5b,0x41,0x23,0x8e,0xe2,0x56,0xf6,0xba,0x6f,0x09,
-0x71,0xae,0xaa,0x8b,0x64,0x24,0x13,0xa0,0xb3,0xcf,0x41,0x99,0x71,0x22,0x1c,0x27,0x64,0x96,0xac,0xf6,
-0x14,0x56,0x8a,0xf2,0x3d,0xb5,0xda,0xc1,0x3f,0xac,0x43,0xb7,0x1f,0x2a,0x8e,0x37,0x98,0x5a,0x2e,0x0d,
-0x07,0x16,0xf8,0x10,0x1d,0x61,0x39,0xb3,0x5b,0x38,0x06,0x60,0x96,0xae,0x67,0x88,0x48,0x1f,0x0e,0x1b,
-0x67,0x1b,0xdb,0xc1,0x48,0xce,0x0b,0x7e,0x6a,0xdc,0x4a,0x8c,0x8b,0x94,0xf3,0x10,0x77,0x42,0x8b,0xaf,
-0x6e,0x9e,0xe0,0x4e,0xb8,0xb7,0x0b,0x40,0x92,0x08,0x22,0xe0,0x0e,0x8e,0x46,0xd7,0xb5,0x81,0x9f,0xee,
-0x6b,0x83,0x7a,0xd8,0xd3,0x06,0xf5,0xe4,0xf7,0xda,0x70,0x14,0x04,0x2d,0x25,0xd7,0xdb,0x72,0x65,0x69,
-0x7f,0xe7,0xde,0x25,0xd8,0x38,0xe3,0x62,0xea,0x69,0x13,0x35,0x10,0x6f,0xce,0xbd,0xc5,0x94,0x5d,0x50,
-0x4a,0xb8,0x86,0x03,0x2b,0xb6,0x4f,0xf6,0x41,0x09,0x8e,0x3f,0x21,0xa6,0xec,0xed,0xab,0xef,0x18,0x81,
-0x28,0x54,0x37,0x4d,0x12,0x8a,0x38,0x35,0x97,0xd8,0x03,0xe7,0x75,0xbd,0xae,0x22,0x2f,0xb6,0x6e,0xcf,
-0xf8,0x4b,0x97,0x55,0xf3,0x0a,0x35,0x8d,0xca,0x44,0x7d,0xf7,0x23,0x2b,0xd2,0x55,0x8d,0xdc,0x9b,0x02,
-0x1f,0x87,0x4c,0xd9,0x74,0xd2,0xf8,0xc9,0x4a,0x32,0x0f,0x05,0xf6,0x6d,0x81,0x39,0x02,0xe0,0xdb,0xf8,
-0xd0,0xa2,0xc7,0xe2,0x66,0x63,0x00,0x6e,0xa3,0xab,0x16,0xba,0x2f,0xe7,0xb6,0xea,0x41,0xa7,0x52,0x81,
-0x04,0x37,0x6f,0xea,0x88,0x82,0x93,0x55,0xc1,0x09,0x28,0xd4,0x6f,0x1e,0x9d,0x1f,0xd3,0xe3,0xd7,0x74,
-0x9d,0xd6,0xbe,0xee,0x13,0xa7,0x29,0xd1,0x65,0x48,0xa6,0x56,0x0c,0xf1,0xb5,0xee,0x2c,0x4e,0xa6,0x88,
-0x43,0x4e,0x1e,0xe9,0xbd,0x43,0xe6,0x3a,0xeb,0x66,0x29,0x37,0x4b,0xe7,0x66,0x2d,0x37,0x6b,0x6c,0x44,
-0xda,0x31,0xb6,0x28,0xce,0x19,0x5b,0x05,0x78,0xdf,0x52,0x57,0xd8,0x1a,0x16,0xcb,0x4f,0x10,0x20,0x05,
-0x49,0x59,0x57,0x8c,0x28,0xcd,0x53,0x19,0x79,0x9c,0xc2,0xb1,0x7d,0xbb,0xe2,0xfb,0x44,0x20,0xa4,0x10,
-0xf8,0x4d,0x9a,0x13,0x67,0xbe,0xf4,0xa2,0x49,0x83,0xee,0xb7,0xde,0x14,0x8f,0xc4,0x75,0x10,0x05,0x82,
-0xab,0xde,0xf7,0x5a,0xb1,0x06,0xad,0x08,0xba,0x97,0x48,0x4a,0x92,0xd6,0x69,0xf9,0xcd,0x67,0xce,0xda,
-0x69,0x46,0x53,0x47,0x32,0x22,0x85,0x1f,0x1f,0x2b,0xb1,0xcf,0x69,0xfc,0x02,0x28,0x6d,0x80,0xec,0xd6,
-0x8e,0x61,0xa8,0xd2,0xa4,0x3c,0x39,0x6f,0xf0,0xbd,0x11,0xe1,0xdf,0x49,0x74,0xc9,0x69,0x86,0x9a,0xf1,
-0x1e,0x62,0xbc,0x07,0x34,0xda,0xcc,0xc8,0xa9,0x49,0x0e,0x8d,0x2a,0xe0,0xe0,0x28,0xb4,0x64,0xe0,0xd0,
-0x96,0x29,0x4d,0xf0,0x37,0x70,0x37,0x1b,0x56,0x9b,0xd7,0x2a,0x12,0x1c,0xb9,0x1e,0x84,0x4d,0xf4,0x86,
-0xba,0xd6,0xf1,0x1b,0xea,0xa7,0x44,0x70,0x84,0x9b,0x2a,0xfd,0xf1,0x3c,0xab,0x81,0x8d,0x8a,0xeb,0x47,
-0x8f,0xde,0xe0,0x0a,0x4c,0xfe,0x24,0x14,0x1e,0xf9,0x06,0xa3,0x4a,0x20,0x88,0x95,0xce,0x9c,0xbd,0x20,
-0x63,0xfb,0x94,0x5a,0x3a,0xf9,0x70,0x57,0x31,0xd2,0x30,0xc8,0x7c,0xde,0x23,0x7a,0x62,0x66,0xae,0xa2,
-0x7a,0x7c,0x79,0x9e,0x9d,0x9c,0x33,0xdf,0x4c,0xb2,0xc6,0xd1,0x5d,0xcb,0xbd,0x76,0xe0,0x22,0xbc,0xef,
-0x18,0xb4,0xf7,0x86,0xfd,0x75,0x17,0x95,0x20,0x6c,0x85,0x75,0x87,0x5d,0xeb,0x07,0x4e,0xd2,0x67,0xe8,
-0x23,0x4e,0x2b,0xab,0xa2,0x26,0x60,0x5e,0xbc,0xf8,0xda,0x2e,0x29,0x96,0xc2,0xab,0x71,0x1f,0x51,0xee,
-0xa4,0x23,0x94,0x1b,0xad,0x3a,0x05,0x8d,0x9f,0x0a,0x97,0xdb,0xe3,0xba,0x3d,0x61,0x9f,0xed,0xa3,0xc9,
-0x44,0x8c,0x49,0x5a,0xd7,0x26,0xd1,0x08,0x2d,0x5b,0xa9,0xf2,0x85,0xed,0x29,0x38,0xb2,0x14,0x46,0x3d,
-0x6f,0xbc,0xb4,0x95,0x4b,0x46,0x9d,0xa7,0x3c,0x82,0xdd,0x17,0x64,0x2d,0xb5,0x0a,0x1a,0xc7,0xdc,0x76,
-0x59,0xf5,0xc0,0x29,0x0e,0xd5,0xcd,0x88,0x7d,0xa7,0x5a,0xc5,0xe1,0xa0,0xe5,0x94,0x3c,0x4f,0x46,0x27,
-0x5a,0xf5,0xe2,0x94,0xd4,0x1e,0x56,0x4e,0x69,0xe5,0xce,0xd4,0x2a,0x6a,0xbb,0x4e,0x75,0x2c,0x0e,0x8d,
-0xcf,0x94,0x59,0xd8,0x7e,0xcf,0x2b,0xd6,0x17,0x46,0x9c,0xf8,0xaf,0xff,0x23,0x78,0xe2,0x94,0xd7,0x2e,
-0x71,0x23,0xc1,0x99,0x68,0xbf,0x25,0x9e,0x9f,0xfd,0x6f,0x68,0xc7,0xc3,0xce,0x88,0xf2,0xed,0xfe,0x77,
-0x94,0x67,0x5d,0xfb,0x1d,0xdb,0xd3,0x4f,0xd6,0xad,0xe5,0x1c,0x68,0x5b,0x44,0x6d,0x97,0xd1,0xd6,0x1a,
-0x92,0xf3,0xbf,0xb3,0x76,0xf8,0xb6,0x53,0x94,0x78,0x55,0x84,0xb3,0x3a,0x25,0x5d,0x6e,0xb5,0xaf,0xe6,
-0x91,0x78,0x30,0xba,0xaf,0x75,0x11,0x51,0xae,0x0f,0x3a,0xb2,0xfc,0x1c,0x3b,0x13,0x6d,0x15,0x1d,0x4b,
-0x77,0xf7,0x64,0xc3,0x35,0x91,0x4b,0xad,0x0a,0x74,0x1c,0x6a,0x13,0xc1,0x28,0xb1,0x36,0xee,0xae,0x24,
-0x66,0xbe,0xdf,0x7d,0xc6,0x0d,0x1a,0x51,0x6e,0x2a,0xb6,0xc0,0x63,0x79,0xac,0x74,0x6a,0x14,0x3f,0x8f,
-0x3d,0x5e,0x0e,0x46,0x4c,0x3c,0xda,0x85,0x96,0x10,0x89,0x4a,0x96,0x26,0x0d,0x88,0x3d,0xcb,0xda,0xee,
-0xd2,0x30,0x82,0xd7,0x94,0xd5,0x61,0xc0,0x76,0x61,0x0f,0x63,0x11,0x81,0x99,0x6e,0x1f,0x83,0x9a,0x07,
-0x23,0xae,0xd6,0x87,0xe6,0x3c,0xee,0x39,0x64,0x59,0xcd,0x4e,0xa7,0xde,0x4c,0xb3,0x0c,0xf8,0x1d,0x44,
-0xbd,0x87,0x7a,0x60,0x03,0xce,0x70,0xfe,0xd5,0x07,0xff,0x2f,0xdd,0xec,0xf1,0x58,0xc7,0x93,0x02,0x00
+0x66,0xd0,0xfc,0xa6,0x77,0xf2,0x7a,0xdd,0xf3,0xca,0xeb,0x7f,0x7c,0xff,0xe8,0x96,0x2e,0xaf,0x7e,0x20,
+0x70,0x7d,0x0d,0x94,0x02,0x35,0x3c,0xc9,0x19,0xb2,0x11,0x62,0x90,0xda,0x3b,0x31,0x3c,0x89,0xab,0x3f,
+0x7d,0x35,0x99,0x5a,0xf7,0x2b,0x15,0xe7,0xc0,0xe5,0x97,0xd7,0x3f,0x5e,0xd1,0xe3,0x3b,0xf7,0xdc,0xc7,
+0x77,0xee,0x99,0xc7,0x9b,0xb8,0x9a,0x26,0xf1,0x66,0xe8,0x2d,0x07,0x4d,0xbc,0xc4,0x8a,0x03,0x28,0xce,
+0xad,0x3b,0x4b,0xbe,0x73,0x61,0xdd,0x39,0xe1,0x3b,0x95,0xb7,0x43,0x2d,0xeb,0xf0,0x3c,0x3c,0x6d,0xeb,
+0xf9,0xcd,0xec,0x4e,0x4f,0xad,0x58,0x04,0xdf,0xf1,0xff,0x3e,0x75,0x9d,0xbf,0x4f,0xdb,0x12,0x73,0x12,
+0x68,0xbf,0xef,0xbe,0xc2,0xe0,0x9f,0xb0,0xe7,0x22,0x7f,0x6d,0x1e,0xae,0xcb,0x54,0x52,0x6f,0x87,0xe7,
+0xcd,0x3d,0x80,0xc0,0xca,0x4d,0x79,0x69,0x3d,0x4c,0x86,0xe7,0x81,0xda,0x24,0x67,0xfb,0x56,0xe5,0xf4,
+0xcc,0x6e,0xf7,0x3a,0x3e,0xeb,0xf9,0xc4,0x59,0xf7,0x13,0x67,0x72,0x52,0xab,0x6f,0xf0,0x27,0x2e,0xe2,
+0x36,0x87,0xdf,0x7c,0xe4,0xc2,0xfa,0xc8,0x05,0xb7,0x2e,0x11,0x3f,0xb8,0x2b,0x4b,0xcd,0x91,0x88,0xac,
+0xc5,0x79,0xa0,0x92,0xa0,0x4f,0x7a,0xb9,0xb5,0x98,0x33,0x04,0xf7,0x2d,0x56,0xc8,0xf7,0x29,0x51,0x92,
+0x79,0xbe,0x50,0x1e,0x76,0x56,0x5d,0xbc,0x31,0x3f,0xc6,0x78,0x18,0xd2,0x3e,0xb1,0x74,0x8f,0x57,0xcc,
+0xa5,0x5e,0x29,0x2d,0x5e,0xf4,0x51,0xeb,0xf3,0x00,0xa7,0x65,0xf3,0x12,0x1f,0x7b,0x78,0x09,0xc3,0x00,
+0x7d,0x9c,0xa7,0x8b,0x76,0xf0,0x14,0xfb,0x29,0x41,0xae,0xb9,0x74,0x02,0xa8,0xdc,0xe1,0x69,0x8a,0x48,
+0x37,0x94,0x9e,0xa0,0xb6,0x84,0xb1,0xb6,0xd8,0xbf,0xf7,0x5d,0x33,0x04,0x80,0x61,0xd8,0xf5,0x0f,0xc1,
+0xb1,0x0c,0xc1,0xe7,0xd8,0x56,0xd3,0x3b,0xfd,0x3c,0xee,0xef,0xe7,0xbe,0xce,0x7d,0x96,0xce,0x21,0xc3,
+0x81,0xf9,0x2a,0x7f,0xe9,0x03,0xf1,0x34,0xc4,0x60,0x34,0x13,0xfa,0x41,0x5a,0xf0,0x28,0xfe,0x40,0x2d,
+0x68,0x0f,0x96,0xe1,0x56,0xe6,0x8a,0xcf,0xc6,0x27,0x1e,0x91,0xa4,0x8c,0xaf,0xcc,0x2d,0x0e,0x5b,0xee,
+0xcb,0xb5,0x5a,0x00,0xf8,0xfe,0x23,0xc1,0xe7,0xb2,0x7b,0x4d,0x84,0x26,0xbf,0xcf,0x6d,0x60,0xe6,0x69,
+0x9a,0x0f,0x87,0x81,0x2d,0x79,0x00,0xc8,0x49,0x82,0x33,0xae,0xf3,0x8c,0x0e,0x00,0x89,0xe3,0xba,0x5b,
+0x87,0x7b,0x7c,0x73,0x2d,0x09,0xa7,0x89,0x8c,0xd1,0x12,0x4e,0x58,0x4f,0x5b,0x21,0x21,0x8e,0x5a,0x56,
+0xf6,0xba,0x6f,0x89,0x68,0xae,0x22,0x8b,0x24,0x20,0x13,0x7e,0xb3,0xcf,0xfd,0x98,0x51,0x20,0x1c,0x17,
+0x63,0x96,0x9b,0xf6,0x14,0x56,0x6a,0xf0,0x3d,0xb5,0xda,0xa1,0x3d,0xac,0x21,0xb7,0x1f,0x2a,0x7e,0x36,
+0x98,0x5a,0x0e,0x0b,0x07,0x16,0xb4,0x10,0x1d,0x50,0x39,0x33,0x53,0x80,0xbc,0x87,0xd1,0xb9,0x9e,0x21,
+0xde,0x7c,0x38,0x6c,0x5c,0x69,0x6c,0xf7,0xa1,0x98,0x0b,0xf2,0x53,0xe3,0x34,0x62,0x1c,0xa0,0x9c,0x87,
+0xb8,0x13,0x5a,0x5c,0x73,0xf3,0x04,0x77,0xc2,0xbd,0x5d,0x00,0x4e,0x44,0x10,0x01,0x55,0x70,0x34,0xba,
+0xae,0x0d,0xfc,0x74,0x5f,0x1b,0xd4,0xc3,0x9e,0x36,0xa8,0x27,0xbf,0xd7,0x86,0xa3,0x20,0x68,0xa9,0xb0,
+0xde,0x96,0x2b,0x4b,0xb7,0x3b,0xf7,0x2e,0xc1,0xa4,0x19,0x07,0x52,0x4f,0x1b,0xa0,0x81,0x67,0x73,0xee,
+0x2d,0xa6,0xec,0x60,0x52,0xc2,0xf1,0x1b,0x48,0xb0,0x7d,0x92,0x0d,0x4a,0x70,0x74,0x09,0xb1,0x5c,0x6f,
+0x5f,0x7d,0xc7,0xf8,0x42,0xa1,0xba,0x69,0x52,0x4c,0xc4,0xa9,0xb9,0xc4,0x1e,0x38,0xaf,0xeb,0x75,0x15,
+0x79,0xb1,0x75,0x7b,0xc6,0x5f,0xba,0xac,0x9a,0x57,0xa8,0x69,0x54,0x26,0xea,0xbb,0x1f,0x59,0x71,0xac,
+0x6a,0xe4,0xde,0x14,0xf8,0x38,0x24,0xc6,0xa6,0x93,0xc6,0x0b,0x56,0x52,0x75,0x28,0x28,0x6f,0x0b,0xaa,
+0x11,0xf0,0xdd,0xc6,0x43,0x16,0x3d,0x16,0x27,0x1a,0x03,0x5f,0x1b,0x5d,0xb5,0xb0,0x7b,0x39,0x73,0x55,
+0x0f,0xf6,0x94,0x0a,0x13,0xb8,0x79,0x53,0xc7,0x0b,0x9c,0xac,0x0a,0x4e,0x2f,0xa1,0x7e,0xf3,0xe8,0xfc,
+0x98,0x1e,0xbf,0xa6,0xeb,0xb4,0xf6,0x75,0x9f,0x38,0x09,0x89,0x2e,0x43,0x12,0xb3,0x62,0x77,0xaf,0x75,
+0x56,0x71,0xf2,0x40,0x1c,0x72,0x6a,0x48,0xef,0x1d,0xf2,0xd2,0x59,0x37,0x4b,0xb9,0x59,0x3a,0x37,0x6b,
+0xb9,0x59,0x63,0x23,0xd2,0x8e,0xb1,0x05,0x6d,0xce,0xc7,0x2a,0xb0,0xfa,0x96,0x32,0xc2,0xd6,0x9f,0x58,
+0x5e,0x80,0x80,0x20,0x48,0xca,0xba,0x62,0xbc,0x68,0x9e,0xca,0xc8,0xe3,0x04,0x8d,0xed,0xdb,0x15,0xdf,
+0x27,0x02,0x21,0x85,0xc0,0x4d,0xd2,0x9c,0x38,0xf3,0xa5,0x17,0x4d,0x1a,0x74,0xbf,0xf5,0xa6,0x78,0x24,
+0x8e,0x81,0x28,0x10,0x5c,0xf5,0xbe,0xd7,0x8a,0x24,0x68,0xc5,0xc7,0xbd,0x44,0xca,0x91,0xb4,0x4e,0xcb,
+0x6f,0x3e,0x73,0x4e,0x4e,0x33,0x9a,0x3a,0x4e,0x11,0x09,0xfa,0xf8,0x58,0x89,0x7d,0x4e,0xd2,0x17,0x40,
+0x25,0x03,0xdc,0xb6,0x76,0x84,0x42,0x95,0x26,0xe5,0xc9,0x79,0x83,0xde,0x8d,0xf8,0xfd,0x4e,0x1a,0x4b,
+0x4e,0x22,0xd4,0x8c,0xf7,0x10,0xe3,0x3d,0xa0,0xd1,0x66,0x46,0x4e,0x4d,0x72,0x68,0x04,0xfd,0x83,0xa3,
+0xd0,0x92,0x70,0x43,0x5b,0x62,0x34,0xa1,0xdd,0x40,0xd5,0x6c,0x18,0x69,0x5e,0xab,0x48,0x5f,0xe4,0xfa,
+0x07,0x36,0xb1,0x19,0xea,0x5a,0x47,0x67,0xa8,0x9f,0x12,0x9f,0x11,0x6e,0xaa,0xf4,0xc7,0xf3,0xac,0x06,
+0xf2,0x29,0xae,0x1f,0x3d,0x7a,0x83,0x2b,0xb0,0xf0,0x93,0x50,0x78,0xe4,0x1b,0x8c,0x19,0x81,0x10,0x55,
+0x3a,0x73,0xf6,0x42,0x88,0xed,0x53,0x59,0xe9,0xd4,0xc2,0x5d,0xb5,0x47,0xc3,0x20,0xf3,0x79,0x8f,0xd8,
+0x88,0x99,0xb9,0x8a,0xea,0xf1,0xe5,0x79,0x76,0x72,0xce,0x7c,0x33,0x49,0x12,0x47,0x77,0x2d,0xe7,0xd9,
+0x81,0x8b,0xdf,0xbe,0x63,0x48,0xde,0x1b,0xf6,0xd7,0x5d,0xcc,0x81,0xb0,0x15,0xb4,0x1d,0x76,0x6d,0x1b,
+0x38,0x49,0x9f,0xa1,0x8f,0x38,0xad,0xac,0x8a,0x9a,0x70,0x78,0xf1,0xd1,0x6b,0x3b,0x9c,0x58,0xea,0xac,
+0xc6,0x39,0x44,0x39,0x8b,0x8e,0x50,0x6e,0xb4,0xea,0x14,0x34,0x5e,0x28,0x5c,0x6e,0x8f,0x63,0xf6,0x84,
+0x3d,0xb2,0x8f,0x26,0x13,0x31,0x15,0x69,0x4d,0x9a,0xc4,0x1a,0xb4,0x2c,0xa1,0xca,0xd3,0xb5,0xa7,0xe0,
+0xc8,0x52,0x07,0xf5,0xbc,0xf1,0xd2,0x56,0x1d,0x19,0x65,0x9d,0xf2,0xf7,0x75,0x5f,0x90,0xb5,0xd4,0x2a,
+0x68,0xdc,0x6e,0xdb,0x65,0xd5,0x03,0xa7,0x38,0x14,0x33,0x23,0xf6,0x8c,0x6a,0x15,0x87,0xfb,0x95,0x53,
+0xf2,0x3c,0x19,0x9d,0x68,0xc5,0x8a,0x53,0x52,0xfb,0x4f,0x39,0xa5,0x95,0xb3,0x52,0xab,0xa8,0xed,0x18,
+0xd5,0xb1,0x27,0x34,0x1e,0x51,0x66,0x61,0xfb,0x3d,0xaf,0x58,0x5f,0x18,0x71,0x5a,0xbf,0xfe,0x8f,0xe0,
+0x89,0x53,0x5e,0x3b,0xbc,0x8d,0x04,0x45,0xa2,0xfd,0x96,0xf8,0x75,0xf6,0xbf,0xa1,0xdd,0x0a,0x3b,0x23,
+0xca,0xb7,0xfb,0xdf,0x51,0x7e,0x73,0xed,0x77,0x6c,0x3f,0x3e,0x59,0xb7,0x96,0xeb,0x9f,0x6d,0xef,0xb4,
+0x1d,0x42,0x5b,0x6b,0x48,0xce,0xff,0xce,0xda,0xe1,0xdb,0x4e,0x51,0xe2,0x55,0x11,0xac,0xea,0x94,0x74,
+0xb9,0xd5,0xbe,0x9a,0x47,0xe2,0x9f,0xe8,0xbe,0xd6,0xc5,0x3b,0xb9,0x3e,0xa4,0xc8,0xf2,0x62,0xec,0x4c,
+0xb4,0x55,0x74,0x2c,0xdd,0xdd,0x93,0xeb,0xd6,0xc4,0x25,0xb5,0x2a,0xd0,0x51,0xa6,0x4d,0x7c,0xa2,0x44,
+0xd2,0xb8,0xbb,0x92,0x98,0xf9,0x7e,0xe7,0x18,0x37,0x24,0x44,0x39,0xa1,0xd8,0x02,0x8f,0xe5,0x8f,0xd2,
+0xa9,0x51,0xbc,0x38,0xf6,0xf8,0x30,0x18,0x31,0xf1,0x68,0x17,0x5a,0x42,0x24,0x2a,0x59,0x9a,0x24,0x1f,
+0xf6,0x2c,0x6b,0xab,0x4a,0xc3,0x08,0x5e,0x53,0x56,0x07,0xf9,0xda,0x85,0x3d,0x8c,0x45,0x04,0x66,0xba,
+0x7d,0x0c,0x6a,0x1e,0x8c,0xb8,0x5a,0x1f,0x7a,0xf1,0xb8,0xe7,0x90,0x65,0x25,0x3a,0x9d,0x7a,0x33,0xcd,
+0x32,0xe0,0x77,0x10,0xf5,0x1e,0xea,0x81,0x0d,0x27,0xc3,0xd9,0x55,0x1f,0xfc,0xbf,0x0f,0xa0,0x77,0xea,
+0xa5,0x93,0x02,0x00
 };