From 1d24b563d76caccd2c49925a129acd7e2498f1f5 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Sat, 28 Jan 2023 19:16:30 +0100 Subject: [PATCH 01/17] added image handling - bmp2grays to convert 24 bits BMP to 2 bits - spr2grays to create image using tft_espi library --- esp32_fw/data/calibrib50.vlw | Bin 0 -> 22807 bytes esp32_fw/data/calibrib62.vlw | Bin 0 -> 34393 bytes esp32_fw/include/makeimage.h | 32 +++ esp32_fw/platformio.ini | 1 + esp32_fw/src/main.cpp | 2 + esp32_fw/src/makeimage.cpp | 428 +++++++++++++++++++++++++++++++++++ 6 files changed, 463 insertions(+) create mode 100644 esp32_fw/data/calibrib50.vlw create mode 100644 esp32_fw/data/calibrib62.vlw create mode 100644 esp32_fw/include/makeimage.h create mode 100644 esp32_fw/src/makeimage.cpp diff --git a/esp32_fw/data/calibrib50.vlw b/esp32_fw/data/calibrib50.vlw new file mode 100644 index 0000000000000000000000000000000000000000..6c0b0dd1fd3e197c8ce9193855862b4e90c5988d GIT binary patch literal 22807 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 U{_O4do?ZUt-RJL=_v7&X51ljV8~^|S literal 0 HcmV?d00001 diff --git a/esp32_fw/data/calibrib62.vlw b/esp32_fw/data/calibrib62.vlw new file mode 100644 index 0000000000000000000000000000000000000000..97ea7ad38cf5cfd10b09571014ee5c99229cf9d4 GIT binary patch literal 34393 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 literal 0 HcmV?d00001 diff --git a/esp32_fw/include/makeimage.h b/esp32_fw/include/makeimage.h new file mode 100644 index 00000000..ff04e87d --- /dev/null +++ b/esp32_fw/include/makeimage.h @@ -0,0 +1,32 @@ +#include +#include + +struct BitmapFileHeader { + uint8_t sig[2]; + uint32_t fileSz; + uint8_t rfu[4]; + uint32_t dataOfst; + uint32_t headerSz; //40 + int32_t width; + int32_t height; + uint16_t colorplanes; //must be one + uint16_t bpp; + uint32_t compression; + uint32_t dataLen; //may be 0 + uint32_t pixelsPerMeterX; + uint32_t pixelsPerMeterY; + uint32_t numColors; //if zero, assume 2^bpp + uint32_t numImportantColors; + +} __attribute__((packed)); + +enum EinkClut { + EinkClutTwoBlacks = 0, + EinkClutTwoBlacksAndRed, + EinkClutFourBlacks, + EinkClutThreeBlacksAndRed, +}; + +void tftinit(); +void spr2grays(TFT_eSprite &spr, long w, long h, String fileout); +void bmp2grays(String filein,String fileout); diff --git a/esp32_fw/platformio.ini b/esp32_fw/platformio.ini index c22487e0..4ffae9cb 100644 --- a/esp32_fw/platformio.ini +++ b/esp32_fw/platformio.ini @@ -22,5 +22,6 @@ lib_deps = https://github.com/me-no-dev/ESPAsyncWebServer https://github.com/tzapu/WiFiManager.git#feature_asyncwebserver bblanchon/ArduinoJson + bodmer/TFT_eSPI upload_port = COM5 monitor_port = COM5 diff --git a/esp32_fw/src/main.cpp b/esp32_fw/src/main.cpp index efe79a2d..89f8bbc8 100644 --- a/esp32_fw/src/main.cpp +++ b/esp32_fw/src/main.cpp @@ -8,6 +8,7 @@ #include "serial.h" #include "soc/rtc_wdt.h" #include "web.h" +#include "makeimage.h" void freeHeapTask(void* parameter) { while (1) { @@ -20,6 +21,7 @@ void setup() { Serial.begin(115200); Serial.print(">\n"); init_web(); + tftinit(); long timezone = 2; byte daysavetime = 1; diff --git a/esp32_fw/src/makeimage.cpp b/esp32_fw/src/makeimage.cpp new file mode 100644 index 00000000..28de9339 --- /dev/null +++ b/esp32_fw/src/makeimage.cpp @@ -0,0 +1,428 @@ +#include +#include +#include +#include +#include + +void tftinit() { + TFT_eSPI tft = TFT_eSPI(); + TFT_eSprite spr = TFT_eSprite(&tft); + + LittleFS.begin(); + + long w = 296, h = 128; // mag staand of liggend + spr.createSprite(w, h); + spr.setColorDepth(8); + spr.fillSprite(TFT_WHITE); + spr.setTextDatum(TC_DATUM); + spr.loadFont("calibrib62", LittleFS); + spr.setTextColor(TFT_RED, TFT_WHITE); + spr.drawString("zondag", w / 2, 10); + spr.loadFont("calibrib50", LittleFS); + spr.setTextColor(TFT_BLACK, TFT_WHITE); + spr.drawString("28 januari", w / 2, 73); + spr.unloadFont(); + + spr2grays(spr, w, h, "/testspr3.bmp"); + + spr.deleteSprite(); + // bmp2grays("/test.bmp", "/testgrays3.bmp"); +} + +static uint32_t repackPackedVals(uint32_t val, uint32_t pixelsPerPackedUnit, uint32_t packedMultiplyVal) { + uint32_t ret = 0, i; + for (i = 0; i < pixelsPerPackedUnit; i++) { + ret = ret * packedMultiplyVal + val % packedMultiplyVal; + val /= packedMultiplyVal; + } + return ret; +} + +void spr2grays(TFT_eSprite &spr, long w, long h, String fileout) { + // based on bmp2grays function by Dmitry.GR + + Serial.println("start writing BMP"); + long t = millis(); + LittleFS.begin(); + + fs::File f_out = LittleFS.open(fileout, "w"); + + uint32_t c, rowBytesOut, rowBytesIn, outBpp, i, numRows, pixelsPerPackedUnit = 1, packedMultiplyVal = 0x01000000, packedOutBpp = 0; + uint32_t numGrays, extraColor = 0; + struct BitmapFileHeader hdr; + memset(&hdr, 0, sizeof(hdr)); + enum EinkClut clutType; + uint8_t clut[256][3]; + bool dither = false, rotated = false; + int skipBytes; + + clutType = EinkClutTwoBlacksAndRed; + + if (w > h) { + hdr.width = h; + hdr.height = w; + rotated = true; + } else { + hdr.width = w; + hdr.height = h; + } + hdr.bpp = 24; + hdr.sig[0] = 'B'; + hdr.sig[1] = 'M'; + hdr.colorplanes = 1; + + switch (clutType) { + case EinkClutTwoBlacks: + numGrays = 2; + outBpp = 1; + break; + + case EinkClutTwoBlacksAndRed: + extraColor = 0xff0000; + numGrays = 2; + outBpp = 2; + break; + + case EinkClutFourBlacks: + numGrays = 4; + outBpp = 2; + break; + + case EinkClutThreeBlacksAndRed: + numGrays = 3; + extraColor = 0xff0000; + outBpp = 2; + break; + } + + packedOutBpp = outBpp; + + rowBytesIn = (hdr.width * hdr.bpp + 31) / 32 * 4; + rowBytesOut = ((hdr.width + pixelsPerPackedUnit - 1) / pixelsPerPackedUnit) * packedOutBpp; + rowBytesOut = (rowBytesOut + 31) / 32 * 4; + + numRows = hdr.height < 0 ? -hdr.height : hdr.height; + hdr.bpp = outBpp; + hdr.numColors = 1 << outBpp; + hdr.numImportantColors = 1 << outBpp; + hdr.dataOfst = sizeof(struct BitmapFileHeader) + 4 * hdr.numColors; + hdr.dataLen = numRows * rowBytesOut; + hdr.fileSz = hdr.dataOfst + hdr.dataLen; + hdr.headerSz = 40; + hdr.compression = 0; + + f_out.write((uint8_t *)&hdr, sizeof(hdr)); + + // emit & record grey clut entries + for (i = 0; i < numGrays; i++) { + uint32_t val = 255 * i / (numGrays - 1); + + f_out.write(val); + f_out.write(val); + f_out.write(val); + f_out.write(val); + + clut[i][0] = val; + clut[i][1] = val; + clut[i][2] = val; + } + + if (extraColor) { + f_out.write((extraColor >> 0) & 0xff); // B + f_out.write((extraColor >> 8) & 0xff); // G + f_out.write((extraColor >> 16) & 0xff); // R + f_out.write(0x00); // A + + clut[i][0] = (extraColor >> 0) & 0xff; + clut[i][1] = (extraColor >> 8) & 0xff; + clut[i][2] = (extraColor >> 16) & 0xff; + } + + // pad clut to size + for (i = numGrays + (extraColor ? 1 : 0); i < hdr.numColors; i++) { + f_out.write(0x00); + f_out.write(0x00); + f_out.write(0x00); + f_out.write(0x00); + } + + while (numRows--) { + uint32_t pixelValsPackedSoFar = 0, numPixelsPackedSoFar = 0, valSoFar = 0, bytesIn = 0, bytesOut = 0, bitsSoFar = 0; + + for (c = 0; c < hdr.width; c++, bytesIn += 3) { + int64_t bestDist = 0x7fffffffffffffffll; + uint8_t bestIdx = 0; + int32_t ditherFudge = 0; + uint16_t color565; + if (rotated) { + color565 = spr.readPixel(hdr.height - 1 - numRows, c); + } else { + color565 = spr.readPixel(c, numRows); + } + + uint8_t red = ((color565 >> 11) & 0x1F) * 8; + uint8_t green = ((color565 >> 5) & 0x3F) * 4; + uint8_t blue = (color565 & 0x1F) * 8; + + if (dither) + ditherFudge = (rand() % 255 - 127) / (int)numGrays; + + for (i = 0; i < hdr.numColors; i++) { + int64_t dist = 0; + + dist += (blue - clut[i][0] + ditherFudge) * (blue - clut[i][0] + ditherFudge) * 4750ll; + dist += (green - clut[i][1] + ditherFudge) * (green - clut[i][1] + ditherFudge) * 47055ll; + dist += (red - clut[i][2] + ditherFudge) * (red - clut[i][2] + ditherFudge) * 13988ll; + + if (dist < bestDist) { + bestDist = dist; + bestIdx = i; + } + } + + // pack pixels as needed + pixelValsPackedSoFar = pixelValsPackedSoFar * packedMultiplyVal + bestIdx; + if (++numPixelsPackedSoFar != pixelsPerPackedUnit) + continue; + + numPixelsPackedSoFar = 0; + + // it is easier to display when low val is first pixel. currently last pixel is low - reverse this + pixelValsPackedSoFar = repackPackedVals(pixelValsPackedSoFar, pixelsPerPackedUnit, packedMultiplyVal); + + valSoFar = (valSoFar << packedOutBpp) | pixelValsPackedSoFar; + pixelValsPackedSoFar = 0; + bitsSoFar += packedOutBpp; + + if (bitsSoFar >= 8) { + f_out.write(valSoFar >> (bitsSoFar -= 8)); + valSoFar &= (1 << bitsSoFar) - 1; + bytesOut++; + } + } + + // see if we have unfinished pixel packages to write + if (numPixelsPackedSoFar) { + while (numPixelsPackedSoFar++ != pixelsPerPackedUnit) + pixelValsPackedSoFar *= packedMultiplyVal; + + // it is easier to display when low val is first pixel. currently last pixel is low - reverse this + pixelValsPackedSoFar = repackPackedVals(pixelValsPackedSoFar, pixelsPerPackedUnit, packedMultiplyVal); + + valSoFar = (valSoFar << packedOutBpp) | pixelValsPackedSoFar; + pixelValsPackedSoFar = 0; + bitsSoFar += packedOutBpp; + + if (bitsSoFar >= 8) { + f_out.write(valSoFar >> (bitsSoFar -= 8)); + valSoFar &= (1 << bitsSoFar) - 1; + bytesOut++; + } + } + + if (bitsSoFar) { + valSoFar <<= 8 - bitsSoFar; // left-align it as is expected + f_out.write(valSoFar); + bytesOut++; + } + + while (bytesOut++ < rowBytesOut) + f_out.write(0); + } + f_out.close(); + Serial.println(millis() - t); + Serial.println("finished writing BMP"); +} + +void bmp2grays(String filein, String fileout) { + // based on bmp2grays function by Dmitry.GR + + Serial.println("start writing BMP2"); + long t = millis(); + LittleFS.begin(); + + fs::File f_in = LittleFS.open(filein, "r"); + fs::File f_out = LittleFS.open(fileout, "w"); + + uint32_t c, rowBytesOut, rowBytesIn, outBpp, i, numRows, pixelsPerPackedUnit = 1, packedMultiplyVal = 0x01000000, packedOutBpp = 0; + uint32_t numGrays, extraColor = 0; + struct BitmapFileHeader hdr; + enum EinkClut clutType; + uint8_t clut[256][3]; + bool dither = false; + int skipBytes; + + clutType = EinkClutTwoBlacksAndRed; + + f_in.read((uint8_t *)&hdr, sizeof(hdr)); + + if (hdr.sig[0] != 'B' || hdr.sig[1] != 'M' || hdr.headerSz < 40 || hdr.colorplanes != 1 || hdr.bpp != 24 || hdr.compression) { + Serial.println("BITMAP HEADER INVALID, use uncompressed 24 bits RGB"); + return; + } + + switch (clutType) { + case EinkClutTwoBlacks: + numGrays = 2; + outBpp = 1; + break; + + case EinkClutTwoBlacksAndRed: + extraColor = 0xff0000; + numGrays = 2; + outBpp = 2; + break; + + case EinkClutFourBlacks: + numGrays = 4; + outBpp = 2; + break; + + case EinkClutThreeBlacksAndRed: + numGrays = 3; + extraColor = 0xff0000; + outBpp = 2; + break; + } + + packedOutBpp = outBpp; + + skipBytes = hdr.dataOfst - sizeof(hdr); + if (skipBytes < 0) { + fprintf(stderr, "file header was too short!\n"); + exit(-1); + } + f_in.read(NULL, skipBytes); + + rowBytesIn = (hdr.width * hdr.bpp + 31) / 32 * 4; + rowBytesOut = ((hdr.width + pixelsPerPackedUnit - 1) / pixelsPerPackedUnit) * packedOutBpp; + rowBytesOut = (rowBytesOut + 31) / 32 * 4; + + numRows = hdr.height < 0 ? -hdr.height : hdr.height; + hdr.bpp = outBpp; + hdr.numColors = 1 << outBpp; + hdr.numImportantColors = 1 << outBpp; + hdr.dataOfst = sizeof(struct BitmapFileHeader) + 4 * hdr.numColors; + hdr.dataLen = numRows * rowBytesOut; + hdr.fileSz = hdr.dataOfst + hdr.dataLen; + hdr.headerSz = 40; + hdr.compression = 0; + + f_out.write((uint8_t *)&hdr, sizeof(hdr)); + + // emit & record grey clut entries + for (i = 0; i < numGrays; i++) { + uint32_t val = 255 * i / (numGrays - 1); + + f_out.write(val); + f_out.write(val); + f_out.write(val); + f_out.write(val); + + clut[i][0] = val; + clut[i][1] = val; + clut[i][2] = val; + } + + // if there is a color CLUT entry, emit that + if (extraColor) { + f_out.write((extraColor >> 0) & 0xff); // B + f_out.write((extraColor >> 8) & 0xff); // G + f_out.write((extraColor >> 16) & 0xff); // R + f_out.write(0x00); // A + + clut[i][0] = (extraColor >> 0) & 0xff; + clut[i][1] = (extraColor >> 8) & 0xff; + clut[i][2] = (extraColor >> 16) & 0xff; + } + + // pad clut to size + for (i = numGrays + (extraColor ? 1 : 0); i < hdr.numColors; i++) { + f_out.write(0x00); + f_out.write(0x00); + f_out.write(0x00); + f_out.write(0x00); + } + + while (numRows--) { + uint32_t pixelValsPackedSoFar = 0, numPixelsPackedSoFar = 0, valSoFar = 0, bytesIn = 0, bytesOut = 0, bitsSoFar = 0; + + for (c = 0; c < hdr.width; c++, bytesIn += 3) { + int64_t bestDist = 0x7fffffffffffffffll; + uint8_t rgb[3], bestIdx = 0; + int32_t ditherFudge = 0; + + f_in.read(rgb, sizeof(rgb)); + + if (dither) + ditherFudge = (rand() % 255 - 127) / (int)numGrays; + + for (i = 0; i < hdr.numColors; i++) { + int64_t dist = 0; + + dist += (rgb[0] - clut[i][0] + ditherFudge) * (rgb[0] - clut[i][0] + ditherFudge) * 4750ll; + dist += (rgb[1] - clut[i][1] + ditherFudge) * (rgb[1] - clut[i][1] + ditherFudge) * 47055ll; + dist += (rgb[2] - clut[i][2] + ditherFudge) * (rgb[2] - clut[i][2] + ditherFudge) * 13988ll; + + if (dist < bestDist) { + bestDist = dist; + bestIdx = i; + } + } + + // pack pixels as needed + pixelValsPackedSoFar = pixelValsPackedSoFar * packedMultiplyVal + bestIdx; + if (++numPixelsPackedSoFar != pixelsPerPackedUnit) + continue; + + numPixelsPackedSoFar = 0; + + // it is easier to display when low val is first pixel. currently last pixel is low - reverse this + pixelValsPackedSoFar = repackPackedVals(pixelValsPackedSoFar, pixelsPerPackedUnit, packedMultiplyVal); + + valSoFar = (valSoFar << packedOutBpp) | pixelValsPackedSoFar; + pixelValsPackedSoFar = 0; + bitsSoFar += packedOutBpp; + + if (bitsSoFar >= 8) { + f_out.write(valSoFar >> (bitsSoFar -= 8)); + valSoFar &= (1 << bitsSoFar) - 1; + bytesOut++; + } + } + + // see if we have unfinished pixel packages to write + if (numPixelsPackedSoFar) { + while (numPixelsPackedSoFar++ != pixelsPerPackedUnit) + pixelValsPackedSoFar *= packedMultiplyVal; + + // it is easier to display when low val is first pixel. currently last pixel is low - reverse this + pixelValsPackedSoFar = repackPackedVals(pixelValsPackedSoFar, pixelsPerPackedUnit, packedMultiplyVal); + + valSoFar = (valSoFar << packedOutBpp) | pixelValsPackedSoFar; + pixelValsPackedSoFar = 0; + bitsSoFar += packedOutBpp; + + if (bitsSoFar >= 8) { + f_out.write(valSoFar >> (bitsSoFar -= 8)); + valSoFar &= (1 << bitsSoFar) - 1; + bytesOut++; + } + } + + if (bitsSoFar) { + valSoFar <<= 8 - bitsSoFar; // left-align it as is expected + f_out.write(valSoFar); + bytesOut++; + } + + while (bytesIn++ < rowBytesIn) + f_in.read(NULL, 1); + while (bytesOut++ < rowBytesOut) + f_out.write(0); + } + f_in.close(); + f_out.close(); + Serial.println(millis() - t); + Serial.println("finished writing BMP2"); +} \ No newline at end of file From 2fbb77bc341b944aefe6b42ede1817f4ae881c0d Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Sun, 29 Jan 2023 22:39:38 +0100 Subject: [PATCH 02/17] jpeg2bmp, bmp2grays, refactor website - new webpage to manage tags (work in progress), gets rid of jquery ;-) - built in jpg and 24bpp bmp converter. the jpeg-converter auto-rotates the image, so uploading a 296x128px jpeg for a 2.9" tag is fine now. 24bpp bmp is also fine, but no autorotation (more complex, and imho unnecessary) - changed websockets communication to json - small fixes and cleanup --- esp32_fw/data/bmp24bpp-h.bmp | Bin 0 -> 113720 bytes esp32_fw/data/bmp24bpp-v.bmp | Bin 0 -> 113720 bytes esp32_fw/data/index.html | 127 ++++++++++++-------- esp32_fw/data/jpeg-h.jpg | Bin 0 -> 15239 bytes esp32_fw/data/jpeg-v.jpg | Bin 0 -> 16117 bytes esp32_fw/data/jquery.js | 6 - esp32_fw/data/main.css | 226 +++++++++++++++++------------------ esp32_fw/data/main.js | 147 ++++++++++++++++++++--- esp32_fw/include/makeimage.h | 4 +- esp32_fw/include/web.h | 3 + esp32_fw/platformio.ini | 1 + esp32_fw/src/main.cpp | 13 -- esp32_fw/src/makeimage.cpp | 31 ++++- esp32_fw/src/newproto.cpp | 64 +++++++++- esp32_fw/src/web.cpp | 34 +++++- 15 files changed, 438 insertions(+), 218 deletions(-) create mode 100644 esp32_fw/data/bmp24bpp-h.bmp create mode 100644 esp32_fw/data/bmp24bpp-v.bmp create mode 100644 esp32_fw/data/jpeg-h.jpg create mode 100644 esp32_fw/data/jpeg-v.jpg delete mode 100644 esp32_fw/data/jquery.js diff --git a/esp32_fw/data/bmp24bpp-h.bmp b/esp32_fw/data/bmp24bpp-h.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6ba63e1919664765e4bfc1ea3185b5fed44e78b8 GIT binary patch literal 113720 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 H0*}Z4zW_R| literal 0 HcmV?d00001 diff --git a/esp32_fw/data/index.html b/esp32_fw/data/index.html index 8a65efa4..1bdff43b 100644 --- a/esp32_fw/data/index.html +++ b/esp32_fw/data/index.html @@ -1,66 +1,89 @@ + - - + + -Solum - alternative proto AP - + Solum - alternative proto AP + + -
- -
+
+ +
-
+
+
-
    +
    + +
    +
    + + +
    +
    +
    +

    + + +

    +

    + + min +

    +

    + +

    +
    +
    +

    + + +

    +

    + +

    +
    +
    +

    + +

    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + last: +
    +
    +
    +
    +
    +
    + +
    +

    logging

    +
      +
    +
    +
    -
    +
    + - - - -
    -
    - DST: - Filename: - Next check-in: min - -
    -
    - -
    -
    - DST: - Filename: - -
    -
    - -
    -
    - DST: - -
    -
    - -
    -
      -
    - -
    -
    - - -
    - - - - - - + + \ No newline at end of file diff --git a/esp32_fw/data/jpeg-h.jpg b/esp32_fw/data/jpeg-h.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3d03dfd864ce2a235274d60151fba75d3984a1b9 GIT binary patch literal 15239 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 literal 0 HcmV?d00001 diff --git a/esp32_fw/data/jquery.js b/esp32_fw/data/jquery.js deleted file mode 100644 index ee381345..00000000 --- a/esp32_fw/data/jquery.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! jQuery v2.0.3 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license -//@ sourceMappingURL=jquery.min.map -*/ -(function(e,undefined){var t,n,r=typeof undefined,i=e.location,o=e.document,s=o.documentElement,a=e.jQuery,u=e.$,l={},c=[],p="2.0.3",f=c.concat,h=c.push,d=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,x=function(e,n){return new x.fn.init(e,n,t)},b=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^-ms-/,N=/-([\da-z])/gi,E=function(e,t){return t.toUpperCase()},S=function(){o.removeEventListener("DOMContentLoaded",S,!1),e.removeEventListener("load",S,!1),x.ready()};x.fn=x.prototype={jquery:p,constructor:x,init:function(e,t,n){var r,i;if(!e)return this;if("string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:T.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:o,!0)),C.test(r[1])&&x.isPlainObject(t))for(r in t)x.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return i=o.getElementById(r[2]),i&&i.parentNode&&(this.length=1,this[0]=i),this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?n.ready(e):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return d.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,t,n,r,i,o,s=arguments[0]||{},a=1,u=arguments.length,l=!1;for("boolean"==typeof s&&(l=s,s=arguments[1]||{},a=2),"object"==typeof s||x.isFunction(s)||(s={}),u===a&&(s=this,--a);u>a;a++)if(null!=(e=arguments[a]))for(t in e)n=s[t],r=e[t],s!==r&&(l&&r&&(x.isPlainObject(r)||(i=x.isArray(r)))?(i?(i=!1,o=n&&x.isArray(n)?n:[]):o=n&&x.isPlainObject(n)?n:{},s[t]=x.extend(l,o,r)):r!==undefined&&(s[t]=r));return s},x.extend({expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=a),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){(e===!0?--x.readyWait:x.isReady)||(x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(o,[x]),x.fn.trigger&&x(o).trigger("ready").off("ready")))},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray,isWindow:function(e){return null!=e&&e===e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if("object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(t){return!1}return!0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:JSON.parse,parseXML:function(e){var t,n;if(!e||"string"!=typeof e)return null;try{n=new DOMParser,t=n.parseFromString(e,"text/xml")}catch(r){t=undefined}return(!t||t.getElementsByTagName("parsererror").length)&&x.error("Invalid XML: "+e),t},noop:function(){},globalEval:function(e){var t,n=eval;e=x.trim(e),e&&(1===e.indexOf("use strict")?(t=o.createElement("script"),t.text=e,o.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(k,"ms-").replace(N,E)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,s=j(e);if(n){if(s){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(s){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:function(e){return null==e?"":v.call(e)},makeArray:function(e,t){var n=t||[];return null!=e&&(j(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:g.call(t,e,n)},merge:function(e,t){var n=t.length,r=e.length,i=0;if("number"==typeof n)for(;n>i;i++)e[r++]=t[i];else while(t[i]!==undefined)e[r++]=t[i++];return e.length=r,e},grep:function(e,t,n){var r,i=[],o=0,s=e.length;for(n=!!n;s>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,s=j(e),a=[];if(s)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(a[a.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(a[a.length]=r);return f.apply([],a)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(n=e[t],t=e,e=n),x.isFunction(e)?(r=d.call(arguments,2),i=function(){return e.apply(t||this,r.concat(d.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):undefined},access:function(e,t,n,r,i,o,s){var a=0,u=e.length,l=null==n;if("object"===x.type(n)){i=!0;for(a in n)x.access(e,t,a,n[a],!0,o,s)}else if(r!==undefined&&(i=!0,x.isFunction(r)||(s=!0),l&&(s?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(x(e),n)})),t))for(;u>a;a++)t(e[a],n,s?r:r.call(e[a],a,t(e[a],n)));return i?e:l?t.call(e):u?t(e[0],n):o},now:Date.now,swap:function(e,t,n,r){var i,o,s={};for(o in t)s[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=s[o];return i}}),x.ready.promise=function(t){return n||(n=x.Deferred(),"complete"===o.readyState?setTimeout(x.ready):(o.addEventListener("DOMContentLoaded",S,!1),e.addEventListener("load",S,!1))),n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function j(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}t=x(o),function(e,undefined){var t,n,r,i,o,s,a,u,l,c,p,f,h,d,g,m,y,v="sizzle"+-new Date,b=e.document,w=0,T=0,C=st(),k=st(),N=st(),E=!1,S=function(e,t){return e===t?(E=!0,0):0},j=typeof undefined,D=1<<31,A={}.hasOwnProperty,L=[],q=L.pop,H=L.push,O=L.push,F=L.slice,P=L.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",W="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",$=W.replace("w","w#"),B="\\["+M+"*("+W+")"+M+"*(?:([*^$|!~]?=)"+M+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+$+")|)|)"+M+"*\\]",I=":("+W+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+B.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=RegExp("^"+M+"*,"+M+"*"),X=RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=RegExp(M+"*[+~]"),Y=RegExp("="+M+"*([^\\]'\"]*)"+M+"*\\]","g"),V=RegExp(I),G=RegExp("^"+$+"$"),J={ID:RegExp("^#("+W+")"),CLASS:RegExp("^\\.("+W+")"),TAG:RegExp("^("+W.replace("w","w*")+")"),ATTR:RegExp("^"+B),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:RegExp("^(?:"+R+")$","i"),needsContext:RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Q=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/^(?:input|select|textarea|button)$/i,et=/^h\d$/i,tt=/'|\\/g,nt=RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),rt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{O.apply(L=F.call(b.childNodes),b.childNodes),L[b.childNodes.length].nodeType}catch(it){O={apply:L.length?function(e,t){H.apply(e,F.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function ot(e,t,r,i){var o,s,a,u,l,f,g,m,x,w;if((t?t.ownerDocument||t:b)!==p&&c(t),t=t||p,r=r||[],!e||"string"!=typeof e)return r;if(1!==(u=t.nodeType)&&9!==u)return[];if(h&&!i){if(o=K.exec(e))if(a=o[1]){if(9===u){if(s=t.getElementById(a),!s||!s.parentNode)return r;if(s.id===a)return r.push(s),r}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(a))&&y(t,s)&&s.id===a)return r.push(s),r}else{if(o[2])return O.apply(r,t.getElementsByTagName(e)),r;if((a=o[3])&&n.getElementsByClassName&&t.getElementsByClassName)return O.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&(!d||!d.test(e))){if(m=g=v,x=t,w=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){f=gt(e),(g=t.getAttribute("id"))?m=g.replace(tt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",l=f.length;while(l--)f[l]=m+mt(f[l]);x=U.test(e)&&t.parentNode||t,w=f.join(",")}if(w)try{return O.apply(r,x.querySelectorAll(w)),r}catch(T){}finally{g||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,r,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>i.cacheLength&&delete t[e.shift()],t[n]=r}return t}function at(e){return e[v]=!0,e}function ut(e){var t=p.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--)i.attrHandle[n[r]]=t}function ct(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return at(function(t){return t=+t,at(function(n,r){var i,o=e([],n.length,t),s=o.length;while(s--)n[i=o[s]]&&(n[i]=!(r[i]=n[i]))})})}s=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},n=ot.support={},c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:b,r=t.defaultView;return t!==p&&9===t.nodeType&&t.documentElement?(p=t,f=t.documentElement,h=!s(t),r&&r.attachEvent&&r!==r.top&&r.attachEvent("onbeforeunload",function(){c()}),n.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ut(function(e){return e.appendChild(t.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=ut(function(e){return e.innerHTML="
    ",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),n.getById=ut(function(e){return f.appendChild(e).id=v,!t.getElementsByName||!t.getElementsByName(v).length}),n.getById?(i.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){return e.getAttribute("id")===t}}):(delete i.find.ID,i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=n.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==j?t.getElementsByTagName(e):undefined}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==j&&h?t.getElementsByClassName(e):undefined},g=[],d=[],(n.qsa=Q.test(t.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ut(function(e){var n=t.createElement("input");n.setAttribute("type","hidden"),e.appendChild(n).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")})),(n.matchesSelector=Q.test(m=f.webkitMatchesSelector||f.mozMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&ut(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",I)}),d=d.length&&RegExp(d.join("|")),g=g.length&&RegExp(g.join("|")),y=Q.test(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},S=f.compareDocumentPosition?function(e,r){if(e===r)return E=!0,0;var i=r.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(r);return i?1&i||!n.sortDetached&&r.compareDocumentPosition(e)===i?e===t||y(b,e)?-1:r===t||y(b,r)?1:l?P.call(l,e)-P.call(l,r):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,o=e.parentNode,s=n.parentNode,a=[e],u=[n];if(e===n)return E=!0,0;if(!o||!s)return e===t?-1:n===t?1:o?-1:s?1:l?P.call(l,e)-P.call(l,n):0;if(o===s)return ct(e,n);r=e;while(r=r.parentNode)a.unshift(r);r=n;while(r=r.parentNode)u.unshift(r);while(a[i]===u[i])i++;return i?ct(a[i],u[i]):a[i]===b?-1:u[i]===b?1:0},t):p},ot.matches=function(e,t){return ot(e,null,null,t)},ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Y,"='$1']"),!(!n.matchesSelector||!h||g&&g.test(t)||d&&d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return ot(t,p,null,[e]).length>0},ot.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},ot.attr=function(e,t){(e.ownerDocument||e)!==p&&c(e);var r=i.attrHandle[t.toLowerCase()],o=r&&A.call(i.attrHandle,t.toLowerCase())?r(e,t,!h):undefined;return o===undefined?n.attributes||!h?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null:o},ot.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},ot.uniqueSort=function(e){var t,r=[],i=0,o=0;if(E=!n.detectDuplicates,l=!n.sortStable&&e.slice(0),e.sort(S),E){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return e},o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=ot.selectors={cacheLength:50,createPseudo:at,match:J,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(nt,rt),e[3]=(e[4]||e[5]||"").replace(nt,rt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ot.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ot.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return J.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&V.test(n)&&(t=gt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(nt,rt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&C(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,h,d,g=o!==s?"nextSibling":"previousSibling",m=t.parentNode,y=a&&t.nodeName.toLowerCase(),x=!u&&!a;if(m){if(o){while(g){p=t;while(p=p[g])if(a?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;d=g="only"===e&&!d&&"nextSibling"}return!0}if(d=[s?m.firstChild:m.lastChild],s&&x){c=m[v]||(m[v]={}),l=c[e]||[],h=l[0]===w&&l[1],f=l[0]===w&&l[2],p=h&&m.childNodes[h];while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[w,h,f];break}}else if(x&&(l=(t[v]||(t[v]={}))[e])&&l[0]===w)f=l[1];else while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if((a?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(x&&((p[v]||(p[v]={}))[e]=[w,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);return r[v]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,o=r(e,t),s=o.length;while(s--)i=P.call(e,o[s]),e[i]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(z,"$1"));return r[v]?at(function(e,t,n,i){var o,s=r(e,null,i,[]),a=e.length;while(a--)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){return G.test(e||"")||ot.error("unsupported lang: "+e),e=e.replace(nt,rt).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return et.test(e.nodeName)},input:function(e){return Z.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},i.pseudos.nth=i.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[t]=pt(t);for(t in{submit:!0,reset:!0})i.pseudos[t]=ft(t);function dt(){}dt.prototype=i.filters=i.pseudos,i.setFilters=new dt;function gt(e,t){var n,r,o,s,a,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);a=e,u=[],l=i.preFilter;while(a){(!n||(r=_.exec(a)))&&(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=X.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(z," ")}),a=a.slice(n.length));for(s in i.filter)!(r=J[s].exec(a))||l[s]&&!(r=l[s](r))||(n=r.shift(),o.push({value:n,type:s,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?ot.error(e):k(e,u).slice(0)}function mt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function yt(e,t,n){var i=t.dir,o=n&&"parentNode"===i,s=T++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,a){var u,l,c,p=w+" "+s;if(a){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,a))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[v]||(t[v]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,a)||r,l[1]===!0)return!0}}function vt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,s=[],a=0,u=e.length,l=null!=t;for(;u>a;a++)(o=e[a])&&(!n||n(o,r,i))&&(s.push(o),l&&t.push(a));return s}function bt(e,t,n,r,i,o){return r&&!r[v]&&(r=bt(r)),i&&!i[v]&&(i=bt(i,o)),at(function(o,s,a,u){var l,c,p,f=[],h=[],d=s.length,g=o||Ct(t||"*",a.nodeType?[a]:a,[]),m=!e||!o&&t?g:xt(g,f,e,a,u),y=n?i||(o?e:d||r)?[]:s:m;if(n&&n(m,y,a,u),r){l=xt(y,h),r(l,[],a,u),c=l.length;while(c--)(p=l[c])&&(y[h[c]]=!(m[h[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?P.call(o,p):f[c])>-1&&(o[l]=!(s[l]=p))}}else y=xt(y===s?y.splice(d,y.length):y),i?i(null,s,y,u):O.apply(s,y)})}function wt(e){var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=yt(function(e){return e===t},a,!0),p=yt(function(e){return P.call(t,e)>-1},a,!0),f=[function(e,n,r){return!s&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>l;l++)if(n=i.relative[e[l].type])f=[yt(vt(f),n)];else{if(n=i.filter[e[l].type].apply(null,e[l].matches),n[v]){for(r=++l;o>r;r++)if(i.relative[e[r].type])break;return bt(l>1&&vt(f),l>1&&mt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&wt(e.slice(l,r)),o>r&&wt(e=e.slice(r)),o>r&&mt(e))}f.push(n)}return vt(f)}function Tt(e,t){var n=0,o=t.length>0,s=e.length>0,a=function(a,l,c,f,h){var d,g,m,y=[],v=0,x="0",b=a&&[],T=null!=h,C=u,k=a||s&&i.find.TAG("*",h&&l.parentNode||l),N=w+=null==C?1:Math.random()||.1;for(T&&(u=l!==p&&l,r=n);null!=(d=k[x]);x++){if(s&&d){g=0;while(m=e[g++])if(m(d,l,c)){f.push(d);break}T&&(w=N,r=++n)}o&&((d=!m&&d)&&v--,a&&b.push(d))}if(v+=x,o&&x!==v){g=0;while(m=t[g++])m(b,y,l,c);if(a){if(v>0)while(x--)b[x]||y[x]||(y[x]=q.call(f));y=xt(y)}O.apply(f,y),T&&!a&&y.length>0&&v+t.length>1&&ot.uniqueSort(f)}return T&&(w=N,u=C),b};return o?at(a):a}a=ot.compile=function(e,t){var n,r=[],i=[],o=N[e+" "];if(!o){t||(t=gt(e)),n=t.length;while(n--)o=wt(t[n]),o[v]?r.push(o):i.push(o);o=N(e,Tt(i,r))}return o};function Ct(e,t,n){var r=0,i=t.length;for(;i>r;r++)ot(e,t[r],n);return n}function kt(e,t,r,o){var s,u,l,c,p,f=gt(e);if(!o&&1===f.length){if(u=f[0]=f[0].slice(0),u.length>2&&"ID"===(l=u[0]).type&&n.getById&&9===t.nodeType&&h&&i.relative[u[1].type]){if(t=(i.find.ID(l.matches[0].replace(nt,rt),t)||[])[0],!t)return r;e=e.slice(u.shift().value.length)}s=J.needsContext.test(e)?0:u.length;while(s--){if(l=u[s],i.relative[c=l.type])break;if((p=i.find[c])&&(o=p(l.matches[0].replace(nt,rt),U.test(u[0].type)&&t.parentNode||t))){if(u.splice(s,1),e=o.length&&mt(u),!e)return O.apply(r,o),r;break}}}return a(e,f)(o,t,!h,r,U.test(e)),r}n.sortStable=v.split("").sort(S).join("")===v,n.detectDuplicates=E,c(),n.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(p.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||lt("type|href|height|width",function(e,t,n){return n?undefined:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||lt("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?undefined:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||lt(R,function(e,t,n){var r;return n?undefined:(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===!0?t.toLowerCase():null}),x.find=ot,x.expr=ot.selectors,x.expr[":"]=x.expr.pseudos,x.unique=ot.uniqueSort,x.text=ot.getText,x.isXMLDoc=ot.isXML,x.contains=ot.contains}(e);var D={};function A(e){var t=D[e]={};return x.each(e.match(w)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?D[e]||A(e):x.extend({},e);var t,n,r,i,o,s,a=[],u=!e.once&&[],l=function(p){for(t=e.memory&&p,n=!0,s=i||0,i=0,o=a.length,r=!0;a&&o>s;s++)if(a[s].apply(p[0],p[1])===!1&&e.stopOnFalse){t=!1;break}r=!1,a&&(u?u.length&&l(u.shift()):t?a=[]:c.disable())},c={add:function(){if(a){var n=a.length;(function s(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==r&&s(n)})})(arguments),r?o=a.length:t&&(i=n,l(t))}return this},remove:function(){return a&&x.each(arguments,function(e,t){var n;while((n=x.inArray(t,a,n))>-1)a.splice(n,1),r&&(o>=n&&o--,s>=n&&s--)}),this},has:function(e){return e?x.inArray(e,a)>-1:!(!a||!a.length)},empty:function(){return a=[],o=0,this},disable:function(){return a=u=t=undefined,this},disabled:function(){return!a},lock:function(){return u=undefined,t||c.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!a||n&&!u||(t=t||[],t=[e,t.slice?t.slice():t],r?u.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!n}};return c},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var s=o[0],a=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var s=o[2],a=o[3];r[o[1]]=s.add,a&&s.add(function(){n=a},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=s.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=d.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),s=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?d.call(arguments):r,n===a?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},a,u,l;if(r>1)for(a=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(s(t,l,n)).fail(o.reject).progress(s(t,u,a)):--i;return i||o.resolveWith(l,n),o.promise()}}),x.support=function(t){var n=o.createElement("input"),r=o.createDocumentFragment(),i=o.createElement("div"),s=o.createElement("select"),a=s.appendChild(o.createElement("option"));return n.type?(n.type="checkbox",t.checkOn=""!==n.value,t.optSelected=a.selected,t.reliableMarginRight=!0,t.boxSizingReliable=!0,t.pixelPosition=!1,n.checked=!0,t.noCloneChecked=n.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!a.disabled,n=o.createElement("input"),n.value="t",n.type="radio",t.radioValue="t"===n.value,n.setAttribute("checked","t"),n.setAttribute("name","t"),r.appendChild(n),t.checkClone=r.cloneNode(!0).cloneNode(!0).lastChild.checked,t.focusinBubbles="onfocusin"in e,i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===i.style.backgroundClip,x(function(){var n,r,s="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",a=o.getElementsByTagName("body")[0];a&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",a.appendChild(n).appendChild(i),i.innerHTML="",i.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",x.swap(a,null!=a.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===i.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(i,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(i,null)||{width:"4px"}).width,r=i.appendChild(o.createElement("div")),r.style.cssText=i.style.cssText=s,r.style.marginRight=r.style.width="0",i.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),a.removeChild(n))}),t):t}({});var L,q,H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,O=/([A-Z])/g;function F(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=x.expando+Math.random()}F.uid=1,F.accepts=function(e){return e.nodeType?1===e.nodeType||9===e.nodeType:!0},F.prototype={key:function(e){if(!F.accepts(e))return 0;var t={},n=e[this.expando];if(!n){n=F.uid++;try{t[this.expando]={value:n},Object.defineProperties(e,t)}catch(r){t[this.expando]=n,x.extend(e,t)}}return this.cache[n]||(this.cache[n]={}),n},set:function(e,t,n){var r,i=this.key(e),o=this.cache[i];if("string"==typeof t)o[t]=n;else if(x.isEmptyObject(o))x.extend(this.cache[i],t);else for(r in t)o[r]=t[r];return o},get:function(e,t){var n=this.cache[this.key(e)];return t===undefined?n:n[t]},access:function(e,t,n){var r;return t===undefined||t&&"string"==typeof t&&n===undefined?(r=this.get(e,t),r!==undefined?r:this.get(e,x.camelCase(t))):(this.set(e,t,n),n!==undefined?n:t)},remove:function(e,t){var n,r,i,o=this.key(e),s=this.cache[o];if(t===undefined)this.cache[o]={};else{x.isArray(t)?r=t.concat(t.map(x.camelCase)):(i=x.camelCase(t),t in s?r=[t,i]:(r=i,r=r in s?[r]:r.match(w)||[])),n=r.length;while(n--)delete s[r[n]]}},hasData:function(e){return!x.isEmptyObject(this.cache[e[this.expando]]||{})},discard:function(e){e[this.expando]&&delete this.cache[e[this.expando]]}},L=new F,q=new F,x.extend({acceptData:F.accepts,hasData:function(e){return L.hasData(e)||q.hasData(e)},data:function(e,t,n){return L.access(e,t,n)},removeData:function(e,t){L.remove(e,t)},_data:function(e,t,n){return q.access(e,t,n)},_removeData:function(e,t){q.remove(e,t)}}),x.fn.extend({data:function(e,t){var n,r,i=this[0],o=0,s=null;if(e===undefined){if(this.length&&(s=L.get(i),1===i.nodeType&&!q.get(i,"hasDataAttrs"))){for(n=i.attributes;n.length>o;o++)r=n[o].name,0===r.indexOf("data-")&&(r=x.camelCase(r.slice(5)),P(i,r,s[r]));q.set(i,"hasDataAttrs",!0)}return s}return"object"==typeof e?this.each(function(){L.set(this,e)}):x.access(this,function(t){var n,r=x.camelCase(e);if(i&&t===undefined){if(n=L.get(i,e),n!==undefined)return n;if(n=L.get(i,r),n!==undefined)return n;if(n=P(i,r,undefined),n!==undefined)return n}else this.each(function(){var n=L.get(this,r);L.set(this,r,t),-1!==e.indexOf("-")&&n!==undefined&&L.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){L.remove(this,e)})}});function P(e,t,n){var r;if(n===undefined&&1===e.nodeType)if(r="data-"+t.replace(O,"-$1").toLowerCase(),n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:H.test(n)?JSON.parse(n):n}catch(i){}L.set(e,t,n)}else n=undefined;return n}x.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=q.get(e,t),n&&(!r||x.isArray(n)?r=q.access(e,t,x.makeArray(n)):r.push(n)),r||[]):undefined},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),s=function(){x.dequeue(e,t) -};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,s,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return q.get(e,n)||q.access(e,n,{empty:x.Callbacks("once memory").add(function(){q.remove(e,[t+"queue",n])})})}}),x.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),n>arguments.length?x.queue(this[0],e):t===undefined?this:this.each(function(){var n=x.queue(this,e,t);x._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=x.Deferred(),o=this,s=this.length,a=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=undefined),e=e||"fx";while(s--)n=q.get(o[s],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(a));return a(),i.promise(t)}});var R,M,W=/[\t\r\n\f]/g,$=/\r/g,B=/^(?:input|select|textarea|button)$/i;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})},addClass:function(e){var t,n,r,i,o,s=0,a=this.length,u="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,s=0,a=this.length,u=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,i=0,o=x(this),s=e.match(w)||[];while(t=s[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===r||"boolean"===n)&&(this.className&&q.set(this,"__className__",this.className),this.className=this.className||e===!1?"":q.get(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(W," ").indexOf(t)>=0)return!0;return!1},val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=x.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,x(this).val()):e,null==i?i="":"number"==typeof i?i+="":x.isArray(i)&&(i=x.map(i,function(e){return null==e?"":e+""})),t=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&t.set(this,i,"value")!==undefined||(this.value=i))});if(i)return t=x.valHooks[i.type]||x.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,"string"==typeof n?n.replace($,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,s=o?null:[],a=o?i+1:r.length,u=0>i?a:o?i:0;for(;a>u;u++)if(n=r[u],!(!n.selected&&u!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),s=i.length;while(s--)r=i[s],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,t,n){var i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===r?x.prop(e,t,n):(1===s&&x.isXMLDoc(e)||(t=t.toLowerCase(),i=x.attrHooks[t]||(x.expr.match.bool.test(t)?M:R)),n===undefined?i&&"get"in i&&null!==(o=i.get(e,t))?o:(o=x.find.attr(e,t),null==o?undefined:o):null!==n?i&&"set"in i&&(o=i.set(e,n,t))!==undefined?o:(e.setAttribute(t,n+""),n):(x.removeAttr(e,t),undefined))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return o=1!==s||!x.isXMLDoc(e),o&&(t=x.propFix[t]||t,i=x.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){return e.hasAttribute("tabindex")||B.test(e.nodeName)||e.href?e.tabIndex:-1}}}}),M={set:function(e,t,n){return t===!1?x.removeAttr(e,n):e.setAttribute(n,n),n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,t){var n=x.expr.attrHandle[t]||x.find.attr;x.expr.attrHandle[t]=function(e,t,r){var i=x.expr.attrHandle[t],o=r?undefined:(x.expr.attrHandle[t]=undefined)!=n(e,t,r)?t.toLowerCase():null;return x.expr.attrHandle[t]=i,o}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,t){return x.isArray(t)?e.checked=x.inArray(x(e).val(),t)>=0:undefined}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var I=/^key/,z=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,X=/^([^.]*)(?:\.(.+)|)$/;function U(){return!0}function Y(){return!1}function V(){try{return o.activeElement}catch(e){}}x.event={global:{},add:function(e,t,n,i,o){var s,a,u,l,c,p,f,h,d,g,m,y=q.get(e);if(y){n.handler&&(s=n,n=s.handler,o=s.selector),n.guid||(n.guid=x.guid++),(l=y.events)||(l=y.events={}),(a=y.handle)||(a=y.handle=function(e){return typeof x===r||e&&x.event.triggered===e.type?undefined:x.event.dispatch.apply(a.elem,arguments)},a.elem=e),t=(t||"").match(w)||[""],c=t.length;while(c--)u=X.exec(t[c])||[],d=m=u[1],g=(u[2]||"").split(".").sort(),d&&(f=x.event.special[d]||{},d=(o?f.delegateType:f.bindType)||d,f=x.event.special[d]||{},p=x.extend({type:d,origType:m,data:i,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:g.join(".")},s),(h=l[d])||(h=l[d]=[],h.delegateCount=0,f.setup&&f.setup.call(e,i,g,a)!==!1||e.addEventListener&&e.addEventListener(d,a,!1)),f.add&&(f.add.call(e,p),p.handler.guid||(p.handler.guid=n.guid)),o?h.splice(h.delegateCount++,0,p):h.push(p),x.event.global[d]=!0);e=null}},remove:function(e,t,n,r,i){var o,s,a,u,l,c,p,f,h,d,g,m=q.hasData(e)&&q.get(e);if(m&&(u=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(a=X.exec(t[l])||[],h=g=a[1],d=(a[2]||"").split(".").sort(),h){p=x.event.special[h]||{},h=(r?p.delegateType:p.bindType)||h,f=u[h]||[],a=a[2]&&RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;while(o--)c=f[o],!i&&g!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,p.remove&&p.remove.call(e,c));s&&!f.length&&(p.teardown&&p.teardown.call(e,d,m.handle)!==!1||x.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)x.event.remove(e,h+t[l],n,r,!0);x.isEmptyObject(u)&&(delete m.handle,q.remove(e,"events"))}},trigger:function(t,n,r,i){var s,a,u,l,c,p,f,h=[r||o],d=y.call(t,"type")?t.type:t,g=y.call(t,"namespace")?t.namespace.split("."):[];if(a=u=r=r||o,3!==r.nodeType&&8!==r.nodeType&&!_.test(d+x.event.triggered)&&(d.indexOf(".")>=0&&(g=d.split("."),d=g.shift(),g.sort()),c=0>d.indexOf(":")&&"on"+d,t=t[x.expando]?t:new x.Event(d,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=g.join("."),t.namespace_re=t.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=null==n?[t]:x.makeArray(n,[t]),f=x.event.special[d]||{},i||!f.trigger||f.trigger.apply(r,n)!==!1)){if(!i&&!f.noBubble&&!x.isWindow(r)){for(l=f.delegateType||d,_.test(l+d)||(a=a.parentNode);a;a=a.parentNode)h.push(a),u=a;u===(r.ownerDocument||o)&&h.push(u.defaultView||u.parentWindow||e)}s=0;while((a=h[s++])&&!t.isPropagationStopped())t.type=s>1?l:f.bindType||d,p=(q.get(a,"events")||{})[t.type]&&q.get(a,"handle"),p&&p.apply(a,n),p=c&&a[c],p&&x.acceptData(a)&&p.apply&&p.apply(a,n)===!1&&t.preventDefault();return t.type=d,i||t.isDefaultPrevented()||f._default&&f._default.apply(h.pop(),n)!==!1||!x.acceptData(r)||c&&x.isFunction(r[d])&&!x.isWindow(r)&&(u=r[c],u&&(r[c]=null),x.event.triggered=d,r[d](),x.event.triggered=undefined,u&&(r[c]=u)),t.result}},dispatch:function(e){e=x.event.fix(e);var t,n,r,i,o,s=[],a=d.call(arguments),u=(q.get(this,"events")||{})[e.type]||[],l=x.event.special[e.type]||{};if(a[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),t=0;while((i=s[t++])&&!e.isPropagationStopped()){e.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(o.namespace))&&(e.handleObj=o,e.data=o.data,r=((x.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,a),r!==undefined&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,s=[],a=t.delegateCount,u=e.target;if(a&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!==this;u=u.parentNode||this)if(u.disabled!==!0||"click"!==e.type){for(r=[],n=0;a>n;n++)o=t[n],i=o.selector+" ",r[i]===undefined&&(r[i]=o.needsContext?x(i,this).index(u)>=0:x.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&s.push({elem:u,handlers:r})}return t.length>a&&s.push({elem:this,handlers:t.slice(a)}),s},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button;return null==e.pageX&&null!=t.clientX&&(n=e.target.ownerDocument||o,r=n.documentElement,i=n.body,e.pageX=t.clientX+(r&&r.scrollLeft||i&&i.scrollLeft||0)-(r&&r.clientLeft||i&&i.clientLeft||0),e.pageY=t.clientY+(r&&r.scrollTop||i&&i.scrollTop||0)-(r&&r.clientTop||i&&i.clientTop||0)),e.which||s===undefined||(e.which=1&s?1:2&s?3:4&s?2:0),e}},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,s=e,a=this.fixHooks[i];a||(this.fixHooks[i]=a=z.test(i)?this.mouseHooks:I.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new x.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=o),3===e.target.nodeType&&(e.target=e.target.parentNode),a.filter?a.filter(e,s):e},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==V()&&this.focus?(this.focus(),!1):undefined},delegateType:"focusin"},blur:{trigger:function(){return this===V()&&this.blur?(this.blur(),!1):undefined},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&x.nodeName(this,"input")?(this.click(),!1):undefined},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)},x.Event=function(e,t){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.getPreventDefault&&e.getPreventDefault()?U:Y):this.type=e,t&&x.extend(this,t),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,undefined):new x.Event(e,t)},x.Event.prototype={isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=U,e&&e.preventDefault&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=U,e&&e.stopPropagation&&e.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=U,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,t,n,r,i){var o,s;if("object"==typeof e){"string"!=typeof t&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}if(null==n&&null==r?(r=t,n=t=undefined):null==r&&("string"==typeof t?(r=n,n=undefined):(r=n,n=t,t=undefined)),r===!1)r=Y;else if(!r)return this;return 1===i&&(o=r,r=function(e){return x().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=x.guid++)),this.each(function(){x.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,x(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return(t===!1||"function"==typeof t)&&(n=t,t=undefined),n===!1&&(n=Y),this.each(function(){x.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];return n?x.event.trigger(e,t,n,!0):undefined}});var G=/^.[^:#\[\.,]*$/,J=/^(?:parents|prev(?:Until|All))/,Q=x.expr.match.needsContext,K={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){var e=0;for(;n>e;e++)if(x.contains(this,t[e]))return!0})},not:function(e){return this.pushStack(et(this,e||[],!0))},filter:function(e){return this.pushStack(et(this,e||[],!1))},is:function(e){return!!et(this,"string"==typeof e&&Q.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],s=Q.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(s?s.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?g.call(x(e),this[0]):g.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function Z(e,t){while((e=e[t])&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return Z(e,"nextSibling")},prev:function(e){return Z(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return e.contentDocument||x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(K[e]||x.unique(i),J.test(e)&&i.reverse()),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,t,n){var r=[],i=n!==undefined;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&x(e).is(n))break;r.push(e)}return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function et(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(G.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return g.call(t,e)>=0!==n})}var tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,nt=/<([\w:]+)/,rt=/<|&#?\w+;/,it=/<(?:script|style|link)/i,ot=/^(?:checkbox|radio)$/i,st=/checked\s*(?:[^=]|=\s*.checked.)/i,at=/^$|\/(?:java|ecma)script/i,ut=/^true\/(.*)/,lt=/^\s*\s*$/g,ct={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};ct.optgroup=ct.option,ct.tbody=ct.tfoot=ct.colgroup=ct.caption=ct.thead,ct.th=ct.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===undefined?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(mt(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&dt(mt(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++)1===e.nodeType&&(x.cleanData(mt(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!it.test(e)&&!ct[(nt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(tt,"<$1>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(x.cleanData(mt(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=f.apply([],e);var r,i,o,s,a,u,l=0,c=this.length,p=this,h=c-1,d=e[0],g=x.isFunction(d);if(g||!(1>=c||"string"!=typeof d||x.support.checkClone)&&st.test(d))return this.each(function(r){var i=p.eq(r);g&&(e[0]=d.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(r=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),i=r.firstChild,1===r.childNodes.length&&(r=i),i)){for(o=x.map(mt(r,"script"),ft),s=o.length;c>l;l++)a=r,l!==h&&(a=x.clone(a,!0,!0),s&&x.merge(o,mt(a,"script"))),t.call(this[l],a,l);if(s)for(u=o[o.length-1].ownerDocument,x.map(o,ht),l=0;s>l;l++)a=o[l],at.test(a.type||"")&&!q.access(a,"globalEval")&&x.contains(u,a)&&(a.src?x._evalUrl(a.src):x.globalEval(a.textContent.replace(lt,"")))}return this}}),x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=[],i=x(e),o=i.length-1,s=0;for(;o>=s;s++)n=s===o?this:this.clone(!0),x(i[s])[t](n),h.apply(r,n.get());return this.pushStack(r)}}),x.extend({clone:function(e,t,n){var r,i,o,s,a=e.cloneNode(!0),u=x.contains(e.ownerDocument,e);if(!(x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=mt(a),o=mt(e),r=0,i=o.length;i>r;r++)yt(o[r],s[r]);if(t)if(n)for(o=o||mt(e),s=s||mt(a),r=0,i=o.length;i>r;r++)gt(o[r],s[r]);else gt(e,a);return s=mt(a,"script"),s.length>0&&dt(s,!u&&mt(e,"script")),a},buildFragment:function(e,t,n,r){var i,o,s,a,u,l,c=0,p=e.length,f=t.createDocumentFragment(),h=[];for(;p>c;c++)if(i=e[c],i||0===i)if("object"===x.type(i))x.merge(h,i.nodeType?[i]:i);else if(rt.test(i)){o=o||f.appendChild(t.createElement("div")),s=(nt.exec(i)||["",""])[1].toLowerCase(),a=ct[s]||ct._default,o.innerHTML=a[1]+i.replace(tt,"<$1>")+a[2],l=a[0];while(l--)o=o.lastChild;x.merge(h,o.childNodes),o=f.firstChild,o.textContent=""}else h.push(t.createTextNode(i));f.textContent="",c=0;while(i=h[c++])if((!r||-1===x.inArray(i,r))&&(u=x.contains(i.ownerDocument,i),o=mt(f.appendChild(i),"script"),u&&dt(o),n)){l=0;while(i=o[l++])at.test(i.type||"")&&n.push(i)}return f},cleanData:function(e){var t,n,r,i,o,s,a=x.event.special,u=0;for(;(n=e[u])!==undefined;u++){if(F.accepts(n)&&(o=n[q.expando],o&&(t=q.cache[o]))){if(r=Object.keys(t.events||{}),r.length)for(s=0;(i=r[s])!==undefined;s++)a[i]?x.event.remove(n,i):x.removeEvent(n,i,t.handle);q.cache[o]&&delete q.cache[o]}delete L.cache[n[L.expando]]}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}});function pt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function ft(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function ht(e){var t=ut.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function dt(e,t){var n=e.length,r=0;for(;n>r;r++)q.set(e[r],"globalEval",!t||q.get(t[r],"globalEval"))}function gt(e,t){var n,r,i,o,s,a,u,l;if(1===t.nodeType){if(q.hasData(e)&&(o=q.access(e),s=q.set(t,o),l=o.events)){delete s.handle,s.events={};for(i in l)for(n=0,r=l[i].length;r>n;n++)x.event.add(t,i,l[i][n])}L.hasData(e)&&(a=L.access(e),u=x.extend({},a),L.set(t,u))}}function mt(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return t===undefined||t&&x.nodeName(e,t)?x.merge([e],n):n}function yt(e,t){var n=t.nodeName.toLowerCase();"input"===n&&ot.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}x.fn.extend({wrapAll:function(e){var t;return x.isFunction(e)?this.each(function(t){x(this).wrapAll(e.call(this,t))}):(this[0]&&(t=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this)},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var vt,xt,bt=/^(none|table(?!-c[ea]).+)/,wt=/^margin/,Tt=RegExp("^("+b+")(.*)$","i"),Ct=RegExp("^("+b+")(?!px)[a-z%]+$","i"),kt=RegExp("^([+-])=("+b+")","i"),Nt={BODY:"block"},Et={position:"absolute",visibility:"hidden",display:"block"},St={letterSpacing:0,fontWeight:400},jt=["Top","Right","Bottom","Left"],Dt=["Webkit","O","Moz","ms"];function At(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Dt.length;while(i--)if(t=Dt[i]+n,t in e)return t;return r}function Lt(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function qt(t){return e.getComputedStyle(t,null)}function Ht(e,t){var n,r,i,o=[],s=0,a=e.length;for(;a>s;s++)r=e[s],r.style&&(o[s]=q.get(r,"olddisplay"),n=r.style.display,t?(o[s]||"none"!==n||(r.style.display=""),""===r.style.display&&Lt(r)&&(o[s]=q.access(r,"olddisplay",Rt(r.nodeName)))):o[s]||(i=Lt(r),(n&&"none"!==n||!i)&&q.set(r,"olddisplay",i?n:x.css(r,"display"))));for(s=0;a>s;s++)r=e[s],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[s]||"":"none"));return e}x.fn.extend({css:function(e,t){return x.access(this,function(e,t,n){var r,i,o={},s=0;if(x.isArray(t)){for(r=qt(e),i=t.length;i>s;s++)o[t[s]]=x.css(e,t[s],!1,r);return o}return n!==undefined?x.style(e,t,n):x.css(e,t)},e,t,arguments.length>1)},show:function(){return Ht(this,!0)},hide:function(){return Ht(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Lt(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=vt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,s,a=x.camelCase(t),u=e.style;return t=x.cssProps[a]||(x.cssProps[a]=At(u,a)),s=x.cssHooks[t]||x.cssHooks[a],n===undefined?s&&"get"in s&&(i=s.get(e,!1,r))!==undefined?i:u[t]:(o=typeof n,"string"===o&&(i=kt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(x.css(e,t)),o="number"),null==n||"number"===o&&isNaN(n)||("number"!==o||x.cssNumber[a]||(n+="px"),x.support.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&(n=s.set(e,n,r))===undefined||(u[t]=n)),undefined)}},css:function(e,t,n,r){var i,o,s,a=x.camelCase(t);return t=x.cssProps[a]||(x.cssProps[a]=At(e.style,a)),s=x.cssHooks[t]||x.cssHooks[a],s&&"get"in s&&(i=s.get(e,!0,n)),i===undefined&&(i=vt(e,t,r)),"normal"===i&&t in St&&(i=St[t]),""===n||n?(o=parseFloat(i),n===!0||x.isNumeric(o)?o||0:i):i}}),vt=function(e,t,n){var r,i,o,s=n||qt(e),a=s?s.getPropertyValue(t)||s[t]:undefined,u=e.style;return s&&(""!==a||x.contains(e.ownerDocument,e)||(a=x.style(e,t)),Ct.test(a)&&wt.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=s.width,u.width=r,u.minWidth=i,u.maxWidth=o)),a};function Ot(e,t,n){var r=Tt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Ft(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,s=0;for(;4>o;o+=2)"margin"===n&&(s+=x.css(e,n+jt[o],!0,i)),r?("content"===n&&(s-=x.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(s-=x.css(e,"border"+jt[o]+"Width",!0,i))):(s+=x.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(s+=x.css(e,"border"+jt[o]+"Width",!0,i)));return s}function Pt(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=qt(e),s=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=vt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Ct.test(i))return i;r=s&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+Ft(e,t,n||(s?"border":"content"),r,o)+"px"}function Rt(e){var t=o,n=Nt[e];return n||(n=Mt(e,t),"none"!==n&&n||(xt=(xt||x(" + + + diff --git a/esp32_fw/data/index.html b/esp32_fw/data/www/index.html similarity index 95% rename from esp32_fw/data/index.html rename to esp32_fw/data/www/index.html index 9cd7fc7a..5f91685e 100644 --- a/esp32_fw/data/index.html +++ b/esp32_fw/data/www/index.html @@ -7,6 +7,7 @@ Solum - alternative proto AP + @@ -58,6 +59,7 @@
    +
    edit littleFS
    Currently active tags:
    diff --git a/esp32_fw/data/main.css b/esp32_fw/data/www/main.css similarity index 96% rename from esp32_fw/data/main.css rename to esp32_fw/data/www/main.css index 183074a4..1627b3dd 100644 --- a/esp32_fw/data/main.css +++ b/esp32_fw/data/www/main.css @@ -65,16 +65,21 @@ label { flex-wrap: wrap; } +.filebutton { + padding:2px 5px; + background-color: #cccccc; + text-decoration: none; + color: black; +} + +.editbtn { + float:right; +} + .columns div { flex: 1; } -.actionbox div div { - padding: 5px; - margin: 5px; - background-color: white; -} - input { border: solid 1px #666666; padding: 4px; @@ -239,6 +244,9 @@ ul.messages li.new { animation-timing-function: ease-in-out; } +.error { + color: red; +} @media(max-width: 460px) { diff --git a/esp32_fw/data/main.js b/esp32_fw/data/www/main.js similarity index 95% rename from esp32_fw/data/main.js rename to esp32_fw/data/www/main.js index c3e3881b..9d53493c 100644 --- a/esp32_fw/data/main.js +++ b/esp32_fw/data/www/main.js @@ -42,7 +42,10 @@ function connect() { console.log(event.data); const msg = JSON.parse(event.data); if (msg.logMsg) { - showMessage(msg.logMsg); + showMessage(msg.logMsg,false); + } + if (msg.errMsg) { + showMessage(msg.logMsg,true); } if (msg.tags) { processTags(msg.tags); @@ -226,11 +229,15 @@ function contentselected() { }); } -function showMessage(message) { +function showMessage(message,iserr) { const messages = $('#messages'); var date = new Date(), time = date.toLocaleTimeString('en-US', {hour12: false, hour: '2-digit', minute:'2-digit', second:'2-digit'}); - messages.insertAdjacentHTML("afterbegin", '
  • '+htmlEncode(time+' '+message)+'
    • '); + if (iserr) { + messages.insertAdjacentHTML("afterbegin", '
  • ' + htmlEncode(time + ' ' + message) + '
    • '); + } else { + messages.insertAdjacentHTML("afterbegin", '
  • '+htmlEncode(time+' '+message)+'
    • '); + } } function htmlEncode(input) { diff --git a/esp32_fw/include/web.h b/esp32_fw/include/web.h index 7badb987..524234df 100644 --- a/esp32_fw/include/web.h +++ b/esp32_fw/include/web.h @@ -7,7 +7,8 @@ void init_web(); void doImageUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final); extern void webSocketSendProcess(void *parameter); -void wsString(String text); +void wsLog(String text); +void wsErr(String text); void wsSendTaginfo(uint8_t mac[6]); void wsSendSysteminfo(); diff --git a/esp32_fw/src/SPIFFSEditor.cpp b/esp32_fw/src/SPIFFSEditor.cpp index 42e8d375..e301ecbc 100644 --- a/esp32_fw/src/SPIFFSEditor.cpp +++ b/esp32_fw/src/SPIFFSEditor.cpp @@ -2,396 +2,9 @@ #include -// File: edit.htm.gz, Size: 4151 -#define edit_htm_gz_len 4151 -const uint8_t edit_htm_gz[] PROGMEM = { - 0x1F, 0x8B, 0x08, 0x08, 0xB8, 0x94, 0xB1, 0x59, 0x00, 0x03, 0x65, 0x64, 0x69, 0x74, 0x2E, 0x68, - 0x74, 0x6D, 0x00, 0xB5, 0x3A, 0x0B, 0x7B, 0xDA, 0xB8, 0xB2, 0x7F, 0xC5, 0x71, 0xCF, 0x66, 0xED, - 0x83, 0x31, 0x90, 0xA4, 0xD9, 0xD6, 0xC4, 0xC9, 0x42, 0x92, 0x36, 0x6D, 0xF3, 0x6A, 0x80, 0xB6, - 0x69, 0x4F, 0xEE, 0x7E, 0xC2, 0x16, 0xA0, 0xC6, 0x96, 0x5D, 0x5B, 0x0E, 0x49, 0x59, 0xFE, 0xFB, - 0x9D, 0x91, 0x6C, 0xB0, 0x09, 0x69, 0x77, 0xCF, 0xBD, 0xBB, 0xDD, 0x2D, 0x92, 0x46, 0x33, 0x9A, - 0x19, 0xCD, 0x53, 0xDE, 0xBD, 0x8D, 0xA3, 0x8B, 0xC3, 0xFE, 0xF5, 0xE5, 0xB1, 0x36, 0x11, 0x61, - 0xB0, 0xBF, 0x87, 0x7F, 0x6B, 0x01, 0xE1, 0x63, 0x97, 0xF2, 0xFD, 0x3D, 0xC1, 0x44, 0x40, 0xF7, - 0x8F, 0x7B, 0x97, 0xDA, 0xB1, 0xCF, 0x44, 0x94, 0xEC, 0x35, 0xD4, 0xCA, 0x5E, 0x2A, 0x1E, 0x02, - 0xAA, 0x85, 0xD4, 0x67, 0xC4, 0x4D, 0xBD, 0x84, 0xC2, 0x66, 0xDB, 0x0B, 0x67, 0xDF, 0xEB, 0x8C, - 0xFB, 0xF4, 0xDE, 0xD9, 0x6E, 0x36, 0xDB, 0x71, 0x94, 0x32, 0xC1, 0x22, 0xEE, 0x90, 0x61, 0x1A, - 0x05, 0x99, 0xA0, 0xED, 0x80, 0x8E, 0x84, 0xF3, 0x3C, 0xBE, 0x6F, 0x0F, 0xA3, 0xC4, 0xA7, 0x89, - 0xD3, 0x8A, 0xEF, 0x35, 0x00, 0x31, 0x5F, 0x7B, 0xB6, 0xB3, 0xB3, 0xD3, 0x1E, 0x12, 0xEF, 0x76, - 0x9C, 0x44, 0x19, 0xF7, 0xEB, 0x5E, 0x14, 0x44, 0x89, 0xF3, 0x6C, 0xF4, 0x1C, 0xFF, 0xB4, 0x7D, - 0x96, 0xC6, 0x01, 0x79, 0x70, 0x78, 0xC4, 0x29, 0xE0, 0xDE, 0xD7, 0xD3, 0x09, 0xF1, 0xA3, 0xA9, - 0xD3, 0xD4, 0x9A, 0x5A, 0xAB, 0x09, 0x44, 0x92, 0xF1, 0x90, 0x18, 0x4D, 0x0B, 0xFF, 0xD8, 0x3B, - 0x66, 0x7B, 0x14, 0x71, 0x51, 0x4F, 0xD9, 0x77, 0xEA, 0xB4, 0xB6, 0xE0, 0x34, 0x39, 0x1D, 0x91, - 0x90, 0x05, 0x0F, 0x4E, 0x4A, 0x78, 0x5A, 0x4F, 0x69, 0xC2, 0x46, 0x6A, 0x79, 0x4A, 0xD9, 0x78, - 0x22, 0x9C, 0xDF, 0x9A, 0xCD, 0x39, 0xF0, 0xAF, 0x65, 0xC1, 0x2C, 0x60, 0x29, 0x20, 0xA3, 0x78, - 0xEA, 0x3C, 0x11, 0xC5, 0x4E, 0x53, 0xB1, 0xDE, 0x6C, 0x87, 0x24, 0x19, 0x33, 0x0E, 0x83, 0x98, - 0xF8, 0x3E, 0xE3, 0x63, 0x47, 0xA1, 0x05, 0x6C, 0xB6, 0x90, 0x36, 0xA1, 0x01, 0x11, 0xEC, 0x8E, - 0xB6, 0x43, 0xC6, 0xEB, 0x53, 0xE6, 0x8B, 0x89, 0xB3, 0x0B, 0x3C, 0xB6, 0xBD, 0x2C, 0x49, 0x41, - 0xA6, 0x38, 0x62, 0x5C, 0xD0, 0x44, 0xA2, 0xA5, 0x31, 0xE1, 0xB3, 0x5C, 0x54, 0x54, 0x40, 0x21, - 0x27, 0xE3, 0x01, 0xE3, 0xB4, 0x3E, 0x0C, 0x22, 0xEF, 0x76, 0x71, 0xD2, 0x6E, 0x7C, 0x9F, 0x9F, - 0xE5, 0x4C, 0xA2, 0x3B, 0x9A, 0xCC, 0x96, 0xEA, 0x92, 0xD8, 0x15, 0x60, 0x85, 0x34, 0xA5, 0x74, - 0x6E, 0x8B, 0xBB, 0x0C, 0xA0, 0x96, 0xFC, 0x05, 0x29, 0x17, 0xFC, 0x2F, 0x45, 0x5A, 0x11, 0x5C, - 0xA1, 0x30, 0x1E, 0x67, 0x62, 0xF6, 0xF8, 0x2A, 0xA3, 0x98, 0x78, 0x4C, 0x3C, 0xA0, 0xFC, 0xB0, - 0x6D, 0x86, 0xBA, 0x04, 0xAC, 0x24, 0x24, 0x81, 0x86, 0x3A, 0xD7, 0x3E, 0xD0, 0xC4, 0x27, 0x9C, - 0x58, 0x9D, 0x84, 0x91, 0xC0, 0xEA, 0x2D, 0xB5, 0x5E, 0x0F, 0xA3, 0xEF, 0xF5, 0x0C, 0xC6, 0x30, - 0x0F, 0xA8, 0x27, 0x94, 0x92, 0xE1, 0x1E, 0x86, 0xB7, 0x4C, 0x3C, 0x06, 0x3C, 0x5A, 0x28, 0xA9, - 0x4B, 0x2A, 0x69, 0xA2, 0x2E, 0xB0, 0x25, 0xD5, 0x83, 0x1C, 0x4B, 0xC9, 0x95, 0x50, 0xF5, 0x61, - 0x24, 0x44, 0x14, 0x4A, 0x93, 0x5B, 0x08, 0xAC, 0x49, 0xAB, 0x79, 0xF1, 0xE8, 0x46, 0xD6, 0x6B, - 0xBF, 0x44, 0xBE, 0x0D, 0x7A, 0x15, 0xCC, 0x23, 0x41, 0x9D, 0x04, 0x6C, 0xCC, 0x9D, 0x90, 0xF9, - 0x7E, 0x40, 0x4B, 0x56, 0xEB, 0x64, 0x49, 0x60, 0xF8, 0x44, 0x10, 0x87, 0x85, 0x64, 0x4C, 0x1B, - 0x31, 0x1F, 0x03, 0x34, 0xA5, 0xBB, 0x3B, 0x16, 0xFB, 0xD0, 0xBD, 0xB8, 0x9A, 0x36, 0xDF, 0xBD, - 0x1E, 0x47, 0x1D, 0xF8, 0xE7, 0xBC, 0x37, 0x98, 0x1C, 0x0F, 0xC6, 0x30, 0xEA, 0xE2, 0xB4, 0xF3, - 0xFE, 0xB0, 0xF3, 0x1E, 0x7E, 0x0E, 0x5B, 0xB5, 0xAF, 0xA3, 0x6F, 0xB8, 0xD0, 0x7D, 0xED, 0x77, - 0xFB, 0x83, 0xE3, 0x4E, 0xE7, 0x5D, 0xE3, 0xCD, 0xF9, 0xF4, 0xE3, 0xBB, 0x5D, 0x04, 0x77, 0x83, - 0xE6, 0xD5, 0x87, 0x49, 0x73, 0xB0, 0xF5, 0x32, 0xF4, 0x4F, 0xFC, 0x89, 0x17, 0x0E, 0x3A, 0xEF, - 0x3F, 0x5E, 0xDD, 0x5D, 0x87, 0x83, 0x71, 0xEF, 0x63, 0x6B, 0xF2, 0x79, 0xEB, 0x43, 0xEF, 0xF3, - 0xC7, 0x57, 0xB7, 0xF4, 0xD3, 0xC9, 0xDB, 0xCF, 0xFD, 0x29, 0x20, 0x1C, 0x45, 0xBD, 0xC1, 0x55, - 0xF7, 0x43, 0x77, 0xFC, 0xB9, 0xEB, 0x1D, 0xDF, 0x0F, 0x83, 0xF3, 0xEE, 0xEB, 0xCE, 0xB0, 0xB3, - 0xE5, 0x51, 0x3A, 0xEE, 0x5F, 0x75, 0xB3, 0x37, 0xEF, 0x2E, 0xC6, 0x8C, 0x4D, 0x7A, 0x9F, 0xCF, - 0xFB, 0xDE, 0xE1, 0xF3, 0xD3, 0xC1, 0x49, 0x87, 0x4D, 0xCE, 0xDF, 0x5E, 0x35, 0x6F, 0x5F, 0xBF, - 0x3B, 0x3C, 0xF2, 0xAE, 0xDF, 0x5E, 0xEF, 0x1E, 0x6D, 0x37, 0x7E, 0xFB, 0xED, 0xCC, 0xBF, 0x60, - 0xBC, 0x7F, 0xF7, 0xBD, 0x33, 0x3E, 0x9C, 0xBE, 0x78, 0x48, 0xFB, 0x93, 0x37, 0x77, 0xBC, 0xF1, - 0x21, 0xFA, 0xFA, 0xE6, 0xE1, 0x0C, 0xFE, 0xBB, 0xBC, 0xAC, 0x0D, 0x7B, 0xAD, 0x74, 0xF0, 0xFE, - 0xCD, 0x87, 0xAD, 0xF4, 0xE5, 0xF3, 0xB8, 0x7B, 0x74, 0x74, 0x17, 0x0E, 0x2F, 0x1B, 0xA1, 0x7F, - 0x3B, 0x12, 0x2F, 0xB6, 0x45, 0x7C, 0x3D, 0xCE, 0x3E, 0x7F, 0x7B, 0xFE, 0x76, 0xD2, 0xB8, 0xA0, - 0xE4, 0x7A, 0x52, 0x7B, 0xF8, 0xFE, 0xF0, 0x62, 0xD2, 0x3F, 0xB9, 0x3B, 0x0F, 0xC8, 0xFD, 0xF9, - 0xB9, 0xF7, 0x3D, 0xAC, 0x05, 0xE4, 0xE5, 0x45, 0x3F, 0x20, 0x49, 0x6B, 0xE0, 0x77, 0x1A, 0xB5, - 0xC3, 0xAD, 0xCE, 0x8E, 0x48, 0xAE, 0x0E, 0xF9, 0xD1, 0xF6, 0xD7, 0xDE, 0x8B, 0x6E, 0xB7, 0x15, - 0x0D, 0xBF, 0x6D, 0xBD, 0xBE, 0xDD, 0x7D, 0x3D, 0xD8, 0x7D, 0x3F, 0x7C, 0xDF, 0xE9, 0xED, 0x74, - 0x07, 0xE4, 0xBA, 0xF7, 0xBE, 0x33, 0xDA, 0x19, 0x4E, 0x26, 0xEF, 0xDE, 0xF5, 0x5F, 0xF9, 0x9D, - 0xEF, 0x49, 0xE7, 0x62, 0xDA, 0xB9, 0x3F, 0x1E, 0x74, 0x4E, 0x6A, 0xEF, 0x8E, 0xCF, 0x9A, 0xAD, - 0xDE, 0xF5, 0xF6, 0xF8, 0x6C, 0x77, 0xDA, 0x4D, 0x8F, 0x3B, 0xEF, 0xBB, 0xCD, 0xF1, 0xDB, 0x5A, - 0x48, 0x3E, 0x47, 0x87, 0xDB, 0xE3, 0x37, 0xBB, 0xEC, 0xF2, 0x9A, 0x74, 0xDE, 0x74, 0xDF, 0xA6, - 0xEC, 0x2A, 0x3C, 0x19, 0x34, 0x3B, 0x9D, 0xD3, 0x0B, 0xFA, 0xEA, 0x70, 0x9B, 0xBC, 0xDB, 0xF2, - 0x3E, 0x82, 0xFE, 0x07, 0x9F, 0xE8, 0x6F, 0xB5, 0xCE, 0xF4, 0xA2, 0x19, 0x78, 0x2F, 0x69, 0xFF, - 0xE4, 0xBA, 0x2F, 0x6F, 0xE7, 0x38, 0x78, 0xD5, 0xBF, 0xED, 0x65, 0xEF, 0xC3, 0xC3, 0x43, 0x53, - 0xE3, 0x51, 0x3D, 0xA1, 0x31, 0x25, 0xA2, 0x1C, 0xAE, 0x16, 0xFE, 0x01, 0xB6, 0xB5, 0xB4, 0xC2, - 0xDC, 0x4F, 0x05, 0xBD, 0x17, 0x75, 0x9F, 0x7A, 0x51, 0x42, 0xE4, 0x1E, 0x40, 0xA0, 0x09, 0x9A, - 0xD8, 0xFC, 0x77, 0x19, 0x3F, 0x35, 0x15, 0x3F, 0x35, 0xC2, 0x7D, 0xCD, 0x28, 0x1C, 0x01, 0x83, - 0x87, 0x4F, 0xEF, 0x98, 0x47, 0xEB, 0x31, 0xBB, 0xA7, 0x41, 0x5D, 0x22, 0x3B, 0x4D, 0x73, 0x26, - 0xFD, 0xAD, 0xD8, 0x46, 0x38, 0x98, 0x9A, 0xA4, 0x5A, 0x2C, 0xF8, 0x5F, 0x89, 0x47, 0x21, 0xB0, - 0x81, 0xCB, 0x84, 0xF8, 0xAB, 0x7C, 0x27, 0x4A, 0xEA, 0xC3, 0x6C, 0x3C, 0x62, 0xF7, 0xE0, 0xD0, - 0x23, 0xC6, 0x99, 0xA0, 0x5A, 0x2B, 0x9D, 0xFF, 0x5E, 0x90, 0xB9, 0xA5, 0x0F, 0xA3, 0x84, 0x84, - 0x34, 0xD5, 0xFE, 0x22, 0x99, 0xD9, 0x28, 0x89, 0xC2, 0x65, 0x10, 0x99, 0x8B, 0xA8, 0x34, 0x99, - 0xCF, 0x9F, 0x65, 0x71, 0x10, 0x11, 0x10, 0x73, 0x4D, 0xE4, 0x50, 0xF1, 0x34, 0x91, 0x6E, 0xB5, - 0x88, 0xAB, 0xB9, 0x9B, 0x6D, 0xA1, 0x5B, 0x96, 0xDD, 0x7A, 0x6B, 0x67, 0xE9, 0xBA, 0x75, 0xB9, - 0x17, 0xE3, 0xFD, 0x9A, 0x4C, 0x81, 0xF1, 0xA0, 0x14, 0xEE, 0x9E, 0x09, 0x50, 0xE9, 0x13, 0x87, - 0xCB, 0x43, 0xF2, 0xC8, 0xB0, 0x60, 0x40, 0x05, 0xEA, 0x96, 0x8C, 0xD4, 0x85, 0x24, 0xB0, 0x6F, - 0xFE, 0x8C, 0xCA, 0xBC, 0x67, 0x3D, 0x8B, 0x13, 0xB8, 0x0D, 0x3A, 0xFD, 0x11, 0xCD, 0x42, 0xA6, - 0x2A, 0x6D, 0x45, 0x53, 0x65, 0xBC, 0x5C, 0x84, 0x65, 0xDA, 0x93, 0xBC, 0x16, 0xA4, 0x1F, 0x4B, - 0x05, 0xE0, 0x05, 0x37, 0xCF, 0x91, 0x9B, 0x1F, 0x6A, 0x75, 0x7B, 0xF7, 0x97, 0x9C, 0x87, 0x9D, - 0xE6, 0x2F, 0x73, 0x3B, 0xDF, 0x5B, 0xA4, 0xE4, 0x56, 0x13, 0xFE, 0x29, 0x32, 0xEF, 0x8B, 0x25, - 0x0B, 0xC3, 0xE7, 0xF8, 0xA7, 0x60, 0x10, 0xE9, 0x94, 0x80, 0xDB, 0x3B, 0x2F, 0x5F, 0xF8, 0xC3, - 0x02, 0x98, 0x0B, 0xF6, 0x24, 0x3C, 0x21, 0x3E, 0xCB, 0x52, 0xE7, 0x79, 0xF3, 0x97, 0x5C, 0x9F, - 0x5B, 0x3B, 0x28, 0xFB, 0xE2, 0x2E, 0x71, 0xB2, 0xB4, 0xD8, 0x34, 0x66, 0x5C, 0xDB, 0x4A, 0x35, - 0xBC, 0x6F, 0x92, 0x2C, 0x0C, 0xB3, 0x92, 0xED, 0xE7, 0xBF, 0x2F, 0x4D, 0x13, 0xF7, 0xCF, 0x9A, - 0xBF, 0xCC, 0x44, 0x02, 0xD9, 0x64, 0x04, 0xB9, 0xC6, 0x49, 0x22, 0x41, 0x04, 0x35, 0x9A, 0xE6, - 0x1C, 0x84, 0x5B, 0x03, 0xD8, 0xDE, 0x6D, 0xFA, 0x74, 0x6C, 0xCE, 0xE7, 0x7B, 0x0D, 0x99, 0xD7, - 0xA0, 0x6C, 0xF1, 0x12, 0x16, 0x8B, 0xFD, 0x51, 0xC6, 0x3D, 0xE4, 0x41, 0x1B, 0x53, 0x83, 0x9A, - 0xB3, 0x84, 0x8A, 0x2C, 0xE1, 0x9A, 0x1F, 0x79, 0x19, 0x1A, 0xBB, 0x3D, 0xA6, 0xE2, 0x58, 0xD9, - 0x7D, 0xF7, 0xE1, 0x8D, 0x0F, 0x3B, 0xE6, 0x0B, 0x04, 0x6F, 0x2D, 0x02, 0x38, 0x30, 0x9C, 0x97, - 0xE3, 0x54, 0xF6, 0x43, 0x82, 0x01, 0x22, 0xEF, 0xE8, 0x83, 0x41, 0x2D, 0xB1, 0x40, 0xA4, 0x36, - 0xAE, 0x1B, 0xC5, 0x2E, 0x80, 0x71, 0x73, 0x76, 0x07, 0x4A, 0x20, 0x2E, 0xFD, 0x22, 0x6E, 0x2C, - 0xE6, 0x72, 0xF8, 0x69, 0xE7, 0xBB, 0xC9, 0x1E, 0x3B, 0xA8, 0xB7, 0x1C, 0xB2, 0xCF, 0x0E, 0x5A, - 0xE0, 0x5E, 0x65, 0x6E, 0xE4, 0xB9, 0xAF, 0x58, 0x40, 0x07, 0xB9, 0xC3, 0xE1, 0x31, 0x48, 0x6C, - 0xB1, 0x85, 0x28, 0xE2, 0x5B, 0xCD, 0xE6, 0x86, 0x4B, 0x0F, 0x48, 0x00, 0x39, 0xCC, 0xD0, 0x8F, - 0xAF, 0xAE, 0x2E, 0xAE, 0xBE, 0xE8, 0x35, 0x5A, 0xD3, 0x6F, 0x1C, 0x4D, 0xAF, 0x71, 0xD3, 0x11, - 0x76, 0x42, 0x47, 0x09, 0x4D, 0x27, 0x97, 0x44, 0x4C, 0x8C, 0xD4, 0xBE, 0x23, 0x41, 0x56, 0x16, - 0x84, 0xA1, 0xDC, 0xC8, 0xA2, 0x70, 0x39, 0x9D, 0x6A, 0xAF, 0x40, 0xCD, 0x47, 0x90, 0xEA, 0xDA, - 0xC2, 0x26, 0x71, 0x4C, 0xB9, 0x6F, 0xE8, 0x31, 0x20, 0xEA, 0x16, 0x35, 0xAD, 0x84, 0x7E, 0xCB, - 0x68, 0x2A, 0x52, 0x1B, 0x2C, 0xD7, 0xD0, 0x2F, 0x07, 0x7D, 0xDD, 0xD2, 0x1B, 0xE8, 0x47, 0x3A, - 0xF0, 0x46, 0xCC, 0x39, 0x52, 0x89, 0x5C, 0xD0, 0xA4, 0x3E, 0xCC, 0xC0, 0xA0, 0xB8, 0x6E, 0xB6, - 0x23, 0x9B, 0x71, 0x4E, 0x93, 0x93, 0xFE, 0xD9, 0xA9, 0xAB, 0x5F, 0x29, 0x46, 0xB4, 0x53, 0x28, - 0x48, 0x74, 0x4B, 0x5E, 0x51, 0x7E, 0xC8, 0xE1, 0x84, 0x05, 0xBE, 0x11, 0x99, 0x6D, 0x24, 0xE1, - 0x49, 0x12, 0xB2, 0x40, 0x01, 0x0A, 0x9E, 0x2D, 0x1E, 0x62, 0xEA, 0xEA, 0x23, 0x50, 0x86, 0x6E, - 0x79, 0x76, 0x98, 0x05, 0x82, 0xC5, 0x01, 0x75, 0x37, 0x5A, 0x30, 0xE3, 0x60, 0x41, 0xAE, 0x8E, - 0xB9, 0x19, 0x61, 0xCC, 0x77, 0x75, 0x15, 0xA1, 0xF2, 0xB8, 0xB6, 0xEE, 0x14, 0x4F, 0x9D, 0x92, - 0x56, 0x4E, 0x49, 0xCB, 0xB8, 0x4A, 0xE0, 0x34, 0x3F, 0x18, 0xC3, 0x3C, 0xCE, 0xD4, 0x51, 0x05, - 0xCC, 0xA7, 0x23, 0x02, 0x9C, 0x7C, 0x40, 0x6D, 0xBA, 0x7A, 0x63, 0xDD, 0x41, 0xA9, 0x3A, 0xC8, - 0xAF, 0x6A, 0xC4, 0x2F, 0x6B, 0x44, 0xDD, 0xEE, 0x3A, 0x64, 0x5F, 0x21, 0x07, 0x55, 0xE4, 0xA0, - 0x8C, 0x7C, 0x28, 0x8D, 0x64, 0x1D, 0x72, 0xA0, 0x90, 0x93, 0x8A, 0x88, 0x89, 0x14, 0x51, 0x85, - 0xBD, 0x3A, 0x6A, 0x13, 0x05, 0xD2, 0xAD, 0xA4, 0x22, 0x66, 0x62, 0x83, 0x97, 0x92, 0x61, 0x40, - 0x7D, 0x77, 0xA3, 0x09, 0x33, 0x2C, 0xB6, 0xDD, 0xAD, 0xE6, 0x9A, 0x33, 0x12, 0x75, 0x46, 0x56, - 0x65, 0x30, 0x2B, 0x33, 0xA8, 0xF5, 0xC8, 0x1D, 0xD5, 0xD6, 0x31, 0x98, 0x99, 0x56, 0x60, 0x47, - 0xDC, 0x0B, 0x98, 0x77, 0xEB, 0x2E, 0xBD, 0xC5, 0x9C, 0xB1, 0x85, 0x85, 0x5A, 0x5C, 0x06, 0xBA, - 0x01, 0x94, 0x5E, 0x8B, 0xA5, 0x7C, 0x80, 0xFA, 0x9E, 0x5B, 0xD9, 0x5A, 0x02, 0xDC, 0xA6, 0xF7, - 0xD4, 0x3B, 0x8C, 0xC2, 0x90, 0xA0, 0xED, 0xA6, 0xC0, 0x41, 0x3E, 0xD1, 0xCD, 0xB9, 0x15, 0xAD, - 0xC5, 0x79, 0xC2, 0x45, 0x2C, 0x7F, 0x3D, 0x8B, 0x23, 0x03, 0x5C, 0xCE, 0xF5, 0x6C, 0xD4, 0x61, - 0x6A, 0x83, 0x1E, 0xC7, 0x62, 0xF2, 0x13, 0x17, 0x2A, 0x0C, 0x54, 0xA2, 0x7C, 0x69, 0xDE, 0x58, - 0x0B, 0x91, 0x56, 0x7C, 0xEA, 0xA2, 0xB7, 0xE2, 0x54, 0xA8, 0xBC, 0x8A, 0x5D, 0x9A, 0x4B, 0x1D, - 0x94, 0x61, 0xB9, 0xBD, 0x2F, 0xA0, 0xFA, 0x7C, 0x0E, 0xE7, 0x01, 0xFF, 0x13, 0x68, 0xF9, 0xE8, - 0x5F, 0x17, 0x60, 0xC9, 0xA3, 0x34, 0x78, 0x8B, 0xBB, 0x0D, 0xE3, 0xC0, 0xF9, 0x8F, 0x6D, 0x7C, - 0xF9, 0x1F, 0xFB, 0xA6, 0x66, 0x9A, 0x07, 0xFF, 0x6A, 0x48, 0x0D, 0x1B, 0xC2, 0xFC, 0xD2, 0xBA, - 0xB1, 0x08, 0x80, 0xED, 0x7F, 0x9B, 0xFF, 0xB1, 0x25, 0xB8, 0x02, 0x6B, 0xDF, 0x45, 0x90, 0x49, - 0xF0, 0x24, 0x34, 0xB0, 0x68, 0xA4, 0x91, 0xCD, 0x4D, 0x43, 0xB8, 0xA4, 0x72, 0x8D, 0x35, 0x51, - 0xD3, 0x6D, 0x88, 0x53, 0x50, 0x5B, 0xAC, 0x04, 0xBF, 0x3E, 0x24, 0x7A, 0x15, 0x5B, 0x17, 0x00, - 0xC9, 0x3D, 0xCA, 0x0C, 0x3D, 0x22, 0x97, 0x52, 0xCB, 0x0C, 0x02, 0x42, 0xA7, 0x89, 0xE7, 0x2A, - 0xAD, 0x1D, 0x14, 0x30, 0x17, 0xA2, 0xE0, 0xBC, 0x1C, 0x2D, 0x15, 0xEA, 0xAA, 0xFD, 0x17, 0x0A, - 0xA3, 0xD6, 0x12, 0x8A, 0x04, 0x31, 0xAD, 0xD8, 0x79, 0xC6, 0x72, 0x75, 0x4C, 0x59, 0xBA, 0x35, - 0x59, 0x5D, 0x96, 0xAD, 0x04, 0xAE, 0x2F, 0x8D, 0xFE, 0xD7, 0x3D, 0x16, 0x8E, 0xB5, 0x12, 0x3F, - 0xF8, 0x97, 0xFB, 0x2B, 0x46, 0xE4, 0xCD, 0x3F, 0xBC, 0x21, 0x70, 0x05, 0xA6, 0x41, 0x6D, 0x1E, - 0x4D, 0x0D, 0xB3, 0xF6, 0xAB, 0xAE, 0x49, 0x8A, 0xAE, 0x1E, 0x92, 0xFB, 0xBC, 0xA7, 0xC4, 0x8C, - 0xD7, 0xD6, 0x70, 0x5E, 0xB4, 0x28, 0xF9, 0x82, 0xEC, 0xE6, 0x48, 0x26, 0xA2, 0xB6, 0x56, 0x64, - 0x52, 0xD5, 0xCA, 0xE8, 0x5A, 0x63, 0xFF, 0xD7, 0x4A, 0x40, 0xB7, 0x98, 0xBA, 0x4E, 0x15, 0x8C, - 0xB3, 0x00, 0x1C, 0x93, 0x3E, 0x1D, 0x69, 0x03, 0x26, 0x03, 0x75, 0x35, 0x46, 0x5A, 0x81, 0xC1, - 0xCC, 0x03, 0xC3, 0x2B, 0xFB, 0xF3, 0x1E, 0x16, 0xBF, 0xFB, 0x97, 0xAA, 0xAA, 0x81, 0xD4, 0x8B, - 0x33, 0x5D, 0x59, 0x59, 0xD5, 0x4B, 0xE0, 0xD2, 0x08, 0xA0, 0x5B, 0x8B, 0x3C, 0x3A, 0x8C, 0xFC, - 0x87, 0x52, 0xF6, 0x4D, 0xBB, 0x0F, 0x87, 0x01, 0x49, 0xD3, 0x73, 0xB8, 0x01, 0x43, 0xF7, 0x42, - 0x50, 0xB8, 0xB2, 0xC2, 0xFD, 0xE6, 0xE6, 0x66, 0x15, 0x29, 0xA1, 0x21, 0x14, 0xDB, 0x8A, 0x2B, - 0xF0, 0x49, 0xD3, 0xF1, 0x81, 0x30, 0x18, 0xD2, 0x1A, 0xC6, 0xF0, 0x25, 0xE3, 0x47, 0x5C, 0x71, - 0xF4, 0xF4, 0x22, 0xA6, 0xFC, 0x33, 0xDC, 0x95, 0x32, 0xCB, 0x1A, 0xAD, 0xA6, 0x68, 0xFA, 0x8F, - 0xD8, 0x3E, 0xCA, 0x0D, 0x76, 0xC1, 0x7A, 0xBA, 0x56, 0xA1, 0xFC, 0x9F, 0x61, 0xB9, 0x94, 0x28, - 0xD6, 0x70, 0x9C, 0x40, 0x80, 0x5A, 0xC3, 0x31, 0xC4, 0x1A, 0x41, 0x17, 0xFC, 0x26, 0x6B, 0xF9, - 0xCD, 0xFE, 0x19, 0x7E, 0x97, 0x76, 0x1E, 0x15, 0x25, 0x91, 0xAA, 0xAF, 0x50, 0x02, 0x9F, 0xDD, - 0xE9, 0xA6, 0x15, 0xB9, 0x55, 0x0A, 0x50, 0x1B, 0x46, 0x41, 0xD0, 0x8F, 0xE2, 0x83, 0x27, 0xD6, - 0x9D, 0xC5, 0x7A, 0x31, 0xC8, 0xD9, 0x5C, 0x6E, 0xB1, 0xBC, 0xB5, 0x44, 0x4F, 0xA1, 0xEC, 0x5F, - 0x4B, 0x15, 0x01, 0x3F, 0x23, 0x8B, 0x7B, 0xAC, 0xD4, 0xA5, 0x36, 0x28, 0x0F, 0x56, 0x3F, 0xD5, - 0x3C, 0xCB, 0x5F, 0xCC, 0xAE, 0x6B, 0x51, 0x9B, 0xC0, 0x38, 0x57, 0x92, 0x8B, 0x4A, 0xB2, 0xC8, - 0x13, 0x01, 0xA8, 0x58, 0xC7, 0x2E, 0xC4, 0x4D, 0x6B, 0x7A, 0x7C, 0xBF, 0x5C, 0x83, 0xC2, 0xDF, - 0xF5, 0xD5, 0x12, 0x33, 0x08, 0xC4, 0xD3, 0x95, 0x4B, 0x29, 0x5F, 0x37, 0x29, 0x8A, 0x0E, 0x62, - 0x47, 0xA3, 0x51, 0x4A, 0xC5, 0x47, 0x0C, 0x49, 0x56, 0xB2, 0x98, 0x9F, 0xC8, 0x90, 0x04, 0x8C, - 0x45, 0x3C, 0x8C, 0xB2, 0x94, 0x46, 0x99, 0xA8, 0xA4, 0x16, 0x63, 0x21, 0xCC, 0x5E, 0xFA, 0xE7, - 0x9F, 0x8B, 0xC9, 0x7E, 0x5A, 0x0B, 0x96, 0xD3, 0xEB, 0x3D, 0xBF, 0x34, 0xD9, 0xF7, 0x6B, 0x89, - 0xB9, 0x7A, 0xE9, 0xFF, 0x67, 0x4B, 0x21, 0x65, 0x4B, 0xF1, 0xB0, 0x54, 0x2E, 0x62, 0x62, 0x29, - 0xE6, 0xC9, 0x82, 0x91, 0x97, 0x7C, 0x16, 0x0D, 0x1A, 0x2B, 0x25, 0x55, 0x9E, 0x97, 0x7D, 0x95, - 0x43, 0x40, 0x59, 0x71, 0xE5, 0x35, 0x11, 0x06, 0x34, 0xE0, 0x63, 0x64, 0xF2, 0x41, 0xEB, 0xA7, - 0xD1, 0x94, 0x26, 0x87, 0x24, 0xA5, 0x06, 0x24, 0xCD, 0x65, 0xDC, 0x41, 0xA8, 0xE9, 0x04, 0xEB, - 0x76, 0x6D, 0x6E, 0x12, 0x05, 0xCE, 0x33, 0x77, 0xC4, 0xB1, 0x26, 0x03, 0xF9, 0xB2, 0xCA, 0x09, - 0xD4, 0xC6, 0xBE, 0x12, 0xA4, 0x3E, 0x52, 0x25, 0xA8, 0x61, 0x5A, 0xD0, 0x76, 0xC0, 0x35, 0x5F, - 0x26, 0x51, 0x4C, 0xC6, 0xB2, 0x07, 0x83, 0x35, 0x74, 0x0F, 0xA4, 0x66, 0x6D, 0x34, 0x91, 0x60, - 0xA9, 0x73, 0x29, 0xFC, 0x66, 0xD9, 0xC2, 0x70, 0x4B, 0x57, 0xC9, 0xB0, 0xBD, 0xF4, 0xA5, 0x35, - 0x59, 0x83, 0xE0, 0x0B, 0x6C, 0x62, 0xE0, 0x1E, 0x68, 0x64, 0xF2, 0x7B, 0x00, 0x77, 0x6B, 0xB6, - 0xA3, 0x3D, 0xD6, 0x8E, 0x6A, 0x35, 0x53, 0x55, 0xE9, 0xAE, 0x0B, 0x6D, 0x4E, 0x74, 0x23, 0x0B, - 0x4B, 0x10, 0xAA, 0x9A, 0x59, 0x0C, 0x38, 0x1B, 0x81, 0xAA, 0xBA, 0xC0, 0x11, 0xD6, 0x98, 0x66, - 0xA9, 0x23, 0xF1, 0x97, 0x1D, 0xC9, 0x13, 0xB5, 0x07, 0x95, 0xF5, 0x05, 0xD4, 0x31, 0xAB, 0x25, - 0x86, 0x30, 0xD3, 0x29, 0x13, 0xDE, 0x04, 0x03, 0x90, 0x07, 0x5A, 0xD5, 0x05, 0x14, 0xB5, 0x8E, - 0x1C, 0x4D, 0x44, 0xB8, 0x1C, 0x05, 0xF9, 0xF0, 0x6B, 0x9A, 0x0F, 0xBC, 0xB4, 0x18, 0xDD, 0x97, - 0x80, 0x50, 0xD2, 0xE6, 0xE0, 0x88, 0x8F, 0xF2, 0x21, 0xF4, 0xB2, 0x05, 0x9D, 0x02, 0x58, 0xFC, - 0xC6, 0x71, 0x3E, 0x8A, 0x27, 0xC5, 0x68, 0x42, 0xEF, 0x17, 0x78, 0x51, 0x01, 0xF5, 0xA9, 0xEE, - 0x28, 0x1B, 0xDB, 0x68, 0xCE, 0xF3, 0x41, 0x6B, 0x29, 0x7F, 0xF0, 0xFF, 0x28, 0x7F, 0xCC, 0xC7, - 0x85, 0x34, 0x71, 0x31, 0x1A, 0xB3, 0x42, 0x96, 0x61, 0x18, 0xFF, 0x90, 0x93, 0xA4, 0xD4, 0x13, - 0x97, 0x7A, 0x5A, 0xF1, 0xB3, 0xB6, 0x53, 0x98, 0x8E, 0x31, 0xAA, 0xF8, 0xE3, 0xC8, 0xF6, 0xF0, - 0xF7, 0x3C, 0xF2, 0x65, 0x6D, 0x69, 0x5A, 0xA1, 0x31, 0x82, 0x3A, 0x57, 0x37, 0xCB, 0x7E, 0x9A, - 0xFD, 0xB7, 0xAD, 0xE8, 0xD1, 0xF1, 0xE9, 0x71, 0xFF, 0xB8, 0x5C, 0x38, 0x23, 0xE7, 0x25, 0x93, - 0x8A, 0x2B, 0x5D, 0xFA, 0xB2, 0x22, 0x80, 0x02, 0x1B, 0x45, 0x01, 0x7B, 0xDD, 0xDC, 0x54, 0x7E, - 0xF1, 0xB6, 0x77, 0x71, 0x6E, 0xC7, 0x24, 0x01, 0x8F, 0x24, 0x15, 0xE6, 0xC2, 0x82, 0x44, 0xF9, - 0xE0, 0xD7, 0xC7, 0xA5, 0x72, 0x5D, 0x7E, 0x61, 0x70, 0xC4, 0xDC, 0x52, 0xA7, 0xA9, 0x7E, 0x78, - 0xE2, 0x62, 0x5D, 0x99, 0xBF, 0x04, 0x41, 0x72, 0x1A, 0x2D, 0x13, 0x55, 0x11, 0x67, 0x46, 0xE5, - 0x30, 0x2F, 0xEE, 0xB2, 0x75, 0x0D, 0xD3, 0xC8, 0xB4, 0xC4, 0x84, 0xA5, 0xE5, 0x46, 0xA5, 0x12, - 0x14, 0xFE, 0xA2, 0xB6, 0xE7, 0x8B, 0x91, 0x24, 0xB7, 0x5A, 0x73, 0xAB, 0x6F, 0x41, 0x2A, 0x3E, - 0x58, 0x04, 0x23, 0x66, 0x39, 0xDB, 0x16, 0x77, 0xA3, 0x43, 0xEE, 0x61, 0x5C, 0x7F, 0xBA, 0x35, - 0x78, 0xD2, 0x3C, 0x79, 0x61, 0x9E, 0xFC, 0xB1, 0x7B, 0x2E, 0x1C, 0x45, 0xF9, 0xDA, 0xE2, 0x98, - 0xF6, 0x10, 0x58, 0xBB, 0x6D, 0x2F, 0x7D, 0x18, 0x20, 0xD2, 0x83, 0xCB, 0x00, 0xF4, 0x63, 0x58, - 0xFF, 0x4A, 0xEE, 0x88, 0x7A, 0x09, 0xAA, 0xA2, 0xAD, 0x73, 0x54, 0xD8, 0xEE, 0xFD, 0x81, 0xA3, - 0xF2, 0xCE, 0x65, 0x18, 0x48, 0x97, 0xC3, 0x92, 0x37, 0x8B, 0x75, 0xC1, 0x61, 0x19, 0x31, 0x64, - 0x6C, 0x00, 0xE3, 0xCD, 0x5D, 0x49, 0x13, 0xD5, 0x1C, 0xB4, 0xF0, 0x1B, 0x08, 0x8A, 0x4F, 0x39, - 0xCE, 0x9A, 0x38, 0xAD, 0x62, 0x72, 0xC5, 0x23, 0xC8, 0x4A, 0x67, 0x89, 0xC0, 0x6E, 0x10, 0x0D, - 0x0D, 0x7C, 0x64, 0x9A, 0xA1, 0xB6, 0x1D, 0x3E, 0x37, 0xD7, 0xBC, 0xD9, 0x54, 0xFA, 0x4B, 0x62, - 0x79, 0xD5, 0xB0, 0x8B, 0x1C, 0x56, 0xCC, 0x75, 0x7D, 0x1F, 0xF4, 0xA3, 0x4E, 0x29, 0xAF, 0x48, - 0xA4, 0x53, 0xD1, 0x83, 0xC4, 0x86, 0xA2, 0x41, 0xBE, 0x91, 0x40, 0x44, 0x72, 0x4A, 0x33, 0x5D, - 0xC7, 0xCA, 0xD2, 0x0B, 0x28, 0x49, 0x7A, 0xB2, 0x73, 0x95, 0x49, 0x6B, 0x25, 0x06, 0xFE, 0xC8, - 0xD7, 0xF0, 0xC7, 0xA1, 0xD0, 0xA3, 0x83, 0x9B, 0x49, 0x2B, 0x83, 0xA4, 0x23, 0x64, 0x83, 0xA9, - 0x37, 0xE4, 0xBB, 0xA8, 0x2D, 0x2F, 0xCB, 0xB4, 0x16, 0x50, 0x70, 0x71, 0x83, 0xBB, 0x11, 0x30, - 0x52, 0x5A, 0xC4, 0x9E, 0x94, 0xA8, 0xC7, 0x8F, 0x10, 0x1F, 0x53, 0x4A, 0x20, 0x06, 0x20, 0xA6, - 0x40, 0xD0, 0xA7, 0x42, 0x8A, 0x54, 0xE6, 0x92, 0x53, 0x2A, 0x20, 0xCA, 0x48, 0xCD, 0xE2, 0xC1, - 0x85, 0x78, 0xD4, 0x46, 0xD6, 0x80, 0xFD, 0xDC, 0xBD, 0x73, 0x33, 0xDE, 0x90, 0x68, 0x09, 0x56, - 0x36, 0x3D, 0x9A, 0xA6, 0x52, 0x5C, 0x54, 0xC7, 0x19, 0xF8, 0xA8, 0xA1, 0x03, 0x5A, 0x23, 0x84, - 0x11, 0x1E, 0x84, 0x8A, 0x01, 0x40, 0x7F, 0x42, 0xC3, 0x1C, 0x22, 0x70, 0x08, 0x20, 0x82, 0xA0, - 0x7F, 0x49, 0x0D, 0xF7, 0x64, 0x05, 0xC9, 0xF8, 0xD8, 0x6D, 0x35, 0xF0, 0x9D, 0x66, 0x95, 0xEC, - 0x20, 0xA5, 0xBD, 0x68, 0x24, 0xFA, 0x64, 0x98, 0x1A, 0x50, 0x00, 0xAC, 0xD9, 0x01, 0xA0, 0x1E, - 0x24, 0x5E, 0x63, 0x2B, 0x3F, 0xEF, 0x04, 0x2A, 0xBB, 0x00, 0xAB, 0xBB, 0x8E, 0x87, 0x5F, 0x39, - 0x4F, 0x19, 0xA7, 0x39, 0x26, 0x00, 0x7B, 0x93, 0x68, 0x7A, 0x99, 0x30, 0x2E, 0xCE, 0x64, 0x1B, - 0x6A, 0x6C, 0xB4, 0xE4, 0xF5, 0xA9, 0x87, 0x15, 0x79, 0x3F, 0xC5, 0x8B, 0xCB, 0x0C, 0xF3, 0xBA, - 0x53, 0x79, 0x77, 0xB1, 0x86, 0x70, 0x21, 0x50, 0x66, 0x38, 0xB3, 0x29, 0x74, 0xB0, 0xFA, 0xA1, - 0x48, 0x82, 0x7A, 0x4F, 0xB7, 0x42, 0xE2, 0xC1, 0x44, 0xED, 0x81, 0xF9, 0xDC, 0xC2, 0xD8, 0xE1, - 0x94, 0x83, 0x5A, 0x0A, 0xB5, 0x02, 0x45, 0xC6, 0x95, 0xCD, 0x98, 0x35, 0x1D, 0x6A, 0x58, 0x88, - 0x61, 0xE0, 0xAF, 0xFE, 0x05, 0x0F, 0x1E, 0x1C, 0xC8, 0x55, 0x3F, 0xE1, 0x23, 0xE3, 0x7E, 0xF4, - 0x23, 0x3E, 0x3E, 0xAF, 0xF0, 0xF1, 0x79, 0x1D, 0x1F, 0xB4, 0xAA, 0x3C, 0x98, 0x0C, 0x80, 0xEC, - 0x19, 0xE1, 0x64, 0x4C, 0x13, 0x58, 0xC0, 0x43, 0x50, 0x25, 0x7F, 0x8B, 0xB3, 0x84, 0xFE, 0x98, - 0xB3, 0xDE, 0x84, 0x8D, 0xC4, 0x23, 0xFE, 0x8A, 0xD5, 0xFF, 0x82, 0x4B, 0x3C, 0x70, 0x3D, 0x97, - 0x79, 0x6D, 0x5A, 0x49, 0x28, 0x3F, 0x7E, 0x2B, 0x91, 0x7E, 0xE4, 0x42, 0x78, 0xA9, 0x38, 0xC8, - 0xDF, 0xB7, 0xF4, 0x00, 0xBC, 0x11, 0xF8, 0x29, 0x35, 0x75, 0xBC, 0x0B, 0xA5, 0xFC, 0x29, 0x30, - 0x64, 0xA8, 0xC0, 0x47, 0xDD, 0xD9, 0xDC, 0x12, 0xAE, 0x01, 0x8A, 0xF1, 0xA3, 0x29, 0xB0, 0xEA, - 0xC9, 0x02, 0xD7, 0x9E, 0x40, 0x26, 0x04, 0x91, 0xE0, 0x48, 0xC8, 0xA7, 0x8D, 0x2F, 0x07, 0x9B, - 0x37, 0x35, 0xC8, 0x43, 0x2E, 0xFC, 0x98, 0x2E, 0x0C, 0x36, 0x6F, 0xFE, 0x6D, 0x36, 0xC6, 0xCC, - 0x5A, 0x76, 0xA4, 0x96, 0x4C, 0xF6, 0xF4, 0x0B, 0xBF, 0x71, 0x09, 0x48, 0x5D, 0x49, 0x78, 0x45, - 0x34, 0x03, 0x6B, 0x43, 0x61, 0xE1, 0x07, 0xFF, 0x47, 0x09, 0xF8, 0x91, 0x9E, 0x07, 0xCE, 0xBD, - 0xE6, 0x3D, 0x5E, 0x2F, 0x3E, 0x85, 0xE9, 0x56, 0xE9, 0xC1, 0x4A, 0xC7, 0xEF, 0x53, 0x3A, 0x76, - 0x59, 0xA2, 0x14, 0x4A, 0x14, 0x59, 0x88, 0x1A, 0x6A, 0x50, 0x0E, 0x51, 0x98, 0x89, 0x17, 0xCD, - 0x81, 0x02, 0x9B, 0x73, 0x34, 0x5B, 0x3A, 0x02, 0x0F, 0xF4, 0xF5, 0x45, 0xEE, 0xFC, 0x74, 0x76, - 0x7A, 0x22, 0x44, 0x7C, 0xA5, 0x62, 0x22, 0xD0, 0xAA, 0x2E, 0x2C, 0x2F, 0xCF, 0x9C, 0x89, 0xE4, - 0xA1, 0x28, 0x75, 0x30, 0x31, 0x28, 0x87, 0xFE, 0x74, 0x31, 0xFC, 0x0A, 0x71, 0xD6, 0xD0, 0xCF, - 0x52, 0x48, 0x58, 0x5B, 0x36, 0xA2, 0xF7, 0xFB, 0x97, 0xF6, 0xAE, 0xDD, 0x84, 0xBA, 0x00, 0xB4, - 0x0A, 0x69, 0x19, 0xEE, 0x7D, 0xFE, 0xB7, 0x90, 0xB7, 0xFF, 0x1E, 0x32, 0x83, 0xA8, 0x95, 0x42, - 0x58, 0x2A, 0xF0, 0xAB, 0xB8, 0x93, 0x24, 0x9A, 0x4A, 0xB4, 0xE3, 0x24, 0xC1, 0x4B, 0xE9, 0x43, - 0x85, 0xA2, 0x0D, 0x61, 0x31, 0xA5, 0x89, 0xE6, 0x47, 0x34, 0xD5, 0x78, 0x24, 0xB4, 0x34, 0x8B, - 0x63, 0x68, 0x5C, 0x56, 0xF4, 0x61, 0xEB, 0xC5, 0xEB, 0xCB, 0xFB, 0x8C, 0x66, 0xD4, 0xCF, 0x97, - 0x69, 0x52, 0xD1, 0x0B, 0x56, 0x50, 0xDF, 0x10, 0xEE, 0x7E, 0xB9, 0xC9, 0xEB, 0xA9, 0x8C, 0x73, - 0x8C, 0xA2, 0x1B, 0x2D, 0x35, 0x07, 0xE9, 0x26, 0x40, 0xD5, 0xE5, 0x59, 0x10, 0xCC, 0xDB, 0x2B, - 0xB4, 0xA0, 0xF1, 0x8A, 0x44, 0x24, 0x9F, 0xCB, 0x67, 0x7F, 0xE4, 0xC9, 0xA9, 0xE2, 0x82, 0x50, - 0xF2, 0x54, 0xA9, 0x36, 0xAD, 0x0D, 0x63, 0x83, 0x6A, 0x8C, 0xA7, 0x82, 0x70, 0x0F, 0xAF, 0x51, - 0xE9, 0xC2, 0x2C, 0x6A, 0x29, 0xDC, 0xDE, 0x46, 0x5F, 0xCB, 0x6D, 0xE9, 0x89, 0x7C, 0x2A, 0x25, - 0xE3, 0xAE, 0xAE, 0x63, 0x55, 0x45, 0xB1, 0x3E, 0x25, 0x61, 0x5A, 0x26, 0x5B, 0x54, 0x06, 0x26, - 0x77, 0x0B, 0x70, 0x9B, 0x06, 0x29, 0x1C, 0xBD, 0x7E, 0x7F, 0xCE, 0x46, 0xD1, 0xCE, 0x11, 0x80, - 0x69, 0xC5, 0x3E, 0x93, 0xD7, 0xE0, 0x24, 0xCC, 0x73, 0x07, 0x32, 0xE9, 0x4A, 0x03, 0x0E, 0xA9, - 0x98, 0x44, 0xFE, 0x81, 0x7E, 0xA0, 0x3B, 0x3A, 0xFC, 0xBB, 0x09, 0x35, 0x47, 0xCD, 0xA5, 0xD0, - 0xA4, 0xFA, 0x74, 0x70, 0xF5, 0x06, 0xC2, 0x53, 0x0C, 0xA5, 0x01, 0x17, 0x50, 0x34, 0xD7, 0x74, - 0x7C, 0x7A, 0x7D, 0x0C, 0x29, 0xC8, 0x7F, 0x21, 0x37, 0x66, 0xBB, 0xAA, 0x6C, 0xB8, 0xF3, 0xEA, - 0x75, 0x56, 0x2E, 0x03, 0x7A, 0x61, 0x8C, 0x58, 0x0F, 0x29, 0x7E, 0xFB, 0x7B, 0xF4, 0x9E, 0x8D, - 0x15, 0xD2, 0x6A, 0x5D, 0x6F, 0xCE, 0x76, 0x90, 0x67, 0x89, 0xD5, 0x43, 0x2C, 0x70, 0x97, 0x1F, - 0x29, 0x59, 0x95, 0x35, 0xDC, 0xF6, 0x48, 0x10, 0xE0, 0xC7, 0x5A, 0x03, 0x1B, 0x6A, 0x22, 0xB2, - 0xD4, 0x42, 0x22, 0x29, 0x08, 0x90, 0xD2, 0x3E, 0x84, 0x39, 0xD3, 0x92, 0x65, 0x86, 0xB2, 0xA1, - 0xBC, 0xFF, 0xC5, 0x9A, 0xA3, 0x64, 0x46, 0xE8, 0xCE, 0xF9, 0x6C, 0x73, 0x53, 0xD8, 0x85, 0x99, - 0x18, 0x05, 0x52, 0x8A, 0x01, 0x1C, 0x9A, 0x7D, 0x68, 0x2D, 0x8C, 0xB2, 0x90, 0x58, 0xAB, 0x3D, - 0xD2, 0xB6, 0x51, 0x55, 0x03, 0x54, 0x7C, 0x46, 0x01, 0x03, 0xCE, 0xB2, 0x24, 0x80, 0xA8, 0x8B, - 0x39, 0xBA, 0xB2, 0x2D, 0xC5, 0xBA, 0xD0, 0x84, 0x0E, 0xEC, 0x67, 0xC8, 0x12, 0x95, 0x97, 0xAD, - 0xA2, 0x27, 0x12, 0xC5, 0x77, 0x95, 0x9E, 0xC8, 0x6F, 0xE5, 0x84, 0xAA, 0xC8, 0x77, 0x88, 0x2F, - 0x13, 0x5C, 0xD4, 0xD1, 0x13, 0xA0, 0x24, 0x83, 0x52, 0x34, 0x60, 0x2A, 0x2C, 0x37, 0xEE, 0xEB, - 0xD3, 0xE9, 0xB4, 0x8E, 0xDF, 0x6A, 0xEB, 0x70, 0x82, 0xB2, 0x02, 0x5F, 0x5F, 0xC7, 0x21, 0x47, - 0x15, 0x58, 0xF8, 0x6E, 0xE1, 0xAC, 0xBA, 0xE8, 0x42, 0x7F, 0x2B, 0xDE, 0xD4, 0xAA, 0xD2, 0x59, - 0xE1, 0x73, 0x79, 0xDB, 0x7B, 0x3B, 0x2B, 0x20, 0x32, 0xC4, 0xAF, 0xB2, 0x90, 0x69, 0x20, 0x0D, - 0x3B, 0xE5, 0x46, 0x56, 0x25, 0x85, 0x65, 0x5C, 0xB0, 0xE3, 0x2C, 0x9D, 0x18, 0x33, 0x60, 0xDD, - 0x11, 0x96, 0xD2, 0x95, 0x43, 0x2D, 0x65, 0xB7, 0x0E, 0xB7, 0x0A, 0xFB, 0x70, 0x30, 0x83, 0x94, - 0x79, 0xFB, 0xF3, 0x4F, 0x39, 0x5B, 0xDE, 0xF6, 0x92, 0x62, 0x71, 0xE1, 0xF3, 0xFC, 0xA9, 0x35, - 0xAF, 0x69, 0xA5, 0xD1, 0xAF, 0xC4, 0x97, 0xBD, 0x46, 0xFE, 0x19, 0x3B, 0xFF, 0x9C, 0xAD, 0x81, - 0xB1, 0x43, 0x23, 0x2A, 0xDC, 0x4C, 0x8C, 0xEA, 0x2F, 0x34, 0xE6, 0x63, 0x79, 0x29, 0xBF, 0x2D, - 0xA0, 0x54, 0xA9, 0xD3, 0x68, 0x78, 0x3E, 0xFF, 0x9A, 0x42, 0x19, 0x1D, 0x65, 0xFE, 0x28, 0x20, - 0x09, 0xC5, 0x82, 0xA3, 0x41, 0xBE, 0x92, 0xFB, 0x46, 0xC0, 0x86, 0x69, 0x03, 0x93, 0x6D, 0xCB, - 0xDE, 0xB2, 0x77, 0x71, 0x64, 0x7F, 0x4D, 0xF7, 0x57, 0x4F, 0xD8, 0x5F, 0x34, 0x69, 0x58, 0x0B, - 0xE7, 0xB5, 0xAB, 0x8A, 0x4D, 0x6A, 0x83, 0xFB, 0xC4, 0xA7, 0x70, 0x3D, 0x6F, 0xB3, 0xCC, 0xB6, - 0x1A, 0xE4, 0x5F, 0x60, 0xD4, 0x31, 0xBA, 0x95, 0x2F, 0x92, 0xF4, 0x81, 0x7B, 0x18, 0x5B, 0x17, - 0x54, 0x26, 0x70, 0x49, 0xD5, 0x87, 0x34, 0xB9, 0xD3, 0x9C, 0x2F, 0x39, 0xC3, 0xB7, 0x3C, 0xA8, - 0x03, 0xE4, 0x37, 0x9C, 0x72, 0x39, 0xB0, 0xBF, 0x07, 0x5D, 0x33, 0x2A, 0x41, 0x79, 0xB1, 0x26, - 0x9B, 0xE6, 0x7C, 0x02, 0x82, 0x01, 0x70, 0xB1, 0xA3, 0x48, 0xCD, 0x2B, 0xCB, 0x98, 0x9B, 0x57, - 0x96, 0x54, 0xE2, 0x5F, 0x59, 0xCC, 0xDB, 0x9F, 0xFC, 0xDB, 0x4C, 0xF9, 0x7F, 0x5B, 0x28, 0x36, - 0x32, 0xF9, 0xE1, 0x09, 0xF7, 0x56, 0x3F, 0x45, 0xAD, 0x47, 0x51, 0xBB, 0xF7, 0xFF, 0x17, 0x53, - 0xE8, 0x9D, 0x36, 0x92, 0x29, 0x00, 0x00}; - #define SPIFFS_MAXLENGTH_FILEPATH 32 -const char *excludeListFile = "/.exclude.files"; -typedef struct ExcludeListS { - char *item; - ExcludeListS *next; -} ExcludeList; - -static ExcludeList *excludes = NULL; - -static bool matchWild(const char *pattern, const char *testee) { - const char *nxPat = NULL; - const char *nxTst = NULL; - - while (*testee) { - if ((*pattern == '?') || (*pattern == *testee)) { - ++pattern; - ++testee; - continue; - } - if (*pattern == '*') { - nxPat = pattern++; - nxTst = testee; - continue; - } - if (nxPat) { - pattern = nxPat + 1; - testee = ++nxTst; - continue; - } - return false; - } - while (*pattern == '*') { - ++pattern; - } - return (*pattern == 0); -} - -static bool addExclude(const char *item) { - size_t len = strlen(item); - if (!len) { - return false; - } - ExcludeList *e = (ExcludeList *)malloc(sizeof(ExcludeList)); - if (!e) { - return false; - } - e->item = (char *)malloc(len + 1); - if (!e->item) { - free(e); - return false; - } - memcpy(e->item, item, len + 1); - e->next = excludes; - excludes = e; - return true; -} - -static void loadExcludeList(fs::FS &_fs, const char *filename) { - static char linebuf[SPIFFS_MAXLENGTH_FILEPATH]; - fs::File excludeFile; - if (filename[0] != '/') { - excludeFile = _fs.open("/" + ((String)filename), "r"); - } else { - excludeFile = _fs.open(filename, "r"); - } - if (!excludeFile) { - // addExclude("/*.js.gz"); - return; - } -#ifdef ESP32 - if (excludeFile.isDirectory()) { - excludeFile.close(); - return; - } -#endif - if (excludeFile.size() > 0) { - uint8_t idx; - bool isOverflowed = false; - while (excludeFile.available()) { - linebuf[0] = '\0'; - idx = 0; - int lastChar; - do { - lastChar = excludeFile.read(); - if (lastChar != '\r') { - linebuf[idx++] = (char)lastChar; - } - } while ((lastChar >= 0) && (lastChar != '\n') && (idx < SPIFFS_MAXLENGTH_FILEPATH)); - - if (isOverflowed) { - isOverflowed = (lastChar != '\n'); - continue; - } - isOverflowed = (idx >= SPIFFS_MAXLENGTH_FILEPATH); - linebuf[idx - 1] = '\0'; - if (!addExclude(linebuf)) { - excludeFile.close(); - return; - } - } - } - excludeFile.close(); -} - -static bool isExcluded(fs::FS &_fs, const char *filename) { - if (excludes == NULL) { - loadExcludeList(_fs, excludeListFile); - } - ExcludeList *e = excludes; - while (e) { - if (matchWild(e->item, filename)) { - return true; - } - e = e->next; - } - return false; -} - -// WEB HANDLER IMPLEMENTATION - -#ifdef ESP32 SPIFFSEditor::SPIFFSEditor(const fs::FS &fs, const String &username, const String &password) -#else -SPIFFSEditor::SPIFFSEditor(const String &username, const String &password, const fs::FS &fs) -#endif : _fs(fs), _username(username), _password(password), _authenticated(false), _startTime(0) { } @@ -406,24 +19,20 @@ bool SPIFFSEditor::canHandle(AsyncWebServerRequest *request) { if (!request->_tempFile) { return false; } -#ifdef ESP32 if (request->_tempFile.isDirectory()) { request->_tempFile.close(); return false; } -#endif } if (request->hasParam("download")) { request->_tempFile = _fs.open("/" + request->arg("download"), "r"); if (!request->_tempFile) { return false; } -#ifdef ESP32 if (request->_tempFile.isDirectory()) { request->_tempFile.close(); return false; } -#endif } request->addInterestingHeader("If-Modified-Since"); return true; @@ -442,46 +51,22 @@ void SPIFFSEditor::handleRequest(AsyncWebServerRequest *request) { if (request->method() == HTTP_GET) { if (request->hasParam("list")) { const String path = request->getParam("list")->value(); -#ifdef ESP32 + File dir = _fs.open(path); -#else - Dir dir = _fs.openDir(path); -#endif String output = "["; -#ifdef ESP32 File file = dir.openNextFile(); while (file) { -#else - while (dir.next()) { - fs::File entry = dir.openFile("r"); -#endif - if (isExcluded(_fs, file.name())) { -#ifdef ESP32 - file = dir.openNextFile(); -#endif - continue; - } if (output != "[") { output += ','; } - output += "{\"type\":\""; - output += "file"; - output += "\",\"name\":\""; - output += file.name(); - output += "\",\"size\":"; - output += file.size(); - output += ",\"ver\":"; - output += file.getLastWrite(); - output += "}"; -#ifdef ESP32 + if (file.isDirectory()) { + output += "{\"type\":\"dir\",\"name\":\"" + String(file.name()) + "\",\"size\":" + file.size() + "}"; + } else { + output += "{\"type\":\"file\",\"name\":\"" + String(file.name()) + "\",\"size\":" + file.size() + "}"; + } file = dir.openNextFile(); -#else - file.close(); -#endif } -#ifdef ESP32 dir.close(); -#endif output += "]"; request->send(200, "application/json", output); } else if (request->hasParam("edit") || request->hasParam("download")) { @@ -491,8 +76,7 @@ void SPIFFSEditor::handleRequest(AsyncWebServerRequest *request) { if (request->header("If-Modified-Since").equals(buildTime)) { request->send(304); } else { - AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", edit_htm_gz, edit_htm_gz_len); - response->addHeader("Content-Encoding", "gzip"); + AsyncWebServerResponse *response = request->beginResponse(_fs, "/www/edit.html"); response->addHeader("Last-Modified", buildTime); request->send(response); } diff --git a/esp32_fw/src/contentmanager.cpp b/esp32_fw/src/contentmanager.cpp index 32970c2f..25bf46df 100644 --- a/esp32_fw/src/contentmanager.cpp +++ b/esp32_fw/src/contentmanager.cpp @@ -56,7 +56,7 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { deserializeJson(doc, taginfo->modeConfigJson); JsonObject cfgobj = doc.as(); - Serial.println("Updating " + dst + " mode " + String(taginfo->contentMode) + " nextupdate " + String(taginfo->nextupdate)); + wsLog("Updating " + dst + " mode " + String(taginfo->contentMode)); taginfo->nextupdate = now + 600; switch (taginfo->contentMode) { @@ -67,7 +67,7 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { if (prepareDataAvail(&filename, DATATYPE_IMGRAW, mac, cfgobj["timetolive"].as())) { cfgobj["#fetched"] = true; } else { - wsString("Error accessing " + filename); + wsErr("Error accessing " + filename); } taginfo->nextupdate = 3216153600; } @@ -75,9 +75,7 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { case Today: - Serial.println("heap voor drawDate: " + String(ESP.getFreeHeap())); drawDate(filename); - Serial.println("heap na drawDate: " + String(ESP.getFreeHeap())); // updateTagImage(filename, mac, (midnight - now) / 60 - 10); updateTagImage(filename, mac, 60); taginfo->nextupdate = midnight; @@ -86,10 +84,8 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { case CountDays: if (buttonPressed) cfgobj["counter"] = 0; - Serial.println("heap voor drawnumber: " + String(ESP.getFreeHeap())); drawNumber(filename, (int32_t)cfgobj["counter"], (int32_t)cfgobj["thresholdred"]); - Serial.println("heap na drawnumber: " + String(ESP.getFreeHeap())); - updateTagImage(filename, mac, 60); + updateTagImage(filename, mac, (buttonPressed?0:60)); cfgobj["counter"] = (int32_t)cfgobj["counter"] + 1; taginfo->nextupdate = midnight; break; @@ -97,12 +93,10 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { case CountHours: if (buttonPressed) cfgobj["counter"] = 0; - Serial.println("heap voor drawnumber: " + String(ESP.getFreeHeap())); drawNumber(filename, (int32_t)cfgobj["counter"], (int32_t)cfgobj["thresholdred"]); - Serial.println("heap na drawnumber: " + String(ESP.getFreeHeap())); // updateTagImage(&filename, mac, (3600 - now % 3600) / 60); // taginfo->nextupdate = now + 3600 - (now % 3600); - updateTagImage(filename, mac, 3); + updateTagImage(filename, mac, (buttonPressed?0:3)); cfgobj["counter"] = (int32_t)cfgobj["counter"] + 1; taginfo->nextupdate = now + 300; break; @@ -119,7 +113,7 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { if (prepareDataAvail(&filename, DATATYPE_UPDATE, mac, cfgobj["timetolive"].as())) { cfgobj["#fetched"] = true; } else { - wsString("Error accessing " + filename); + wsErr("Error accessing " + filename); } cfgobj["filename"]=""; taginfo->nextupdate = 3216153600; @@ -166,15 +160,15 @@ void drawDate(String &filename) { long w = 296, h = 128; // mag staand of liggend spr.createSprite(w, h); if (spr.getPointer() == nullptr) { - Serial.println("Failed to create sprite in drawDate"); + wsErr("Failed to create sprite in drawDate"); } spr.setColorDepth(8); spr.fillSprite(TFT_WHITE); spr.setTextDatum(TC_DATUM); - spr.loadFont("calibrib62", LittleFS); + spr.loadFont("fonts/calibrib62", LittleFS); spr.setTextColor(TFT_RED, TFT_WHITE); spr.drawString(Dag[timeinfo.tm_wday], w / 2, 10); - spr.loadFont("calibrib50", LittleFS); + spr.loadFont("fonts/calibrib50", LittleFS); spr.setTextColor(TFT_BLACK, TFT_WHITE); spr.drawString(String(timeinfo.tm_mday) + " " + Maand[timeinfo.tm_mon], w / 2, 73); spr.unloadFont(); @@ -192,7 +186,7 @@ void drawNumber(String &filename, int32_t count, int32_t thresholdred) { long w = 296, h = 128; spr.createSprite(w, h); if (spr.getPointer() == nullptr) { - Serial.println("Failed to create sprite in drawNumber"); + wsErr("Failed to create sprite in drawNumber"); } spr.setColorDepth(8); spr.fillSprite(TFT_WHITE); @@ -202,9 +196,9 @@ void drawNumber(String &filename, int32_t count, int32_t thresholdred) { } else { spr.setTextColor(TFT_BLACK, TFT_WHITE); } - String font = "numbers1-2"; - if (count>999) font="numbers2-2"; - if (count>9999) font="numbers3-2"; + String font = "fonts/numbers1-2"; + if (count > 999) font = "fonts/numbers2-2"; + if (count > 9999) font = "fonts/numbers3-2"; spr.loadFont(font, LittleFS); spr.drawString(String(count), w/2, h/2+10); spr.unloadFont(); @@ -233,7 +227,11 @@ bool getImgURL(String &filename, String URL, time_t fetched) { jpg2grays(filename, filename); } } else { - Serial.println("http " + String(httpCode)); + if (httpCode!=304) { + wsErr("http " + URL + " " + String(httpCode)); + } else { + wsLog("http " + URL + " " + String(httpCode)); + } } http.end(); return (httpCode == 200); diff --git a/esp32_fw/src/main.cpp b/esp32_fw/src/main.cpp index e46ea598..f9552de1 100644 --- a/esp32_fw/src/main.cpp +++ b/esp32_fw/src/main.cpp @@ -35,7 +35,7 @@ void setup() { // https://github.com/nayarsystems/posix_tz_db/blob/master/zones.csv init_web(); - loadDB("/tagDB.json"); + loadDB("/current/tagDB.json"); xTaskCreate(timeTask, "timed tasks", 10000, NULL, 2, NULL); xTaskCreate(zbsRxTask, "zbsRX Process", 10000, NULL, 2, NULL); diff --git a/esp32_fw/src/makeimage.cpp b/esp32_fw/src/makeimage.cpp index 7d23a013..1d6762db 100644 --- a/esp32_fw/src/makeimage.cpp +++ b/esp32_fw/src/makeimage.cpp @@ -4,6 +4,7 @@ #include #include #include +#include TFT_eSPI tft = TFT_eSPI(); TFT_eSprite spr = TFT_eSprite(&tft); @@ -22,7 +23,7 @@ void jpg2grays(String filein, String fileout) { spr.createSprite(w, h); if (spr.getPointer() == nullptr) { - Serial.println("Failed to create sprite in jpg2grays"); + wsErr("Failed to create sprite in jpg2grays"); } spr.setColorDepth(8); spr.fillSprite(TFT_WHITE); diff --git a/esp32_fw/src/newproto.cpp b/esp32_fw/src/newproto.cpp index 76fbfd40..727fc0d2 100644 --- a/esp32_fw/src/newproto.cpp +++ b/esp32_fw/src/newproto.cpp @@ -71,12 +71,11 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t if (hdr.width == 296 && hdr.height == 128) { //sorry, can't rotate Serial.println("when using BMP files, remember to only use 128px width and 296px height"); - wsString("when using BMP files, remember to only use 128px width and 296px height"); + wsErr("when using BMP files, remember to only use 128px width and 296px height"); return false; } if (hdr.sig[0] == 'B' && hdr.sig[1] == 'M' && hdr.bpp == 24) { Serial.println("converting 24bpp bmp to grays"); - wsString("converting 24bpp bmp to grays"); char fileout[64]; sprintf(fileout, "/temp/%02X%02X%02X%02X%02X%02X.bmp\0", dst[5], dst[4], dst[3], dst[2], dst[1], dst[0]); bmp2grays(*filename,(String)fileout); @@ -88,7 +87,6 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t if (filename->endsWith(".jpg") || filename->endsWith(".JPG")) { Serial.println("converting jpg to grays"); - wsString("converting jpg to grays"); char fileout[64]; sprintf(fileout, "/temp/%02X%02X%02X%02X%02X%02X.bmp\0", dst[5], dst[4], dst[3], dst[2], dst[1], dst[0]); jpg2grays(*filename, (String)fileout); @@ -114,7 +112,7 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t taginfo = tagRecord::findByMAC(mac); if (taginfo != nullptr) { if (memcmp(md5bytes, taginfo->md5pending, 16) == 0) { - wsString("new image is the same as current image. not updating tag."); + Serial.println("new image is the same as current image. not updating tag."); wsSendTaginfo(mac); return false; } @@ -156,7 +154,7 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t } dstfile.close(); - wsString("new image pending: " + String(dst_path)); + wsLog("new image pending: " + String(dst_path)); if (taginfo != nullptr) { taginfo->pending = true; taginfo->CheckinInMinPending = nextCheckin + 1; @@ -164,7 +162,7 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t } } else { - Serial.println("firmware upload pending"); + wsLog("firmware upload pending"); } file.close(); @@ -211,7 +209,7 @@ void processBlockRequest(struct espBlockRequest* br) { sendBlock(pd->data + (br->blockId * BLOCK_DATA_SIZE), len); char buffer[64]; sprintf(buffer, "< Block Request received for MD5 %llu, block %d\n\0", br->ver, br->blockId); - wsString((String)buffer); + wsLog((String)buffer); Serial.printf("blockId); } @@ -220,7 +218,7 @@ void processXferComplete(struct espXferComplete* xfc) { uint8_t src[8]; *((uint64_t*)src) = swap64(*((uint64_t*)xfc->src)); sprintf(buffer, "< %02X%02X%02X%02X%02X%02X reports xfer complete\n\0", src[2], src[3], src[4], src[5], src[6], src[7]); - wsString((String)buffer); + wsLog((String)buffer); Serial.print(buffer); uint8_t mac[6]; memcpy(mac, src + 2, sizeof(mac)); @@ -275,6 +273,5 @@ void processDataReq(struct espAvailDataReq* eadr) { sprintf(buffer, "", 4) == 0) { Serial.print(">SYNC BURST\n"); - wsString(">SYNC BURST"); RXState = ZBS_RX_WAIT_HEADER; } if (strncmp(cmdbuffer, "XFC>", 4) == 0) { diff --git a/esp32_fw/src/web.cpp b/esp32_fw/src/web.cpp index 5b8618a3..1f4514d4 100644 --- a/esp32_fw/src/web.cpp +++ b/esp32_fw/src/web.cpp @@ -143,7 +143,7 @@ void onEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType } } -void wsString(String text) { +void wsLog(String text) { DynamicJsonDocument doc(100); doc["logMsg"] = text; xSemaphoreTake(wsMutex, portMAX_DELAY); @@ -151,6 +151,14 @@ void wsString(String text) { xSemaphoreGive(wsMutex); } +void wsErr(String text) { + DynamicJsonDocument doc(100); + doc["errMsg"] = text; + xSemaphoreTake(wsMutex, portMAX_DELAY); + ws.textAll(doc.as()); + xSemaphoreGive(wsMutex); +} + void wsSendSysteminfo() { DynamicJsonDocument doc(250); JsonObject sys = doc.createNestedObject("sys"); @@ -181,11 +189,6 @@ void wsSendTaginfo(uint8_t mac[6]) { void init_web() { LittleFS.begin(true); - if (!LittleFS.exists("/.exclude.files")) { - Serial.println("littlefs exclude.files aanmaken"); - File f = LittleFS.open("/.exclude.files", "w"); - f.close(); - } if (!LittleFS.exists("/current")) { LittleFS.mkdir("/current"); } @@ -214,8 +217,9 @@ void init_web() { ESP.restart(); }); - server.serveStatic("/", LittleFS, "/").setDefaultFile("index.htm"); - + server.serveStatic("/current", LittleFS, "/current/"); + server.serveStatic("/", LittleFS, "/www/").setDefaultFile("index.html"); + server.on( "/imgupload", HTTP_POST, [](AsyncWebServerRequest *request) { request->send(200); @@ -282,7 +286,7 @@ void init_web() { taginfo->model = atoi(request->getParam("model", true)->value().c_str()); taginfo->nextupdate = 0; wsSendTaginfo(mac); - saveDB("/tagDB.json"); + saveDB("/current/tagDB.json"); request->send(200, "text/plain", "Ok, saved"); } else { request->send(200, "text/plain", "Error while saving: mac not found");