Add _all entries for esp32 16MB with lots of usermods

platformio: add _all entries with a lot of usermods usermod bh1750 and bme280: avoid global pin hijacking settings.htm: remove height for compact display
2023-01-08 16:07:02 +01:00
parent 544446d35e
commit a10f1b20ac
6 changed files with 101 additions and 88 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -40,11 +40,10 @@
 ; ===================

 default_envs = 
-  esp32_4MB_min
  esp32_4MB_max  ; recommended default
-  ; esp32_4MB_all
+  esp32_4MB_all
  esp32_16MB_max
-  ; esp32_16MB_all
+  esp32_16MB_all
  esp8266_4MB_min
  esp32_4MB_PSRAM_max 
  esp32S3_8MB_max
@@ -55,7 +54,7 @@ default_envs =
  wemos_shield_esp32_16MB_max
  wemos_shield_esp32_16MB_ICS4343x_max
  wemos_shield_esp32_16MB_SPM1423_max
-  ; wemos_shield_esp32_16MB_SPM1423_all
+  wemos_shield_esp32_16MB_SPM1423_all
  wemos_shield_esp32_16MB_LineIn_max
  esp32_pico_4MB_max
  esp32s2_tinyUF2_PSRAM_max
@@ -625,7 +624,7 @@ lib_deps_min =
  https://github.com/kosme/arduinoFFT#develop @ 1.9.2 ; used for USERMOD_AUDIOREACTIVE

 build_flags_max = 
-  ; -D WLED_MAX_USERMODS=14 ; default only 4-6
+  -D WLED_MAX_USERMODS=25 ; default only 4-6, also for _all configs takes 25 pointers in memory
  ;; -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4 ewowi to softhack: move to build_flags_min? - We need a different solution
  -D WLED_USE_MY_CONFIG ; include custom my_config.h ewowi to softhack: redundant as also in build_flags_min?
  -D USERMOD_DALLASTEMPERATURE
@@ -654,15 +653,26 @@ lib_deps_V4_max =
  claws/BH1750 @^1.2.0 ; used for USERMOD_BH1750

 build_flags_all = 
-  -D WLED_MAX_USERMODS=16 ; default only 4-6
  -D USERMOD_RTC ;; experimental
-  ; -D USERMOD_SENSORSTOMQTT  ;; experimental
+  ; -D USERMOD_SENSORSTOMQTT  ;; experimental ewpwi causes error: fatal error: Adafruit_Sensor.h: No such file or directory
  -D USERMOD_ANALOG_CLOCK
+  -D USERMOD_MULTI_RELAY
+  -D USERMOD_PIRSWITCH
+  -D USERMOD_PWM_FAN
+  -D USERMOD_PING_PONG_CLOCK
+  -D USERMOD_BUZZER
+  -D USERMOD_SN_PHOTORESISTOR
+  -D USERMOD_BME280
+  -D USERMOD_DHT
+  -D USERMOD_VL53L0X_GESTURES

 lib_deps_all =
  ; adafruit/Adafruit BMP280 Library @ 2.1.0 ;; experimental for usermod USERMOD_SENSORSTOMQTT
  ; adafruit/Adafruit CCS811 Library @ 1.0.4 ;; experimental for usermod USERMOD_SENSORSTOMQTT
  ; adafruit/Adafruit Si7021 Library @ 1.4.0 ;; experimental for usermod USERMOD_SENSORSTOMQTT
+  BME280@~3.0.0 ; for usermod USERMOD_BME280
+  https://github.com/alwynallan/DHT_nonblocking ; for usermod USERMOD_DHT
+  pololu/VL53L0X @ ^1.3.0 ; for usermod USERMOD_VL53L0X_GESTURES

 ; end of common

--- a/usermods/BH1750_v2/usermod_bh1750.h
+++ b/usermods/BH1750_v2/usermod_bh1750.h
@@ -240,7 +240,7 @@ public:
    top[FPSTR(_HomeAssistantDiscovery)] = HomeAssistantDiscovery;
    top[FPSTR(_offset)] = offset;
    JsonArray io_pin = top.createNestedArray(F("pin"));
-    //WLEDMM: Only save if not same as global
+    //WLEDMM: avoid global pin hijacking
    io_pin.add((ioPin[0]==i2c_scl)?-1:ioPin[0]);
    io_pin.add((ioPin[1]==i2c_sda)?-1:ioPin[1]);

--- a/usermods/BME280_v2/usermod_bme280.h
+++ b/usermods/BME280_v2/usermod_bme280.h
@@ -412,7 +412,9 @@ public:
    top[F("UseCelsius")] = UseCelsius;
    top[F("HomeAssistantDiscovery")] = HomeAssistantDiscovery;
    JsonArray io_pin = top.createNestedArray(F("pin"));
-    for (byte i=0; i<2; i++) io_pin.add(ioPin[i]);
+    //WLEDMM: avoid global pin hijacking
+    io_pin.add((ioPin[0]==i2c_scl)?-1:ioPin[0]);
+    io_pin.add((ioPin[1]==i2c_sda)?-1:ioPin[1]);
    top[F("help4Pins")] = F("SCL,SDA"); // help for Settings page
    DEBUG_PRINTLN(F("BME280 config saved."));
  }
--- a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
+++ b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
@@ -639,6 +639,7 @@ class FourLineDisplayUsermod : public Usermod {
      JsonObject top   = root.createNestedObject(FPSTR(_name));
      top[FPSTR(_enabled)]       = enabled;
      JsonArray io_pin = top.createNestedArray("pin");
+      #warning WLEDMM: this causes global pin hijacking
      for (byte i=0; i<5; i++) io_pin.add(ioPin[i]);
      top["help4Pins"]           = F("Clk,Data,CS,DC,RST"); // help for Settings page
      top["type"]                = type;
--- a/wled00/data/settings.htm
+++ b/wled00/data/settings.htm
@@ -85,7 +85,7 @@
 			border: 1px solid #333;
 			border-radius: var(--h);
 			font-size: 6vmin;
-			height: var(--h);
+			/* height: var(--h); WLEDMM remove to allow more compact display*/
 			width: calc(100% - 40px);
 			margin: 2vh auto 0;
 			cursor: pointer;
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -65,86 +65,86 @@ const uint8_t PAGE_settingsCss[] PROGMEM = {


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