From 3fe091a31fcabea1646b7622e43411d214f80156 Mon Sep 17 00:00:00 2001 From: schneider Date: Sun, 18 Dec 2011 21:57:17 +0100 Subject: [PATCH 01/24] added nokia 1600 code from the_nihilant --- firmware/lcd/display.c | 304 +++++++++++++++++++---------------------- firmware/lcd/display.h | 2 +- firmware/lcd/image.c | 2 +- 3 files changed, 144 insertions(+), 164 deletions(-) diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c index 12c86d5..4fc3da3 100644 --- a/firmware/lcd/display.c +++ b/firmware/lcd/display.c @@ -10,7 +10,9 @@ #include "usb/usbmsc.h" -#undef N1600 +#define DISPLAY_UNKNOWN 0 +#define DISPLAY_N1200 1 +#define DISPLAY_N1600 2 /**************************************************************************/ /* Utility routines to manage nokia display */ @@ -19,6 +21,7 @@ uint8_t lcdBuffer[RESX*RESY_B]; uint32_t intstatus; // Caches USB interrupt state // (need to disable MSC while displaying) +uint8_t displayType; #define TYPE_CMD 0 #define TYPE_DATA 1 @@ -125,6 +128,8 @@ uint8_t lcdRead(uint8_t data) void lcdInit(void) { + int id1,id2,id3,id4; + sspInit(0, sspClockPolarity_Low, sspClockPhase_RisingEdge); gpioSetValue(RB_LCD_CS, 1); @@ -139,8 +144,17 @@ void lcdInit(void) { gpioSetValue(RB_LCD_RST, 1); delayms(100); - lcd_select(); + id1=lcdRead(128+64+16+8 +2 ); // it will screw up everything.. better do it before anything else --the_nihilant + id2=lcdRead(128+64+16+8 +2+1); // .. but after the code above! --the_nihilant + // id3=lcdRead(128+64+16+8+4 ); // id1 and id2 are enough for most screens + // id4=lcdRead(128+64+16+8+4 +1); // id3 and id4 would only use up PRECIOUS SPACE --the_nihilant + lcd_select(); + + if((id1==69)&&(id2==214))displayType=DISPLAY_N1600; + //if((id1==254)&&(id2==2))displayType=DISPLAY_N1200; + else displayType=DISPLAY_N1200; // unknown displays are treated like N1200s anyway, this saves an if (PRECIOUS SPACE) --the_nihilant + /* Small Nokia 1200 LCD docs: * clear/ set * on 0xae / 0xaf @@ -154,93 +168,64 @@ void lcdInit(void) { * 0xd0+x black lines from top? (-0xdf?) * */ -#ifndef N1600 - lcdWrite(TYPE_CMD,0xE2); - delayms(5); - uint8_t initseq[] = {0xAF, // Display ON - 0xA1, // Mirror-X - 0xA4, 0x2F, 0xB0, 0x10}; - int i = 0; - while(i> 1; + } } -#else - lcdWrite(TYPE_CMD,0x29); //display on - - lcdWrite(TYPE_CMD,0xBA); //data order - lcdWrite(TYPE_DATA,0x07); - lcdWrite(TYPE_DATA,0x15); - - lcdWrite(TYPE_CMD,0x25); //contrast... again? - lcdWrite(TYPE_DATA,0x3f); - - lcdWrite(TYPE_CMD,0x11); //Sleepout - lcdWrite(TYPE_CMD,0x13); //display mode normal - - lcdWrite(TYPE_CMD,0X37); //vscroll addr - lcdWrite(TYPE_DATA,0x00); - - lcdWrite(TYPE_CMD,0x3A); // COLMOD pixel format 4=12, 5=16, 6=18 - lcdWrite(TYPE_DATA,0x05); - - lcdWrite(TYPE_CMD,0x2A); //no clue... I think it's setting up the size of the display? - lcdWrite(TYPE_DATA,0); - lcdWrite(TYPE_DATA,98-1); //98 = width - - lcdWrite(TYPE_CMD,0x2B); - lcdWrite(TYPE_DATA,0); - lcdWrite(TYPE_DATA,70-1); //70 = height -#endif -#endif - /* - uint16_t i; - for(i=0; i<100; i++) - lcdWrite(TYPE_DATA,0x00); - */ lcd_deselect(); } void lcdFill(char f){ - int x; + // using memset saves 4 bytes compared with the loop! + memset(lcdBuffer,f,RESX*RESY_B); +/* int x; for(x=0;x=0 && x=0 && y < RESY) lcdSetPixel(x, y, f); -} +}*/ void lcdSetPixel(char x, char y, bool f){ if (x<0 || x> RESX || y<0 || y > RESY) @@ -263,86 +248,81 @@ bool lcdGetPixel(char x, char y){ return byte & (1 << y_off); } + +static void _helper_pixel16(uint16_t color){ // putting this here saves a few bytes overall --the_nihilant + lcdWrite(TYPE_DATA,color>>8); + lcdWrite(TYPE_DATA,color&0xFF); +} + +static void _helper_hline(uint16_t color){ // same for this --the_nihilant + for(int cx=0;cx<98;cx++) _helper_pixel16(color); +} + #define THECOLOR_R 0x0 -#define THECOLOR_G 0x80 +#define THECOLOR_G 0x60 #define THECOLOR_B 0x0 void lcdDisplay(void) { char byte; lcd_select(); -#ifndef N1600 - lcdWrite(TYPE_CMD,0xB0); - lcdWrite(TYPE_CMD,0x10); - lcdWrite(TYPE_CMD,0x00); -#else - lcdWrite(TYPE_CMD,0x2C); - -#endif - - -#ifndef N1600 - uint16_t i,page; - for(page=0; page> 3); - framecolor= ((frame_r&0xF8) << 8) | ((frame_g&0xFC)<<3) | ((frame_b&0xF8) >> 3); - backcolor= ((br&0xF8) << 8) | ((bg&0xFC)<<3) | ((bb&0xF8) >> 3); - - //top line of the frame... - for(i=0;i<98;i++){ - lcdWrite(TYPE_DATA,framecolor>>8); - lcdWrite(TYPE_DATA,framecolor&0xFF); - } - - for(y=RESY;y>0;y--){ - //left line of the frame - lcdWrite(TYPE_DATA,framecolor>>8); - lcdWrite(TYPE_DATA,framecolor&0xFF); - - for(x=RESX;x>0;x--){ - if(GLOBAL(lcdmirror)) - px=lcdGetPixel(RESX-x+1,y-1); - else - px=lcdGetPixel(x-1,y-1); - - if((!px)^(!GLOBAL(lcdinvert))) actualcolor=color; - else actualcolor=backcolor; /* white */ - - lcdWrite(TYPE_DATA,actualcolor>>8); - lcdWrite(TYPE_DATA,actualcolor&0xFF); - } - //right line of the frame - lcdWrite(TYPE_DATA,framecolor>>8); - lcdWrite(TYPE_DATA,framecolor&0xFF); - } - - //bottom line of the frame - for(i=0;i<98;i++){ - lcdWrite(TYPE_DATA,framecolor>>8); - lcdWrite(TYPE_DATA,framecolor&0xFF); - } -#endif - + if(displayType<=DISPLAY_N1200){ + lcdWrite(TYPE_CMD,0xB0); + lcdWrite(TYPE_CMD,0x10); + lcdWrite(TYPE_CMD,0x00); + uint16_t i,page; + for(page=0; page> 3); + framecolor= ((frame_r&0xF8) << 8) | ((frame_g&0xFC)<<3) | ((frame_b&0xF8) >> 3); + backcolor= ((br&0xF8) << 8) | ((bg&0xFC)<<3) | ((bb&0xF8) >> 3); + + lcdWrite(TYPE_CMD,0x2C); + + //top line of the frame... + _helper_hline(framecolor); + + for(y=RESY;y>0;y--){ + //left line of the frame + _helper_pixel16(framecolor); + + for(x=RESX;x>0;x--){ + if(GLOBAL(lcdmirror)) + px=lcdGetPixel(RESX-x+1,y-1); + else + px=lcdGetPixel(x-1,y-1); + + if((!px)^(!GLOBAL(lcdinvert))) actualcolor=color; + else actualcolor=backcolor; /* white */ + + _helper_pixel16(actualcolor); + } + //right line of the frame + _helper_pixel16(framecolor); + } + + //bottom line of the frame + _helper_hline(framecolor); + } lcd_deselect(); } void lcdRefresh() __attribute__ ((weak, alias ("lcdDisplay"))); @@ -352,32 +332,32 @@ inline void lcdInvert(void) { } void lcdSetContrast(int c) { - #ifndef N1600 - c+=0x80; - if(c>0x9F) - return; lcd_select(); - lcdWrite(TYPE_CMD,c); + if(displayType<=DISPLAY_N1200){ + c+=0x80; + if(c>0x9F) goto end; + lcdWrite(TYPE_CMD,c); + }else if(displayType==DISPLAY_N1600){ + if(c>=0x40) goto end; + lcdWrite(TYPE_CMD,0x25); + lcdWrite(TYPE_DATA,4*c); + } +end: lcd_deselect(); - #else - if(c>=0x40) - return; - lcd_select(); - lcdWrite(TYPE_CMD,0x25); - lcdWrite(TYPE_DATA,4*c); - lcd_deselect(); - #endif }; void lcdSetInvert(int c) { + /* if it's just to force c to be either 0 or 1, it can be done more efficiently --the_nihilant if(c>1) c=1; if(c<0) c=1; - - c+=0xa6; + */ + c=(c&1)+0xa6; // like this --the_nihilant lcd_select(); - lcdWrite(TYPE_CMD,c); +// if(displayType<=DISPLAY_N1200){ // it doesn't harm N1600 displays, does nothing. The if, on the other hand, uses PRECIOUS SPACE --the_nihilant + lcdWrite(TYPE_CMD,c); +// } lcd_deselect(); }; diff --git a/firmware/lcd/display.h b/firmware/lcd/display.h index 14927d8..98a46f0 100644 --- a/firmware/lcd/display.h +++ b/firmware/lcd/display.h @@ -27,7 +27,7 @@ void lcdDisplay(void); void lcdInvert(void); void lcdToggleFlag(int flag); void lcdSetPixel(char x, char y, bool f); -void lcdSafeSetPixel(char x, char y, bool f); +//void lcdSafeSetPixel(char x, char y, bool f); //useless. see in display.c to learn why --the_nihilant bool lcdGetPixel(char x, char y); void lcdShift(int x, int y, bool wrap); void lcdSetContrast(int c); diff --git a/firmware/lcd/image.c b/firmware/lcd/image.c index 3356197..ffd5dba 100644 --- a/firmware/lcd/image.c +++ b/firmware/lcd/image.c @@ -25,7 +25,7 @@ uint8_t lcdShowAnim(char *fname, uint32_t framems) { getInputWaitRelease(); while(!getInputRaw()){ - lcdFill(0x55); +// lcdFill(0x55); // useless, as it will be overwritten anyway by the next instruction --the_nihilant res = f_read(&file, (char *)lcdBuffer, RESX*RESY_B, &readbytes); if(res) return -1; From 129c17b0d20a6fd422ba85bf2af7ccbf0348c185 Mon Sep 17 00:00:00 2001 From: schneider Date: Sun, 18 Dec 2011 22:05:00 +0100 Subject: [PATCH 02/24] found 12 bytes in nihilants code --- firmware/lcd/display.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c index 4fc3da3..76afad1 100644 --- a/firmware/lcd/display.c +++ b/firmware/lcd/display.c @@ -180,7 +180,8 @@ void lcdInit(void) { delayms(5); // this is only needed after the first command (0xE2), but doing like this saves space and it still works --the_nihilant } // lcdWrite(TYPE_CMD,0x00); - }else if(displayType==DISPLAY_N1600){ + goto end; + }/*else if(displayType==DISPLAY_N1600)*/{ uint8_t initseq_d[] = { 0x36, 0x29, 0xBA, 0x07, @@ -209,6 +210,7 @@ void lcdInit(void) { initseq_c = initseq_c >> 1; } } + end: lcd_deselect(); } @@ -284,7 +286,8 @@ void lcdDisplay(void) { lcdWrite(TYPE_DATA,byte); } } - }else if(displayType==DISPLAY_N1600){ + goto end; + }/*else if(displayType==DISPLAY_N1600)*/{ unsigned char r=THECOLOR_R,g=THECOLOR_G,b=THECOLOR_B; unsigned char br=0xFF, bg=0xFF, bb=0xFF; unsigned char frame_r=0x00, frame_g=0x00, frame_b=0x80; @@ -323,6 +326,7 @@ void lcdDisplay(void) { //bottom line of the frame _helper_hline(framecolor); } + end: lcd_deselect(); } void lcdRefresh() __attribute__ ((weak, alias ("lcdDisplay"))); @@ -337,7 +341,8 @@ void lcdSetContrast(int c) { c+=0x80; if(c>0x9F) goto end; lcdWrite(TYPE_CMD,c); - }else if(displayType==DISPLAY_N1600){ + goto end; + }/*else if(displayType==DISPLAY_N1600)*/{ if(c>=0x40) goto end; lcdWrite(TYPE_CMD,0x25); lcdWrite(TYPE_DATA,4*c); From ee7e928634a69c47e07b73e2a309f7a92026bda2 Mon Sep 17 00:00:00 2001 From: schneider Date: Sun, 18 Dec 2011 22:25:10 +0100 Subject: [PATCH 03/24] found 32 bytes in formatDF --- firmware/filesystem/Makefile | 1 - firmware/filesystem/format.c | 55 ------------------------------------ firmware/filesystem/format.h | 6 ---- firmware/filesystem/util.c | 29 +++++++++++++++++++ 4 files changed, 29 insertions(+), 62 deletions(-) delete mode 100644 firmware/filesystem/format.c delete mode 100644 firmware/filesystem/format.h diff --git a/firmware/filesystem/Makefile b/firmware/filesystem/Makefile index 20e6137..76b2d19 100644 --- a/firmware/filesystem/Makefile +++ b/firmware/filesystem/Makefile @@ -12,7 +12,6 @@ OBJS += at45db041d.o OBJS += util.o OBJS += select.o OBJS += execute.o -OBJS += format.o LIBNAME=fat diff --git a/firmware/filesystem/format.c b/firmware/filesystem/format.c deleted file mode 100644 index 7535b51..0000000 --- a/firmware/filesystem/format.c +++ /dev/null @@ -1,55 +0,0 @@ -#include - -#include "basic/basic.h" -#include "basic/config.h" - -#include "usb/usbmsc.h" - -#include "lcd/print.h" - -#include "funk/nrf24l01p.h" -#include "funk/mesh.h" -#include "filesystem/at45db041d.h" - -uint8_t init1[] = {0xeb, 0xfe, 0x90, 0x4d, 0x53, 0x44, 0x4f, 0x53, - 0x35, 0x2e, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00, - 0x01, 0x00, 0x02, 0x00, 0x04, 0xf0, 0x04, 0x00, - 0x3f, 0x00, 0xff}; - -uint8_t init2[] = {0x80, 0x00, 0x29, 0x37, - 0x4b, 0x55, 0x33, 0x4e, 0x4f, 0x20, 0x4e, 0x41, - 0x4d, 0x45, 0x20, 0x20, 0x20, 0x20, 0x46, 0x41, - 0x54, 0x20, 0x20, 0x20, 0x20, 0x20}; - - - -void format_formatDF(void) -{ - int i; - char buf[512]; - - //dataflash_initialize(); - //delayms(100); - - for(i=0; i< 512; i++) buf[i] = 0x00; - - //for(i=0; i<1024; i++) - // dataflash_write(buf, i, 1); - memcpy(buf, init1, sizeof(init1)); - memcpy(buf+0x24, init2, sizeof(init2)); - - buf[510] = 0x55; - buf[511] = 0xaa; - //memcpy(buf+510, "\x55\xaa", 2); - - dataflash_write(buf, 0, 1); - - for(i=0; i< 512; i++) buf[i] = 0x00; - - buf[0] = 0xf0; - buf[1] = 0xff; - buf[2] = 0xff; - dataflash_write(buf, 1, 1); - -} - diff --git a/firmware/filesystem/format.h b/firmware/filesystem/format.h deleted file mode 100644 index 902f57a..0000000 --- a/firmware/filesystem/format.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __FORMAT_H_ -#define __FORMAT_H_ - -void format_formatDF(void); - -#endif diff --git a/firmware/filesystem/util.c b/firmware/filesystem/util.c index b8d0ee9..52529a4 100644 --- a/firmware/filesystem/util.c +++ b/firmware/filesystem/util.c @@ -19,6 +19,35 @@ const char* f_get_rc_string (FRESULT rc) { return p; } +const uint8_t init1[] = {0xeb, 0xfe, 0x90, 0x4d, 0x53, 0x44, 0x4f, 0x53, + 0x35, 0x2e, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00, + 0x01, 0x00, 0x02, 0x00, 0x04, 0xf0, 0x04, 0x00, + 0x3f, 0x00, 0xff}; + +const uint8_t init2[] = {0x80, 0x00, 0x29, 0x37, + 0x4b, 0x55, 0x33, 0x4e, 0x4f, 0x20, 0x4e, 0x41, + 0x4d, 0x45, 0x20, 0x20, 0x20, 0x20, 0x46, 0x41, + 0x54, 0x20, 0x20, 0x20, 0x20, 0x20}; + +inline void format_formatDF(void) +{ + int i; + char buf[512]; + + memset(buf, 0, 512); + memcpy(buf, init1, sizeof(init1)); + memcpy(buf+0x24, init2, sizeof(init2)); + buf[510] = 0x55; + buf[511] = 0xaa; + dataflash_write(buf, 0, 1); + + for(i=0; i< 512; i++) buf[i] = 0x00; + buf[0] = 0xf0; + buf[1] = 0xff; + buf[2] = 0xff; + dataflash_write(buf, 1, 1); +} + void fsInit(){ FRESULT i; From 5c7ecaf0eccf3e86a3054b4b80f067aa991d17bb Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Mon, 19 Dec 2011 17:26:54 +0100 Subject: [PATCH 04/24] Add prototype for mass-pong. --- tools/game/bong/bong.html | 50 ++++++++ tools/game/bong/bong.js | 262 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 312 insertions(+) create mode 100644 tools/game/bong/bong.html create mode 100644 tools/game/bong/bong.js diff --git a/tools/game/bong/bong.html b/tools/game/bong/bong.html new file mode 100644 index 0000000..bb00663 --- /dev/null +++ b/tools/game/bong/bong.html @@ -0,0 +1,50 @@ + + B-Pong + + + + + +
+
+
0
+
0
+
+ +
s_data...
+
debug
+ + diff --git a/tools/game/bong/bong.js b/tools/game/bong/bong.js new file mode 100644 index 0000000..d172cc0 --- /dev/null +++ b/tools/game/bong/bong.js @@ -0,0 +1,262 @@ +// Initialisation +var socket = "ws://83.133.179.198:8888/data"; +var field= { w: 320, h: 240 }; +var paddle = { w: 2, h: 30 }; +var ball = { w: 5, h: 5, s: 5 }; + +// Pong game class +function pong() { + this.ball = {}; + this.left = {}; + this.right = {}; + this.score = {}; + this.score.left = {}; + this.score.right = {}; + this.field = {}; + this.game = { run: 0 }; + + this.ball.size=ball; + this.left.size=paddle; + this.right.size=paddle; + this.field.size=field; + + this.left.x=-field.w+3*this.left.size.w; + this.right.x=field.w-3*this.right.size.w; + + this.ball.avatar=$('div#ball'); + this.left.avatar=$('div#paddle_left'); + this.right.avatar=$('div#paddle_right'); + this.score.left.avatar=$('div#score_left'); + this.score.right.avatar=$('div#score_right'); + this.field.avatar=$('#playfield'); + + function setupavatar(obj){ + obj.avatar.width(2*obj.size.w) + .height(2*obj.size.h); + }; + + setupavatar(this.ball); + setupavatar(this.left); + setupavatar(this.right); + setupavatar(this.field); + + this.field.avatar.focus(); + + this.score.left.pts=0; + this.score.right.pts=0; + this.setup( (Math.random()>0.5)?1:-1); + + this.field.avatar.keydown(this,function(ev){ + if(ev.which == 67) ev.data.socketstart(socket); + if(ev.which == 81) ev.data.game.run=0; + if(ev.which == 82) ev.data.game.run=1; + if(ev.which > 48 && ev.which <=57) ev.data.setleft((ev.which-53)/4); + }); + + $('#debug').css({left:0,top:2*this.field.size.h+10}); + $('#socket').css({left:0,top:2*this.field.size.h+30}); +} + +pong.prototype.setleft = function(where){ + this.left.y=where*(this.field.size.h-this.left.size.h); +}; + +pong.prototype.setright = function(where){ + this.right.y=where*(this.field.size.h-this.right.size.h); +}; + +pong.prototype.setup = function(rtl){ + this.ball.x=0; + this.ball.y=0; + this.ball.ang=Math.random()*20/180*Math.PI; + if(rtl<0) this.ball.ang=Math.PI-this.ball.ang; + this.ball.spd=this.ball.size.s; + + this.left.y=0; + this.right.y=0; + + this.game.run=0; +}; + +pong.prototype.update= function(t){ + var upv=0; + + this.ball.vx=Math.cos(this.ball.ang)*this.ball.spd; + this.ball.vy=Math.sin(this.ball.ang)*this.ball.spd; + this.ball.x+=t*this.ball.vx; + this.ball.y+=t*this.ball.vy; + + this.ball.x+=t*this.ball.vx; + this.ball.y+=t*this.ball.vy; + + // Clipping + if(this.ball.y-this.ball.size.h<-field.h){ + this.ball.ang=-this.ball.ang; + this.ball.y=-field.h+this.ball.size.h; + }; + + if(this.ball.y+this.ball.size.h>field.h){ + this.ball.ang=-this.ball.ang; + this.ball.y=field.h-this.ball.size.h; + }; + + function newang(off,bath){ + var trig=(bath-1)/4; + var ad=0; + if(Math.abs(off)this.right.x-this.right.size.w && + this.ball.y+this.ball.size.h>this.right.y-this.right.size.h && + this.ball.y-this.ball.size.hthis.left.x-this.left.size.w && + this.ball.y+this.ball.size.h>this.left.y-this.left.size.h && + this.ball.y-this.ball.size.hfield.w){ + this.score.left.pts++; + this.setup(-1); + this.ball.ang=Math.PI-this.ball.ang; + this.game.run=1; + }; + + if(this.ball.x-this.ball.size.w<-field.w){ + this.score.right.pts++; + this.setup(1); + this.game.run=1; + }; + + if(this.ball.ang<0) + this.ball.ang+=2*Math.PI; + if(this.ball.ang>2*Math.PI) + this.ball.ang-=2*Math.PI; + + $('#debug').html("ang="+Math.abs(this.ball.ang/Math.PI*180)+" ,x="+Math.ceil(this.ball.x)+" ,y="+Math.ceil(this.ball.y));//+" ,off="+(this.ball.off)+" ,ad="+Math.ceil(this.ball.ad)); +}; + +pong.prototype.display=function(){ + function move(obj,av){ + var x = obj.x - obj.size.w + field.w; + var y = obj.y - obj.size.h + field.h; + obj.avatar.css({left:x,top:y}); + }; + + move(this.ball); + move(this.left); + move(this.right); + this.score.left.avatar.html(this.score.left.pts); + this.score.right.avatar.html(this.score.right.pts); +}; + +var time = function() { return +(new Date) / 100 }; +var last = time(); +pong.prototype.run = function(){ + var now = time(); + + if(game.game.run==1) + game.update(now - last); + + game.display(); + last=now; +}; + +pong.prototype.socketstart = function(uri){ + function debug(str){ + $("#socket").append("
" + str); + }; + + ws = new WebSocket(uri); + + debug("ws start"); + ws.onopen = function() { + debug("ws open"); + $('#socket').css({"color": "green"}); + ws.send("hello"); + this.game.run=1; + }; + + ws.onmessage = function (evt) { + var data = evt.data; + $('#socket').html(data); + if(data.slice(0,1)=="{"){ + var result=JSON.parse(data); + if (result.right){ + this.setright(result.right); + } else if (result.left){ + this.setleft(result.left); + }else { + // unknown json input + }; + }else{ + // unknown non-json input + }; + }; + + ws.onclose = function() { + debug("socket closed"); + $('#socket').css({"color": "red"}); + // reconnect + }; +}; + +// Start utility stuff +(function() { + var onEachFrame; + if (window.webkitRequestAnimationFrame) { + onEachFrame = function(cb) { + var _cb = function() { cb(); webkitRequestAnimationFrame(_cb); } + _cb(); + }; + } else if (window.mozRequestAnimationFrame) { + onEachFrame = function(cb) { + var _cb = function() { cb(); mozRequestAnimationFrame(_cb); } + _cb(); + }; + } else { + onEachFrame = function(cb) { + setInterval(cb, 1000 / 60); + } + } + window.onEachFrame = onEachFrame; +})(); + +var game; +$(document).ready(function(){ + game=new pong(); + if (window.MozWebSocket) { + window.WebSocket = window.MozWebSocket; + } + if ("WebSocket" in window) { + game.socketstart(socket); + } else { + alert("You have no web sockets"); + }; + window.onEachFrame(game.run); +}); From d64c2b51a4fa41ad46350692921b2bb3affb3164 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Mon, 19 Dec 2011 18:26:41 +0100 Subject: [PATCH 05/24] Fix ./release-all for our new single-binary process. Also do l0dable/mktable automatically so nobody forgets it. Set "TABLE=NO" to avoid it --- firmware/Makefile | 9 +- firmware/filesystem/ffconf.h-final | 188 ----------------------------- firmware/release-all | 22 +--- 3 files changed, 10 insertions(+), 209 deletions(-) delete mode 100644 firmware/filesystem/ffconf.h-final diff --git a/firmware/Makefile b/firmware/Makefile index 1f3182a..3bdf2d2 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -9,13 +9,11 @@ LIBS = VPATH += OBJS += main.o -ifeq "$(wildcard table.c)" "table.c" -ifeq "$(APP)" "serial" +ifeq "$(TABLE)" "NO" OBJS += else OBJS += table.o endif -endif LIBS += lcd/liblcd.a LIBS += basic/libbasic.a @@ -73,7 +71,7 @@ l0dables: @cd l0dable && $(MAKE) clean: - rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex + rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex table.c table.h for dir in $(SUBDIRS); do \ $(MAKE) $(CONFIG_MAKE_PRINTDIRECTORY) -C $$dir clean; \ done @@ -87,6 +85,9 @@ flash: all %.o : %.c $(CC) $(CFLAGS) -o $@ $< +table.c: l0dable/EXPORTS + ./l0dable/mktable.pl + ### Make all libraries... .PHONY: subdirs $(SUBDIRS) diff --git a/firmware/filesystem/ffconf.h-final b/firmware/filesystem/ffconf.h-final deleted file mode 100644 index 6db022d..0000000 --- a/firmware/filesystem/ffconf.h-final +++ /dev/null @@ -1,188 +0,0 @@ -/*---------------------------------------------------------------------------/ -/ FatFs - FAT file system module configuration file R0.08b (C)ChaN, 2011 -/----------------------------------------------------------------------------/ -/ -/ CAUTION! Do not forget to make clean the project after any changes to -/ the configuration options. -/ -/----------------------------------------------------------------------------*/ -#ifndef _FFCONF -#define _FFCONF 8237 /* Revision ID */ - - -/*---------------------------------------------------------------------------/ -/ Function and Buffer Configurations -/----------------------------------------------------------------------------*/ - -#define _FS_TINY 1 /* 0:Normal or 1:Tiny */ -/* When _FS_TINY is set to 1, FatFs uses the sector buffer in the file system -/ object instead of the sector buffer in the individual file object for file -/ data transfer. This reduces memory consumption 512 bytes each file object. */ - - -#define _FS_READONLY 0 /* 0:Read/Write or 1:Read only */ -/* Setting _FS_READONLY to 1 defines read only configuration. This removes -/ writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename, -/ f_truncate and useless f_getfree. */ - - -#define _FS_MINIMIZE 1 /* 0 to 3 */ -/* The _FS_MINIMIZE option defines minimization level to remove some functions. -/ -/ 0: Full function. -/ 1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename -/ are removed. -/ 2: f_opendir and f_readdir are removed in addition to 1. -/ 3: f_lseek is removed in addition to 2. */ - - -#define _USE_STRFUNC 0 /* 0:Disable or 1/2:Enable */ -/* To enable string functions, set _USE_STRFUNC to 1 or 2. */ - - -#define _USE_MKFS 0 /* 0:Disable or 1:Enable */ -/* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */ - - -#define _USE_FORWARD 0 /* 0:Disable or 1:Enable */ -/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */ - - -#define _USE_FASTSEEK 0 /* 0:Disable or 1:Enable */ -/* To enable fast seek feature, set _USE_FASTSEEK to 1. */ - - - -/*---------------------------------------------------------------------------/ -/ Locale and Namespace Configurations -/----------------------------------------------------------------------------*/ - -#define _CODE_PAGE 1 -/* The _CODE_PAGE specifies the OEM code page to be used on the target system. -/ Incorrect setting of the code page can cause a file open failure. -/ -/ 932 - Japanese Shift-JIS (DBCS, OEM, Windows) -/ 936 - Simplified Chinese GBK (DBCS, OEM, Windows) -/ 949 - Korean (DBCS, OEM, Windows) -/ 950 - Traditional Chinese Big5 (DBCS, OEM, Windows) -/ 1250 - Central Europe (Windows) -/ 1251 - Cyrillic (Windows) -/ 1252 - Latin 1 (Windows) -/ 1253 - Greek (Windows) -/ 1254 - Turkish (Windows) -/ 1255 - Hebrew (Windows) -/ 1256 - Arabic (Windows) -/ 1257 - Baltic (Windows) -/ 1258 - Vietnam (OEM, Windows) -/ 437 - U.S. (OEM) -/ 720 - Arabic (OEM) -/ 737 - Greek (OEM) -/ 775 - Baltic (OEM) -/ 850 - Multilingual Latin 1 (OEM) -/ 858 - Multilingual Latin 1 + Euro (OEM) -/ 852 - Latin 2 (OEM) -/ 855 - Cyrillic (OEM) -/ 866 - Russian (OEM) -/ 857 - Turkish (OEM) -/ 862 - Hebrew (OEM) -/ 874 - Thai (OEM, Windows) -/ 1 - ASCII only (Valid for non LFN cfg.) -*/ - - -#define _USE_LFN 0 /* 0 to 3 */ -#define _MAX_LFN 255 /* Maximum LFN length to handle (12 to 255) */ -/* The _USE_LFN option switches the LFN support. -/ -/ 0: Disable LFN feature. _MAX_LFN and _LFN_UNICODE have no effect. -/ 1: Enable LFN with static working buffer on the BSS. Always NOT reentrant. -/ 2: Enable LFN with dynamic working buffer on the STACK. -/ 3: Enable LFN with dynamic working buffer on the HEAP. -/ -/ The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. To enable LFN, -/ Unicode handling functions ff_convert() and ff_wtoupper() must be added -/ to the project. When enable to use heap, memory control functions -/ ff_memalloc() and ff_memfree() must be added to the project. */ - - -#define _LFN_UNICODE 0 /* 0:ANSI/OEM or 1:Unicode */ -/* To switch the character code set on FatFs API to Unicode, -/ enable LFN feature and set _LFN_UNICODE to 1. */ - - -#define _FS_RPATH 0 /* 0 to 2 */ -/* The _FS_RPATH option configures relative path feature. -/ -/ 0: Disable relative path feature and remove related functions. -/ 1: Enable relative path. f_chdrive() and f_chdir() are available. -/ 2: f_getcwd() is available in addition to 1. -/ -/ Note that output of the f_readdir fnction is affected by this option. */ - - - -/*---------------------------------------------------------------------------/ -/ Physical Drive Configurations -/----------------------------------------------------------------------------*/ - -#define _VOLUMES 1 -/* Number of volumes (logical drives) to be used. */ - - -#define _MAX_SS 512 /* 512, 1024, 2048 or 4096 */ -/* Maximum sector size to be handled. -/ Always set 512 for memory card and hard disk but a larger value may be -/ required for on-board flash memory, floppy disk and optical disk. -/ When _MAX_SS is larger than 512, it configures FatFs to variable sector size -/ and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */ - - -#define _MULTI_PARTITION 0 /* 0:Single partition or 1:Multiple partition */ -/* When set to 0, each volume is bound to the same physical drive number and -/ it can mount only first primaly partition. When it is set to 1, each volume -/ is tied to the partitions listed in VolToPart[]. */ - - -#define _USE_ERASE 0 /* 0:Disable or 1:Enable */ -/* To enable sector erase feature, set _USE_ERASE to 1. CTRL_ERASE_SECTOR command -/ should be added to the disk_ioctl functio. */ - - - -/*---------------------------------------------------------------------------/ -/ System Configurations -/----------------------------------------------------------------------------*/ - -#define _WORD_ACCESS 0 /* 0 or 1 */ -/* Set 0 first and it is always compatible with all platforms. The _WORD_ACCESS -/ option defines which access method is used to the word data on the FAT volume. -/ -/ 0: Byte-by-byte access. -/ 1: Word access. Do not choose this unless following condition is met. -/ -/ When the byte order on the memory is big-endian or address miss-aligned word -/ access results incorrect behavior, the _WORD_ACCESS must be set to 0. -/ If it is not the case, the value can also be set to 1 to improve the -/ performance and code size. */ - - -/* A header file that defines sync object types on the O/S, such as -/ windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */ - -#define _FS_REENTRANT 0 /* 0:Disable or 1:Enable */ -#define _FS_TIMEOUT 1000 /* Timeout period in unit of time ticks */ -#define _SYNC_t HANDLE /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */ - -/* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module. -/ -/ 0: Disable reentrancy. _SYNC_t and _FS_TIMEOUT have no effect. -/ 1: Enable reentrancy. Also user provided synchronization handlers, -/ ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj -/ function must be added to the project. */ - - -#define _FS_SHARE 0 /* 0:Disable or >=1:Enable */ -/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value - defines how many files can be opened simultaneously. */ - -#endif /* _FFCONFIG */ diff --git a/firmware/release-all b/firmware/release-all index 4c5a6df..05e1b36 100755 --- a/firmware/release-all +++ b/firmware/release-all @@ -28,31 +28,16 @@ cp SECRETS.release SECRETS mkdir $TARG mkdir $TARG/files -echo "###" -echo "### Building initial" -echo "###" - -git checkout filesystem/ffconf.h -make clean -make APP=initial -cp firmware.bin $TARG/initial.bin - echo "###" echo "### Building final" echo "###" export FINAL=y -cp filesystem/ffconf.h-final filesystem/ffconf.h make clean ./l0dable/mktable.pl make APP=final cp firmware.elf $TARG/final.elf cp firmware.bin $TARG/final.bin -echo "###" -echo "### Building crypto" -echo "###" -(cd ../tools/crypto && make) - echo "###" echo "### Gathering files" echo "###" @@ -63,7 +48,6 @@ cp ../tools/image/lcd/i42.lcd $TARG/files/nick.lcd echo "###" echo "### Gathering loadables" echo "###" -# XXX: add crypto stuff (cd l0dable && make) mv l0dable/*.c0d $TARG/files/ mv l0dable/*.int $TARG/files/ @@ -71,6 +55,11 @@ mv l0dable/*.nik $TARG/files/ if grep -q 'define ENCRYPT_L0DABLE' SECRETS ; then +echo "###" +echo "### Building crypto" +echo "###" +(cd ../tools/crypto && make) + echo "###" echo "### Crypting loadables" echo "###" @@ -101,4 +90,3 @@ echo "### Done. Yay!" echo "###" git checkout SECRETS -git checkout filesystem/ffconf.h From 9bd0b3fd121e2649032f00f64eb1a1bdb7b36b51 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Mon, 19 Dec 2011 18:28:17 +0100 Subject: [PATCH 06/24] remove last traces of the older inconvenient lodable design --- firmware/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 3bdf2d2..9a2351c 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -64,9 +64,6 @@ all: $(OUTFILE).bin protect: $(OUTFILE).bin $(LPCFIX) -p 2 $(OUTFILE).bin -loadables: $(OUTFILE).bin - @cd loadable && $(MAKE) - l0dables: @cd l0dable && $(MAKE) From 4b8c0ca71559068dd152f82d50ac7b9e70eef3e7 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Mon, 19 Dec 2011 18:36:26 +0100 Subject: [PATCH 07/24] Default to APP=final instead of APP=username now --- firmware/applications/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile index 37b54ec..37f119e 100644 --- a/firmware/applications/Makefile +++ b/firmware/applications/Makefile @@ -21,7 +21,7 @@ OBJS += $(foreach mod,$(APP),$(mod).o) SRCS = $(foreach mod,$(APP),$(mod).c) ifndef APP -ME_OBJ=$(USERNAME) +ME_OBJ=final ifeq "$(ME_OBJ)" "" ME_OBJ=$(USER) From 8139b37a19eab8df7130c43f334f8463de7c2a45 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Mon, 19 Dec 2011 20:43:50 +0100 Subject: [PATCH 08/24] Revert "Default to APP=final instead of APP=username now" This reverts commit 4b8c0ca71559068dd152f82d50ac7b9e70eef3e7. --- firmware/applications/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile index 37f119e..37b54ec 100644 --- a/firmware/applications/Makefile +++ b/firmware/applications/Makefile @@ -21,7 +21,7 @@ OBJS += $(foreach mod,$(APP),$(mod).o) SRCS = $(foreach mod,$(APP),$(mod).c) ifndef APP -ME_OBJ=final +ME_OBJ=$(USERNAME) ifeq "$(ME_OBJ)" "" ME_OBJ=$(USER) From c301baa98f25384ae9b8a1241c3f4469e3476357 Mon Sep 17 00:00:00 2001 From: schneider Date: Mon, 19 Dec 2011 20:58:08 +0100 Subject: [PATCH 09/24] made format work again --- firmware/filesystem/util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firmware/filesystem/util.c b/firmware/filesystem/util.c index 52529a4..f8b59b9 100644 --- a/firmware/filesystem/util.c +++ b/firmware/filesystem/util.c @@ -35,6 +35,8 @@ inline void format_formatDF(void) char buf[512]; memset(buf, 0, 512); + for(i=0; i<20; i++) dataflash_write(buf, i, 1); + memcpy(buf, init1, sizeof(init1)); memcpy(buf+0x24, init2, sizeof(init2)); buf[510] = 0x55; From c4c2250debe7c794f01c5c7c78fc4f094a6357bf Mon Sep 17 00:00:00 2001 From: schneider Date: Mon, 19 Dec 2011 20:59:03 +0100 Subject: [PATCH 10/24] init: removed bad c code --- firmware/basic/basic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/firmware/basic/basic.c b/firmware/basic/basic.c index 9ebfdbd..1dc9d3f 100644 --- a/firmware/basic/basic.c +++ b/firmware/basic/basic.c @@ -51,7 +51,8 @@ void rbInit() { int i = 0; while( i<8 ){ gpioSetDir(ports[i],ports[i+1], gpioDirection_Output); - gpioSetValue (ports[i++], ports[i++], 0); + gpioSetValue (ports[i], ports[i+1], 0); + i+=2; } // Set LED3 to ? @@ -78,7 +79,8 @@ void rbInit() { // prepare hackerbus while(i Date: Mon, 19 Dec 2011 21:20:58 +0100 Subject: [PATCH 11/24] Correctly default to APP=final now --- firmware/applications/Makefile | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile index 37b54ec..a8d3138 100644 --- a/firmware/applications/Makefile +++ b/firmware/applications/Makefile @@ -4,6 +4,10 @@ OBJS = +ifndef APP +APP=final +endif + ifeq "$(APP)" "initial" NODEFAULT = y endif @@ -20,20 +24,6 @@ OBJS += $(foreach mod,$(APP),$(mod).o) SRCS = $(foreach mod,$(APP),$(mod).c) -ifndef APP -ME_OBJ=$(USERNAME) - -ifeq "$(ME_OBJ)" "" -ME_OBJ=$(USER) -endif - -ifeq "$(ME_OBJ)" "" -ME_OBJ=nouser -endif - -OBJS += $(ME_OBJ).o -endif - WRAP=wrapper LIBNAME=app From 04a4c7127c7d5dc8a34d2b8cf64082ef6b995712 Mon Sep 17 00:00:00 2001 From: schneider Date: Mon, 19 Dec 2011 21:21:07 +0100 Subject: [PATCH 12/24] fixed light sensor with disabled chargeled --- firmware/basic/basic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/firmware/basic/basic.c b/firmware/basic/basic.c index 1dc9d3f..42781d0 100644 --- a/firmware/basic/basic.c +++ b/firmware/basic/basic.c @@ -38,11 +38,15 @@ void rbInit() { gpioSetDir(RB_PWR_CHRG, gpioDirection_Input); gpioSetPullup (&RB_PWR_CHRG_IO, gpioPullupMode_PullUp); + gpioSetDir(RB_LED3, gpioDirection_Input); + IOCON_PIO1_11 = 0x41; + + // prepare LEDs IOCON_JTAG_TDI_PIO0_11 &= ~IOCON_JTAG_TDI_PIO0_11_FUNC_MASK; IOCON_JTAG_TDI_PIO0_11 |= IOCON_JTAG_TDI_PIO0_11_FUNC_GPIO; - uint8_t ports[] = { RB_LED0, RB_LED1, RB_LED2, RB_LED3, + uint8_t ports[] = { RB_LED0, RB_LED1, RB_LED2, RB_SPI_SS0, RB_SPI_SS1, RB_SPI_SS2, RB_SPI_SS3, RB_SPI_SS4, RB_SPI_SS5, RB_HB0, RB_HB1, RB_HB2, From a3cbf8cd3fb643cfa36bc3d5a770da8117441b80 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Mon, 19 Dec 2011 21:30:01 +0100 Subject: [PATCH 13/24] remove more old loadable stuff --- firmware/applications/Makefile | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile index a8d3138..7df00fe 100644 --- a/firmware/applications/Makefile +++ b/firmware/applications/Makefile @@ -50,21 +50,6 @@ endif all: $(LIBFILE) -ifeq "$(APP)" "loadable" -ifndef LAPP -LAPP=blinktest -endif -LSRC=../loadable/$(LAPP).c -LOBJ=loadable_$(LAPP).o - -.PHONY: $(LOBJ) - -$(LOBJ): - $(CC) $(CFLAGS) -o $@ $(LSRC) - -OBJS += $(LOBJ) -endif - ifeq "$(APP)" "l0dable" ifndef LAPP LAPP=blinktest From 1c924ec3709f9ba4a57f70c4059aa2889b993123 Mon Sep 17 00:00:00 2001 From: schneider Date: Mon, 19 Dec 2011 21:46:04 +0100 Subject: [PATCH 14/24] init: fixed error, reduced code size --- firmware/basic/basic.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/firmware/basic/basic.c b/firmware/basic/basic.c index 42781d0..e40ee4a 100644 --- a/firmware/basic/basic.c +++ b/firmware/basic/basic.c @@ -18,21 +18,22 @@ void rbInit() { gpioSetDir(USB_CONNECT, gpioDirection_Output); gpioSetValue(USB_CONNECT, 1); - // prepare buttons - gpioSetDir(RB_BTN0, gpioDirection_Input); - gpioSetPullup (&RB_BTN0_IO, gpioPullupMode_PullUp); + uint8_t ports[] = { RB_BTN0, RB_BTN1, RB_BTN2, RB_BTN3, RB_BTN4, + RB_LED0, RB_LED1, RB_LED2, + RB_SPI_SS0, RB_SPI_SS1, RB_SPI_SS2, + RB_SPI_SS3, RB_SPI_SS4, RB_SPI_SS5, + RB_HB0, RB_HB1, RB_HB2, + RB_HB3, RB_HB4, RB_HB5}; - gpioSetDir(RB_BTN1, gpioDirection_Input); - gpioSetPullup (&RB_BTN1_IO, gpioPullupMode_PullUp); + volatile uint32_t * regs[] = {&RB_BTN0_IO, &RB_BTN1_IO, &RB_BTN2_IO, + &RB_BTN3_IO, &RB_BTN4_IO}; - gpioSetDir(RB_BTN2, gpioDirection_Input); - gpioSetPullup (&RB_BTN2_IO, gpioPullupMode_PullUp); - - gpioSetDir(RB_BTN3, gpioDirection_Input); - gpioSetPullup (&RB_BTN3_IO, gpioPullupMode_PullUp); - - gpioSetDir(RB_BTN4, gpioDirection_Input); - gpioSetPullup (&RB_BTN4_IO, gpioPullupMode_PullUp); + int i = 0; + while( i<10 ){ + gpioSetDir(ports[i], ports[i+1], gpioDirection_Input); + gpioSetPullup(regs[i/2], gpioPullupMode_PullUp); + i+=2; + } // prepate chrg_stat gpioSetDir(RB_PWR_CHRG, gpioDirection_Input); @@ -41,19 +42,11 @@ void rbInit() { gpioSetDir(RB_LED3, gpioDirection_Input); IOCON_PIO1_11 = 0x41; - // prepare LEDs IOCON_JTAG_TDI_PIO0_11 &= ~IOCON_JTAG_TDI_PIO0_11_FUNC_MASK; IOCON_JTAG_TDI_PIO0_11 |= IOCON_JTAG_TDI_PIO0_11_FUNC_GPIO; - uint8_t ports[] = { RB_LED0, RB_LED1, RB_LED2, - RB_SPI_SS0, RB_SPI_SS1, RB_SPI_SS2, - RB_SPI_SS3, RB_SPI_SS4, RB_SPI_SS5, - RB_HB0, RB_HB1, RB_HB2, - RB_HB3, RB_HB4, RB_HB5}; - - int i = 0; - while( i<8 ){ + while( i<16 ){ gpioSetDir(ports[i],ports[i+1], gpioDirection_Output); gpioSetValue (ports[i], ports[i+1], 0); i+=2; From b10f12ba1fbde006f964b418b582b68b4db58a40 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 20 Dec 2011 01:21:31 +0100 Subject: [PATCH 15/24] Fix color lcd detection (only check ID3 byte). Also: some cleanup of the lcd code. Sorry, I felt compelled. --- firmware/lcd/display.c | 157 ++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 95 deletions(-) diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c index 76afad1..5824c7c 100644 --- a/firmware/lcd/display.c +++ b/firmware/lcd/display.c @@ -10,9 +10,8 @@ #include "usb/usbmsc.h" -#define DISPLAY_UNKNOWN 0 -#define DISPLAY_N1200 1 -#define DISPLAY_N1600 2 +#define DISPLAY_N1200 0 +#define DISPLAY_N1600 1 /**************************************************************************/ /* Utility routines to manage nokia display */ @@ -128,7 +127,7 @@ uint8_t lcdRead(uint8_t data) void lcdInit(void) { - int id1,id2,id3,id4; + int id; sspInit(0, sspClockPolarity_Low, sspClockPhase_RisingEdge); @@ -144,16 +143,12 @@ void lcdInit(void) { gpioSetValue(RB_LCD_RST, 1); delayms(100); - id1=lcdRead(128+64+16+8 +2 ); // it will screw up everything.. better do it before anything else --the_nihilant - id2=lcdRead(128+64+16+8 +2+1); // .. but after the code above! --the_nihilant - // id3=lcdRead(128+64+16+8+4 ); // id1 and id2 are enough for most screens - // id4=lcdRead(128+64+16+8+4 +1); // id3 and id4 would only use up PRECIOUS SPACE --the_nihilant - - lcd_select(); + id=lcdRead(220); // ID3 - if((id1==69)&&(id2==214))displayType=DISPLAY_N1600; - //if((id1==254)&&(id2==2))displayType=DISPLAY_N1200; - else displayType=DISPLAY_N1200; // unknown displays are treated like N1200s anyway, this saves an if (PRECIOUS SPACE) --the_nihilant + if(id==14) + displayType=DISPLAY_N1600; + else /* ID3 == 48 */ + displayType=DISPLAY_N1200; /* Small Nokia 1200 LCD docs: * clear/ set @@ -168,67 +163,49 @@ void lcdInit(void) { * 0xd0+x black lines from top? (-0xdf?) * */ - if(displayType<=DISPLAY_N1200){ -// lcdWrite(TYPE_CMD,0xE2); -// delayms(5); - uint8_t initseq[] = {0xE2,0xAF, // Display ON - 0xA1, // Mirror-X - 0xA4, 0x2F, 0xB0, 0x10}; - int i = 0; - while(i> 1; - } + while(i> 1; + } } - end: lcd_deselect(); } void lcdFill(char f){ - // using memset saves 4 bytes compared with the loop! memset(lcdBuffer,f,RESX*RESY_B); -/* int x; +#if 0 + int x; for(x=0;x=0 && x=0 && y < RESY) - lcdSetPixel(x, y, f); -}*/ - void lcdSetPixel(char x, char y, bool f){ if (x<0 || x> RESX || y<0 || y > RESY) return; @@ -251,13 +228,15 @@ bool lcdGetPixel(char x, char y){ } -static void _helper_pixel16(uint16_t color){ // putting this here saves a few bytes overall --the_nihilant - lcdWrite(TYPE_DATA,color>>8); - lcdWrite(TYPE_DATA,color&0xFF); +// Color display hepler functions +static void _helper_pixel16(uint16_t color){ + lcdWrite(TYPE_DATA,color>>8); + lcdWrite(TYPE_DATA,color&0xFF); } -static void _helper_hline(uint16_t color){ // same for this --the_nihilant - for(int cx=0;cx<98;cx++) _helper_pixel16(color); +static void _helper_hline(uint16_t color){ + for(int cx=0;cx<98;cx++) + _helper_pixel16(color); } #define THECOLOR_R 0x0 @@ -268,7 +247,7 @@ void lcdDisplay(void) { char byte; lcd_select(); - if(displayType<=DISPLAY_N1200){ + if(displayType==DISPLAY_N1200){ lcdWrite(TYPE_CMD,0xB0); lcdWrite(TYPE_CMD,0x10); lcdWrite(TYPE_CMD,0x00); @@ -286,8 +265,7 @@ void lcdDisplay(void) { lcdWrite(TYPE_DATA,byte); } } - goto end; - }/*else if(displayType==DISPLAY_N1600)*/{ + } else { /* displayType==DISPLAY_N1600 */ unsigned char r=THECOLOR_R,g=THECOLOR_G,b=THECOLOR_B; unsigned char br=0xFF, bg=0xFF, bb=0xFF; unsigned char frame_r=0x00, frame_g=0x00, frame_b=0x80; @@ -326,9 +304,9 @@ void lcdDisplay(void) { //bottom line of the frame _helper_hline(framecolor); } - end: lcd_deselect(); } + void lcdRefresh() __attribute__ ((weak, alias ("lcdDisplay"))); inline void lcdInvert(void) { @@ -337,32 +315,23 @@ inline void lcdInvert(void) { void lcdSetContrast(int c) { lcd_select(); - if(displayType<=DISPLAY_N1200){ - c+=0x80; - if(c>0x9F) goto end; - lcdWrite(TYPE_CMD,c); - goto end; - }/*else if(displayType==DISPLAY_N1600)*/{ - if(c>=0x40) goto end; - lcdWrite(TYPE_CMD,0x25); - lcdWrite(TYPE_DATA,4*c); + if(displayType==DISPLAY_N1200){ + if(c<0x1F) + lcdWrite(TYPE_CMD,0x80+c); + }else{ /* displayType==DISPLAY_N1600 */ + if(c<0x40) { + lcdWrite(TYPE_CMD,0x25); + lcdWrite(TYPE_DATA,4*c); + }; } -end: lcd_deselect(); }; void lcdSetInvert(int c) { - /* if it's just to force c to be either 0 or 1, it can be done more efficiently --the_nihilant - if(c>1) - c=1; - if(c<0) - c=1; - */ - c=(c&1)+0xa6; // like this --the_nihilant lcd_select(); -// if(displayType<=DISPLAY_N1200){ // it doesn't harm N1600 displays, does nothing. The if, on the other hand, uses PRECIOUS SPACE --the_nihilant - lcdWrite(TYPE_CMD,c); -// } + /* it doesn't harm N1600, save space */ +// if(displayType==DISPLAY_N1200) + lcdWrite(TYPE_CMD,(c&1)+0xa6); lcd_deselect(); }; @@ -374,7 +343,6 @@ void __attribute__((__deprecated__)) lcdToggleFlag(int flag) { GLOBAL(lcdinvert)=!GLOBAL(lcdinvert); } - void lcdShiftH(bool right, bool wrap) { uint8_t tmp; for (int yb = 0; yb> 1) | ((tmp[x]<<3)&8); } - } } @@ -447,7 +414,7 @@ void lcdShift(int x, int y, bool wrap) { }; while(x-->0) - lcdShiftH(dir, wrap); + lcdShiftH(dir, wrap); if(y<0){ dir=false; @@ -462,6 +429,6 @@ void lcdShift(int x, int y, bool wrap) { }; while(y-->0) - lcdShiftV(dir, wrap); + lcdShiftV(dir, wrap); } From a005118640ed5fb6c891eb25e5a8356c2721f88a Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 20 Dec 2011 01:23:00 +0100 Subject: [PATCH 16/24] Move lcdread menu entry to debug loadable (add: lcdInit EXPORT, lcdRead needs it) --- firmware/l0dable/EXPORTS | 2 +- firmware/l0dable/debug.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/firmware/l0dable/EXPORTS b/firmware/l0dable/EXPORTS index 6dd540a..75ad3d9 100644 --- a/firmware/l0dable/EXPORTS +++ b/firmware/l0dable/EXPORTS @@ -124,4 +124,4 @@ i2cEngine i2cInit timer32Callback0 lcdRead - +lcdInit diff --git a/firmware/l0dable/debug.c b/firmware/l0dable/debug.c index b57a296..66c7b3f 100644 --- a/firmware/l0dable/debug.c +++ b/firmware/l0dable/debug.c @@ -25,6 +25,7 @@ void Qstatus(void); void getsp(void); void uptime(void); void uuid(void); +void lcdrtest(void); static const struct MENU submenu_debug={ "debug", { { "ChkBattery", &ChkBattery}, @@ -33,6 +34,7 @@ static const struct MENU submenu_debug={ "debug", { { "ChkFunk", &ChkFunk}, { "Qstatus", &Qstatus}, // { "ShowSP", &getsp}, + { "lcdrtest", &lcdrtest}, { "Uptime", &uptime}, { "Uuid", &uuid}, {NULL,NULL} @@ -314,3 +316,18 @@ void ChkFunk(){ while(!getInputRaw())work_queue(); }; +// //# MENU lcdread +void lcdrtest(void){ + lcdClear(); + lcdPrint("ID1:"); lcdPrintInt(lcdRead(128+64+16+8 +2 )); lcdNl(); + lcdPrint("ID2:"); lcdPrintInt(lcdRead(128+64+16+8 +2+1)); lcdNl(); + lcdPrint("ID3:"); lcdPrintInt(lcdRead(128+64+16+8+4 )); lcdNl(); + lcdPrint("ID4:"); lcdPrintInt(lcdRead(128+64+16+8+4 +1)); lcdNl(); + lcdPrint("Tmp:"); lcdPrintInt(lcdRead(128+64+16+8+4+2 )); lcdNl(); + lcdPrint("VM:"); lcdPrintInt(lcdRead(128+64+16+8+4+2+1)); lcdNl(); + // lcd_select(); mylcdWrite(0,128+32+8+4+1); lcd_deselect(); + delayms(10); + lcdInit(); + lcdRefresh(); + while(!getInputRaw())delayms(10); +}; From f10cc6798efde27f8ffa4ed9ce517fb7f99b49e0 Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 20 Dec 2011 01:30:24 +0100 Subject: [PATCH 17/24] added light sensor configuration to 1boot --- firmware/l0dable/1boot.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/firmware/l0dable/1boot.c b/firmware/l0dable/1boot.c index 0b1c4df..75f9a00 100644 --- a/firmware/l0dable/1boot.c +++ b/firmware/l0dable/1boot.c @@ -21,6 +21,15 @@ static const struct MENU submenu_privacy={ "Privacy?", { {NULL,NULL} }}; +static void yellow(); +static void green(); +static const char colors[][12] = {"0-yellow","1-green"}; +bool color_set; +static const struct MENU submenu_color={ "r0ket color?", { + { colors[0], &yellow}, + { colors[1], &green}, + {NULL,NULL} +}}; void ram(void){ @@ -28,10 +37,16 @@ void ram(void){ menuflags|=(MENU_JUSTONCE|MENU_BIG); screen_intro(); while (again) { + color_set = false; + while (!color_set) { + handleMenu(&submenu_color); + } + privacy_set = false; while (!privacy_set) { handleMenu(&submenu_privacy); } + input("Nickname?", GLOBAL(nickname), 32, 127, MAXNICK-1); getInputWaitRelease(); again = screen_overview(); @@ -41,6 +56,18 @@ void ram(void){ saveConfig(); }; +static void green() { + GLOBAL(daytrig) = 155; + GLOBAL(daytrighyst) = 10; + color_set = true; +} + +static void yellow() { + GLOBAL(daytrig) = 160; + GLOBAL(daytrighyst) = 15; + color_set = true; +} + static void privacy0() { set_privacy(0); } From 9e076bc3739367cb5ee446f3bd33310c2fd8fa9c Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 20 Dec 2011 01:53:48 +0100 Subject: [PATCH 18/24] added check for 'green' and 'yell0w' files for 1boot --- firmware/l0dable/1boot.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/firmware/l0dable/1boot.c b/firmware/l0dable/1boot.c index 75f9a00..a544663 100644 --- a/firmware/l0dable/1boot.c +++ b/firmware/l0dable/1boot.c @@ -2,6 +2,7 @@ #include "basic/basic.h" #include "basic/config.h" +#include "filesystem/ff.h" #include "lcd/print.h" #include "usetable.h" @@ -34,10 +35,22 @@ static const struct MENU submenu_color={ "r0ket color?", { void ram(void){ bool again = true; + FIL file; menuflags|=(MENU_JUSTONCE|MENU_BIG); screen_intro(); while (again) { color_set = false; + + if( f_open(&file, "yell0w", FA_OPEN_EXISTING|FA_READ) == 0 ){ + yellow(); + color_set = true; + } + + if( f_open(&file, "green", FA_OPEN_EXISTING|FA_READ) == 0 ){ + yellow(); + color_set = true; + } + while (!color_set) { handleMenu(&submenu_color); } From 4534c46aff85d6c1c2428d67e233d04a7b6cf207 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 20 Dec 2011 01:57:56 +0100 Subject: [PATCH 19/24] Add dependency to remake table.c for l0dables if changed --- firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/Makefile b/firmware/Makefile index 9a2351c..359e39b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -64,7 +64,7 @@ all: $(OUTFILE).bin protect: $(OUTFILE).bin $(LPCFIX) -p 2 $(OUTFILE).bin -l0dables: +l0dables: table.c @cd l0dable && $(MAKE) clean: From 6697274019775592272a7d44ebc6de4255fb22ea Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 20 Dec 2011 02:38:18 +0100 Subject: [PATCH 20/24] game: added jitter and interval fields, added text display --- firmware/l0dable/EXPORTS | 2 ++ firmware/l0dable/r_player.c | 60 +++++++++++++++++++++++++------ tools/game/r0ketrem0te/game.py | 2 +- tools/game/r0ketrem0te/packets.py | 11 ++++-- 4 files changed, 62 insertions(+), 13 deletions(-) diff --git a/firmware/l0dable/EXPORTS b/firmware/l0dable/EXPORTS index 75ad3d9..4706950 100644 --- a/firmware/l0dable/EXPORTS +++ b/firmware/l0dable/EXPORTS @@ -125,3 +125,5 @@ i2cInit timer32Callback0 lcdRead lcdInit +lcdSetCrsr + diff --git a/firmware/l0dable/r_player.c b/firmware/l0dable/r_player.c index d05b59f..90ca46d 100644 --- a/firmware/l0dable/r_player.c +++ b/firmware/l0dable/r_player.c @@ -51,22 +51,29 @@ struct packet{ uint8_t gameMac[5]; uint8_t gameChannel; //uint8_t playerMac[5]; playerMac = gameMac+1; - uint32_t gameId; + uint16_t gameId; uint8_t gameFlags; + uint8_t interval; + uint8_t jitter; uint8_t gameTitle[8]; }__attribute__((packed)) announce; struct join{ - uint32_t gameId; - uint8_t reserved[15]; + uint16_t gameId; + uint8_t reserved[17]; }__attribute__((packed)) join; }c; uint16_t crc; }__attribute__((packed)); -#define FLAGS_MASS_GAME 1 +#define FLAGS_MASS_GAME 1 +#define FLAGS_SHORT_PACKET 2 +#define FLAGS_LONG_RECV 4 + #define FLAGS_ACK_JOINOK 1 #define MASS_ID 1 +#define FLAGS_CLS 1 + /**************************************************************************/ /* l0dable for playing games which are announced by other r0kets with the l0dabel r_game */ /* Values of buf[3]: @@ -82,12 +89,16 @@ struct packet{ uint32_t ctr; uint32_t id; -uint32_t gameId; +uint16_t gameId; +uint8_t interval; +uint8_t jitter; +uint8_t flags; void sendButton(uint8_t button); void sendJoin(uint32_t game); void processPacket(struct packet *p); void processAnnounce(struct announce *a); +void processText(struct text *t); uint8_t selectGame(); void playGame(); @@ -124,14 +135,19 @@ void playGame(void) sendButton(button); while(1){ - len = nrf_rcv_pkt_time(32,sizeof(p),(uint8_t*)&p); + if( flags & FLAGS_LONG_RECV ) + len = nrf_rcv_pkt_time(64,sizeof(p),(uint8_t*)&p); + else + len = nrf_rcv_pkt_time(32,sizeof(p),(uint8_t*)&p); + if(len==sizeof(p)){ processPacket(&p); }else{ break; } } - delayms(20); + int rnd = getRandom() % jitter; + delayms(interval+rnd); }; } @@ -247,6 +263,9 @@ uint8_t selectGame() memcpy(config.mac0, games[selected].gameMac, 5); config.mac0[4]++; config.channel = games[selected].gameChannel; + interval = games[selected].interval; + jitter = games[selected].jitter; + flags = games[selected].gameFlags; nrf_config_set(&config); if( games[selected].gameFlags & FLAGS_MASS_GAME ) return 1; @@ -274,7 +293,15 @@ void processPacket(struct packet *p) { if ((p->len==32) && (p->protocol=='G') && (p->id == id || p->id == 0) ){ //check sanity, protocol, id if (p->command=='T'){ - //processText(&(p->c.text)); + struct packet ack; + ack.len=sizeof(p); + ack.protocol='G'; + ack.command='a'; + ack.id= id; + ack.ctr= p->ctr; + ack.c.ack.flags = 0; + nrf_snd_pkt_crc(sizeof(ack),(uint8_t*)&ack); + processText(&(p->c.text)); } else if (p->command=='N'){ processNickRequest(&(p->c.nickrequest)); @@ -293,6 +320,17 @@ void processAnnounce(struct announce *a) } } +void processText(struct text *t) +{ + + if( t->flags & FLAGS_CLS ) + lcdClear() ; + lcdSetCrsr(t->x, t->y); + t->text[16] = 0; + lcdPrint(t->text); + lcdRefresh(); +} + //increment ctr and send button state, id and ctr void sendButton(uint8_t button) { @@ -306,7 +344,9 @@ void sendButton(uint8_t button) //lcdClear(); //lcdPrint("Key:"); lcdPrintInt(buf[2]); lcdNl(); - - nrf_snd_pkt_crc(sizeof(p),(uint8_t*)&p); + if( flags & FLAGS_SHORT_PACKET ) + nrf_snd_pkt_crc(16,(uint8_t*)&p); + else + nrf_snd_pkt_crc(sizeof(p),(uint8_t*)&p); } diff --git a/tools/game/r0ketrem0te/game.py b/tools/game/r0ketrem0te/game.py index 3ee25c1..70d2303 100644 --- a/tools/game/r0ketrem0te/game.py +++ b/tools/game/r0ketrem0te/game.py @@ -19,7 +19,7 @@ class Game: self.gamemac = [int(random.random()*254) for x in range(1,6)] self.playermac = list(self.gamemac) self.playermac[4]+=1 - self.gameid = int(random.random()*(2**31)) + self.gameid = int(random.random()*(2**15)) self.bridge = bridge.Bridge(device, self.channel, self.gamemac) self.announce = packets.Announce(self.gamemac, self.channel, diff --git a/tools/game/r0ketrem0te/packets.py b/tools/game/r0ketrem0te/packets.py index 571ba5f..21bf1fe 100644 --- a/tools/game/r0ketrem0te/packets.py +++ b/tools/game/r0ketrem0te/packets.py @@ -4,6 +4,9 @@ def inttouint32(v): def uint32toint(v): return (ord(v[3])<< 24) + (ord(v[2])<<16) + (ord(v[1])<<8) + (ord(v[0])) +def inttouint16(v): + return chr(v&0xff)+chr((v>>8)&0xff) + class Packet: def __init__(self, command, id=None): self.ctr = 0 @@ -55,7 +58,7 @@ class Button(Packet): return s class Announce(Packet): - def __init__(self, gameMac, gameChannel, gameId, gameFlags, gameTitle): + def __init__(self, gameMac, gameChannel, gameId, gameFlags, gameTitle, interval=30, jitter=16): #always a broadcast Packet.__init__(self, 'A', 0) self.gameMac = gameMac @@ -63,14 +66,18 @@ class Announce(Packet): self.gameId = gameId self.gameFlags = gameFlags self.gameTitle = gameTitle[0:8] + self.interval = interval + self.jitter = jitter self.priority = 3 def toMessage(self): message = Packet.toMessage(self) message += ''.join([chr(x) for x in self.gameMac]) message += chr(self.gameChannel) - message += inttouint32(self.gameId) + message += inttouint16(self.gameId) message += chr(self.gameFlags) + message += chr(self.interval) + message += chr(self.jitter) message += self.gameTitle if len(self.gameTitle) < 8: message += '\x00'*(8-len(self.gameTitle)) From aa5a53716aa7de6213bd56531b1f336b7bfb096b Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 20 Dec 2011 02:43:11 +0100 Subject: [PATCH 21/24] openbeacon: saving seq number again --- firmware/funk/openbeacon.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/firmware/funk/openbeacon.c b/firmware/funk/openbeacon.c index 9e6b9ea..d34d9ad 100644 --- a/firmware/funk/openbeacon.c +++ b/firmware/funk/openbeacon.c @@ -8,18 +8,20 @@ #include "SECRETS" +#define SAVE_OPENBEACON 1 const uint8_t mac[5] = {1,2,3,2,1}; volatile uint32_t oid = 0; volatile uint32_t seq = 0; volatile uint8_t strength = 0; -#if ENCRYPT_OPENBEACON + +#if SAVE_OPENBEACON static void openbeaconSave(uint32_t s); #endif static struct NRF_CFG oldconfig; -#if ENCRYPT_OPENBEACON +#if SAVE_OPENBEACON static void openbeaconShutdown(void) { openbeaconSave(seq); @@ -69,7 +71,7 @@ void openbeaconSetup(void) { oid = GetUUID32(); strength = 0; -#if ENCRYPT_OPENBEACON +#if SAVE_OPENBEACON openbeaconRead(); openbeaconSaveBlock(); #endif @@ -108,11 +110,11 @@ uint8_t openbeaconSend(void) nrf_set_strength(strength); nrf_set_tx_mac(sizeof(mac), mac); - status = openbeaconSendPacket(oid, seq, 0xFF, strength++); + status = openbeaconSendPacket(oid, seq++, 0xFF, strength++); if( strength == 4 ) strength = 0; -#if ENCRYPT_OPENBEACON - if( (seq++ & OPENBEACON_SAVE) == OPENBEACON_SAVE ) +#if SAVE_OPENBEACON + if( (seq & OPENBEACON_SAVE) == OPENBEACON_SAVE ) openbeaconSaveBlock(); #endif nrf_config_set(&oldconfig); From 952f7cda4ce7888116aff676e4ef8e2c48d2f508 Mon Sep 17 00:00:00 2001 From: schneider Date: Tue, 20 Dec 2011 02:57:33 +0100 Subject: [PATCH 22/24] openbeacon: use the queue to write files --- firmware/funk/openbeacon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/funk/openbeacon.c b/firmware/funk/openbeacon.c index d34d9ad..8aa53f6 100644 --- a/firmware/funk/openbeacon.c +++ b/firmware/funk/openbeacon.c @@ -115,7 +115,7 @@ uint8_t openbeaconSend(void) strength = 0; #if SAVE_OPENBEACON if( (seq & OPENBEACON_SAVE) == OPENBEACON_SAVE ) - openbeaconSaveBlock(); + push_queue(&openbeaconSaveBlock); #endif nrf_config_set(&oldconfig); return status; From 5dcc09bae1a48be018e3a6552254710759b4b887 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 20 Dec 2011 03:18:22 +0100 Subject: [PATCH 23/24] fix return value when mesh recv is finished --- firmware/funk/mesh.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/firmware/funk/mesh.c b/firmware/funk/mesh.c index dc7cc78..33df421 100644 --- a/firmware/funk/mesh.c +++ b/firmware/funk/mesh.c @@ -301,12 +301,8 @@ uint8_t mesh_recvloop_plus(uint8_t state){ delayms_power(10); }; if(getTimer()>recvend || pktctr>MESHBUFSIZE) - state=0xff; + state=QS_END; }; - if(state==0xff){ - return 0xff; - }; - return state; }; From 4f08e8c1ea8175ed9f180ae1e0833fca21e4cc9b Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 20 Dec 2011 11:58:51 +0100 Subject: [PATCH 24/24] Add jquery v1.7.1 -- b-pong needs it and nobody wants to fetch it :) --- tools/game/bong/jquery.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tools/game/bong/jquery.js diff --git a/tools/game/bong/jquery.js b/tools/game/bong/jquery.js new file mode 100644 index 0000000..198b3ff --- /dev/null +++ b/tools/game/bong/jquery.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file