David Fletcher
/
CC3000WebServer
A Port of TI's Webserver for the CC3000
Revision 2:e6a185df9e4c, committed 2013-09-16
- Comitter:
- dflet
- Date:
- Mon Sep 16 18:37:14 2013 +0000
- Parent:
- 1:7a4efebd6e44
- Commit message:
- ADC and Leds now work on board and config.html page.
Changed in this revision
--- a/Board/Board.cpp Sat Sep 14 22:34:00 2013 +0000 +++ b/Board/Board.cpp Mon Sep 16 18:37:14 2013 +0000 @@ -36,10 +36,10 @@ ind4 = 1; break; case 5: - ind1 = 1; + //ind1 = 1; break; case 6: - ind4 = 1; + //ind4 = 1; break; case 7: @@ -79,10 +79,10 @@ ind4 = 0; break; case 5: - ind1 = 0; + //ind1 = 0; break; case 6: - ind4 = 0; + //ind4 = 0; break; case 7: @@ -107,6 +107,7 @@ void toggleLed(char ledNum) { + //printf("ToggleLed...%i\r\n",ledNum); switch(ledNum) { case 1: @@ -122,10 +123,10 @@ ind4 = !ind4; break; case 5: - ind1 = !ind1; + //ind1 = !ind1; break; case 6: - ind4 = !ind4; + //ind4 = !ind4; break; case 7: @@ -145,15 +146,16 @@ uint8_t GetLEDStatus() { + uint8_t status = 0; - if(ind1) + if(ind1 == 1) status |= (1 << 0); - if(ind2) + if(ind2 == 1) status |= (1 << 1); - if(ind3) - status |= ( 1<< 2); - if(ind4) + if(ind3 == 1) + status |= (1 << 2); + if(ind4 == 1) status |= (1 << 3); //if(LED145678_PORT_OUT & BIT2) // status |= (1 << 4); @@ -163,6 +165,6 @@ // status |= (1 << 6); //if(LED145678_PORT_OUT & BIT5) // status |= (1 << 7); - + //printf("Get Status....%i\r\n",status); return status; }
--- a/Board/Wheel.cpp Sat Sep 14 22:34:00 2013 +0000 +++ b/Board/Wheel.cpp Mon Sep 16 18:37:14 2013 +0000 @@ -111,7 +111,7 @@ positionData = ((LPC_ADC->ADGDR >> 4) & 0xFFF); /* read converted value */ /* read value needs scaling*/ LPC_ADC->ADCR &= ~(7<<24); /* stop conversion */ - printf("ADC Value %i\r\n",positionData); + //printf("ADC Value %i\r\n",positionData); //measure ADC value //ADC12IE = 0x01; // Enable interrupt //ADC12CTL0 |= ADC12SC; // Start sampling/conversion
--- a/WebServer/FlashDBContentData.cpp Sat Sep 14 22:34:00 2013 +0000 +++ b/WebServer/FlashDBContentData.cpp Mon Sep 16 18:37:14 2013 +0000 @@ -2,162 +2,121 @@ extern const char FlashDBContentData[] = { 0x01, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x09, 0x00, 0x2e, 0x00, 0x0c, 0x00, - 0x37, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x06, 0x43, 0x00, 0x00, 0x00, 0x0b, 0x00, - 0xd2, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xea, 0x02, 0xdd, 0x06, 0x00, 0x00, 0x74, 0x65, + 0x37, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf5, 0x04, 0x43, 0x00, 0x00, 0x00, 0x0b, 0x00, + 0x38, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xf5, 0x01, 0x43, 0x05, 0x00, 0x00, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x68, - 0x74, 0x6d, 0x6c, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0b, 0xad, 0x58, 0x7b, - 0x73, 0xda, 0x46, 0x10, 0xff, 0x1b, 0xcf, 0xf8, 0x3b, 0x5c, 0x2e, 0x53, 0x07, 0x4a, 0x40, 0x0f, - 0x70, 0x1e, 0x46, 0xa2, 0x23, 0x24, 0xd9, 0x30, 0x91, 0x81, 0x82, 0x6c, 0xc7, 0xed, 0x64, 0x3a, - 0xb2, 0x74, 0x80, 0x1a, 0x90, 0xa8, 0x24, 0xec, 0x78, 0x12, 0x7f, 0xf7, 0xee, 0x9d, 0x1e, 0x48, - 0x3c, 0x5c, 0x3a, 0x8e, 0x67, 0x8c, 0x74, 0x7b, 0xfb, 0xf8, 0xed, 0xee, 0xdd, 0xee, 0x82, 0xf4, - 0x4a, 0x1b, 0xa8, 0xe6, 0xed, 0x50, 0x47, 0x5d, 0xf3, 0xd2, 0x40, 0xc3, 0xab, 0x8e, 0xd1, 0x53, - 0x11, 0xae, 0x71, 0xdc, 0x4d, 0x43, 0xe5, 0x38, 0xcd, 0xd4, 0xe2, 0x8d, 0x66, 0x9d, 0x47, 0x66, - 0x60, 0x79, 0xa1, 0x1b, 0xb9, 0xbe, 0x67, 0xcd, 0x39, 0x4e, 0xef, 0xe3, 0xf6, 0xf1, 0x91, 0x44, - 0x77, 0xd9, 0x53, 0x57, 0x34, 0x78, 0x96, 0xa4, 0x4b, 0xdd, 0x54, 0x40, 0xc6, 0x1c, 0xd6, 0xf4, - 0xdf, 0xaf, 0x7a, 0xd7, 0x32, 0x56, 0x07, 0x7d, 0x53, 0xef, 0x9b, 0x35, 0x6a, 0x05, 0xa3, 0x64, - 0x25, 0xe3, 0x88, 0x7c, 0x8b, 0xb8, 0x59, 0xb4, 0x98, 0xb7, 0x90, 0x3d, 0xb3, 0x82, 0x90, 0x44, - 0xf2, 0x83, 0xeb, 0x39, 0xfe, 0x43, 0x58, 0x13, 0xc4, 0x53, 0x11, 0x33, 0x65, 0x66, 0xcf, 0x34, - 0xf4, 0xf6, 0xe5, 0x1d, 0x71, 0x90, 0xe5, 0x39, 0x48, 0x55, 0x1b, 0x3c, 0xcf, 0x4b, 0x5c, 0x4c, - 0xce, 0xac, 0xf5, 0x95, 0x4b, 0x5d, 0xc6, 0x17, 0x7a, 0x5f, 0x1f, 0x29, 0xe6, 0x60, 0x94, 0x33, - 0x32, 0x58, 0x12, 0x6f, 0x30, 0x99, 0xb8, 0x36, 0xa9, 0xfb, 0xc1, 0x14, 0x35, 0xea, 0x22, 0x42, - 0xe5, 0x1b, 0xd7, 0x6b, 0x88, 0x15, 0xbc, 0x29, 0xaf, 0x8e, 0x74, 0xc5, 0xd4, 0xb5, 0x9c, 0x34, - 0xdf, 0xe2, 0xb7, 0xb9, 0xba, 0x4a, 0xff, 0x42, 0xd7, 0x3a, 0xb7, 0x39, 0x3e, 0xcd, 0xba, 0x27, - 0xe8, 0x7c, 0x4e, 0x22, 0x7b, 0x46, 0x82, 0x7d, 0x12, 0x39, 0x7e, 0x91, 0x17, 0x1a, 0xfc, 0x47, - 0xa1, 0xd9, 0x12, 0xde, 0x0b, 0xef, 0x9b, 0x22, 0x9f, 0x58, 0x19, 0xab, 0xa3, 0xde, 0xd0, 0x84, - 0xd7, 0x7b, 0x2b, 0x60, 0x11, 0x0c, 0xc8, 0x3f, 0x2b, 0x12, 0x46, 0x48, 0x46, 0x1e, 0x79, 0x40, - 0x9f, 0x2f, 0x8d, 0x6e, 0x14, 0x2d, 0x47, 0x31, 0xb1, 0x5c, 0x69, 0xc5, 0x8c, 0xb6, 0xbf, 0xf2, - 0x28, 0x0b, 0x9f, 0xac, 0x03, 0x62, 0x13, 0xf7, 0x9e, 0x38, 0x23, 0x12, 0x2e, 0x7d, 0x2f, 0x24, - 0xb0, 0x25, 0x24, 0x5b, 0x21, 0xf1, 0x9c, 0xbe, 0x2f, 0x53, 0xce, 0xc9, 0xca, 0xb3, 0x69, 0x26, - 0x91, 0xe9, 0x4f, 0xa7, 0x73, 0x62, 0xe8, 0x5a, 0x19, 0x82, 0xef, 0xad, 0x16, 0x95, 0xe3, 0xa3, - 0xef, 0x00, 0x26, 0x67, 0xbe, 0xee, 0x43, 0x10, 0xcb, 0x78, 0x38, 0x18, 0x9b, 0xf8, 0x2d, 0xe6, - 0xe6, 0xc4, 0xa9, 0x85, 0x91, 0x15, 0xad, 0xc2, 0xdf, 0x80, 0x5d, 0xc6, 0xd5, 0x58, 0xae, 0x8a, - 0x4f, 0x2c, 0xa6, 0x51, 0x8e, 0x98, 0x46, 0xfc, 0x16, 0x45, 0xc1, 0x8a, 0x50, 0x94, 0x05, 0x65, - 0x14, 0x03, 0xc3, 0xfe, 0x74, 0x7c, 0x94, 0x83, 0xb1, 0x24, 0x81, 0xeb, 0x3b, 0xae, 0x7d, 0xb5, - 0x74, 0xac, 0x88, 0x94, 0x2b, 0x14, 0x83, 0x3b, 0x29, 0x6f, 0x3b, 0x03, 0xde, 0xa0, 0x1f, 0x3f, - 0x12, 0xaf, 0xdb, 0x32, 0x6a, 0x02, 0xe0, 0x12, 0xe5, 0xa6, 0xec, 0xb1, 0x83, 0x52, 0x83, 0xd2, - 0x62, 0xe2, 0x33, 0x8e, 0x3c, 0xcc, 0x08, 0x99, 0xa7, 0xae, 0xa4, 0xe0, 0xa7, 0x24, 0x8a, 0x29, - 0xb5, 0xbc, 0x03, 0xa5, 0xdd, 0x2e, 0x00, 0x7d, 0x47, 0xb4, 0xf9, 0x78, 0x27, 0x9f, 0x17, 0x58, - 0xc6, 0xd0, 0xaa, 0xd5, 0x6d, 0x75, 0xbe, 0x17, 0x10, 0xcb, 0x79, 0xa4, 0x66, 0x09, 0xdc, 0x04, - 0x6f, 0x4a, 0x95, 0xa4, 0x81, 0x29, 0x33, 0x57, 0x12, 0x5f, 0xc0, 0x45, 0x54, 0xce, 0x8b, 0x32, - 0xc1, 0x31, 0x15, 0x94, 0xe5, 0x26, 0x3a, 0x39, 0x41, 0x05, 0x98, 0xcc, 0x0f, 0x59, 0x86, 0xf3, - 0x15, 0x2b, 0x49, 0xb5, 0x94, 0xf6, 0x1c, 0x11, 0xb6, 0x97, 0x3b, 0x23, 0x6c, 0x4d, 0xcf, 0x0d, - 0x8b, 0x14, 0x30, 0x15, 0x4d, 0xc7, 0xb2, 0x26, 0x5c, 0xe3, 0x7a, 0xb8, 0x9c, 0xbb, 0x51, 0x19, - 0x9f, 0xe1, 0x4a, 0x5e, 0xcc, 0x9e, 0x81, 0x0c, 0x93, 0xfd, 0x53, 0xfc, 0x52, 0xa7, 0x97, 0x5c, - 0xf5, 0x1d, 0xa2, 0x44, 0x65, 0x3e, 0x63, 0x9b, 0xf8, 0x41, 0x99, 0xb2, 0xba, 0x72, 0xa3, 0x85, - 0x5c, 0xe9, 0x03, 0x7c, 0x54, 0xab, 0x09, 0xda, 0x0c, 0x2e, 0xcd, 0x2c, 0xe8, 0x3a, 0x41, 0x42, - 0xba, 0xb3, 0xde, 0x2a, 0x39, 0xbe, 0xbd, 0x5a, 0x10, 0x2f, 0xaa, 0x43, 0xe6, 0xf4, 0x39, 0xa1, - 0xaf, 0x9d, 0xc7, 0x9e, 0x53, 0xc6, 0xf4, 0x58, 0xfa, 0xb8, 0x5a, 0x76, 0xab, 0x42, 0xa5, 0x02, - 0xd6, 0x89, 0xfd, 0x95, 0x38, 0x32, 0x4d, 0x69, 0xeb, 0x20, 0xe1, 0x4c, 0x34, 0x8c, 0x1e, 0xe7, - 0xa4, 0x6e, 0xfb, 0x73, 0x3f, 0x90, 0xf1, 0x34, 0x20, 0xc4, 0xc3, 0x99, 0x86, 0xa7, 0xf4, 0x85, - 0xcc, 0x43, 0xf2, 0x62, 0x70, 0x13, 0x0b, 0xb4, 0xbc, 0x04, 0x5d, 0x40, 0x9c, 0x1d, 0xd8, 0x58, - 0x1e, 0xec, 0x59, 0xbb, 0x9d, 0x25, 0xf9, 0x29, 0x97, 0xa5, 0x7b, 0x7f, 0x1e, 0x59, 0xec, 0xcc, - 0x2d, 0x69, 0x15, 0xee, 0x79, 0x51, 0x39, 0xce, 0x99, 0xf0, 0x25, 0x4b, 0xd3, 0x5e, 0x24, 0x37, - 0x4b, 0x3f, 0xee, 0x08, 0xb8, 0x52, 0x77, 0x3d, 0x8f, 0x04, 0xac, 0x59, 0xa4, 0x59, 0xe7, 0xbf, - 0xfc, 0xb7, 0x82, 0xc4, 0xfc, 0x4e, 0x79, 0x21, 0x93, 0x5f, 0x83, 0x4c, 0xde, 0x7e, 0x15, 0x78, - 0x7e, 0x7b, 0x33, 0xf3, 0x20, 0x21, 0x71, 0x4d, 0xfe, 0xc3, 0xc7, 0xcc, 0x0b, 0x38, 0x46, 0x9b, - 0x0c, 0x15, 0x5a, 0x50, 0xf8, 0xad, 0x03, 0xb7, 0x17, 0x6e, 0x38, 0x77, 0x1d, 0x12, 0x08, 0x38, - 0x8d, 0xfb, 0x9d, 0x65, 0x7f, 0x9d, 0x06, 0x70, 0xd3, 0x1d, 0x95, 0x66, 0x00, 0x20, 0xe0, 0xd7, - 0xe7, 0xec, 0x0f, 0x6f, 0xc6, 0x3a, 0x77, 0x42, 0x7e, 0x8e, 0x1d, 0x9e, 0xff, 0x00, 0xcd, 0x70, - 0x9d, 0xef, 0x03, 0x94, 0x3d, 0xb8, 0x4e, 0x34, 0x93, 0xd3, 0x78, 0x55, 0x11, 0xfe, 0x05, 0xb7, - 0x4a, 0xa8, 0x08, 0x34, 0x7e, 0xb0, 0x4f, 0xfa, 0x41, 0xff, 0xd3, 0x52, 0x16, 0x3f, 0xab, 0x71, - 0xb1, 0x80, 0x86, 0x6d, 0xba, 0x0b, 0xe2, 0xaf, 0xa2, 0x72, 0x56, 0xc5, 0xcb, 0x15, 0xf4, 0x7d, - 0xb3, 0x92, 0xb7, 0xd0, 0xd3, 0x5b, 0x04, 0xd9, 0xe2, 0x93, 0xa2, 0x2f, 0x71, 0x59, 0x9f, 0x83, - 0x96, 0x67, 0xde, 0x1a, 0x3a, 0xa2, 0x93, 0x41, 0x32, 0x10, 0xd8, 0x61, 0x18, 0x37, 0xc3, 0x57, - 0xb5, 0x1a, 0x85, 0xd0, 0x15, 0xeb, 0xf6, 0xdf, 0x5f, 0xd1, 0x77, 0x34, 0xf1, 0xbd, 0xa8, 0x36, - 0xb1, 0x16, 0xee, 0xfc, 0xf1, 0x0c, 0xe1, 0xb1, 0xbb, 0x18, 0xaf, 0x3c, 0x8c, 0x28, 0xba, 0x5a, - 0x8d, 0x09, 0x70, 0x4c, 0x17, 0x1d, 0x45, 0xb8, 0x64, 0x16, 0x91, 0x3a, 0x03, 0xed, 0x16, 0x19, - 0xd0, 0x7d, 0x65, 0x4c, 0xbc, 0xda, 0x45, 0x07, 0x23, 0xad, 0x37, 0x92, 0xb1, 0x61, 0xc2, 0x88, - 0x30, 0xe8, 0x1b, 0x03, 0x45, 0x93, 0xf1, 0x26, 0xdc, 0x78, 0xa8, 0x11, 0x90, 0x62, 0xf4, 0x2e, - 0xfa, 0xb2, 0x0a, 0xfd, 0x5a, 0x1f, 0xb5, 0xa5, 0x73, 0x68, 0xdd, 0xd0, 0xbf, 0x8d, 0x01, 0x88, - 0xbf, 0x9e, 0x4c, 0x78, 0x1a, 0xf8, 0x76, 0x3c, 0x8d, 0xa0, 0x1b, 0x72, 0x87, 0xc6, 0x24, 0xb8, - 0x27, 0x81, 0xc4, 0x51, 0xbe, 0x36, 0x00, 0x10, 0x98, 0x16, 0x11, 0xa9, 0x86, 0x32, 0x1e, 0xcb, - 0xf8, 0x01, 0x2a, 0x26, 0x09, 0x00, 0xef, 0x01, 0x5a, 0x6f, 0xc8, 0xdc, 0xf6, 0x17, 0x04, 0x1a, - 0xf3, 0xf1, 0x11, 0x1b, 0x7c, 0x3a, 0xbe, 0x15, 0xc0, 0xe8, 0xe3, 0x7b, 0x13, 0x77, 0xba, 0x0a, - 0x2c, 0x1a, 0xe8, 0xfa, 0xda, 0x92, 0x48, 0x2d, 0x25, 0x0a, 0xd9, 0xc4, 0xa4, 0x74, 0x20, 0xa2, - 0x37, 0x3d, 0xcd, 0xec, 0xca, 0x02, 0x94, 0x7e, 0xd4, 0x19, 0x8c, 0x34, 0x7d, 0x24, 0xf3, 0x48, - 0xd5, 0x0d, 0x63, 0xa8, 0x68, 0x5a, 0x0f, 0xe2, 0x21, 0xb2, 0xd5, 0x78, 0xa8, 0xa8, 0x6c, 0x45, - 0x25, 0x41, 0x74, 0x84, 0xae, 0x63, 0x80, 0xe6, 0x60, 0xc8, 0x48, 0x40, 0xd3, 0x12, 0x5d, 0xef, - 0x78, 0x3e, 0x26, 0x95, 0xa4, 0x61, 0xd1, 0x0d, 0x06, 0xf2, 0x8e, 0x82, 0x7c, 0x13, 0x22, 0x18, - 0x24, 0xe0, 0x98, 0xe4, 0xa0, 0xa2, 0x55, 0xe8, 0x7a, 0xd3, 0x64, 0x72, 0x43, 0x56, 0x88, 0xac, - 0x58, 0x4b, 0x1a, 0xb1, 0xe1, 0x1e, 0xad, 0x4d, 0x64, 0x10, 0xaa, 0x30, 0xf2, 0xa9, 0xbe, 0x28, - 0xf0, 0xe7, 0xf5, 0x1c, 0xf3, 0xf9, 0x60, 0x74, 0x89, 0x14, 0xd5, 0xec, 0x0d, 0xfa, 0x32, 0xc6, - 0x09, 0xb5, 0x24, 0x69, 0xbd, 0xeb, 0xa2, 0x96, 0xf4, 0x6e, 0x80, 0x76, 0x76, 0x3c, 0x64, 0xbc, - 0xb0, 0x82, 0xa9, 0xeb, 0xd5, 0xee, 0xfc, 0x28, 0xf2, 0x17, 0x67, 0x88, 0xb7, 0x17, 0xb8, 0x2d, - 0xa5, 0xa3, 0x1a, 0x2b, 0xcb, 0x02, 0x10, 0x38, 0xa5, 0x40, 0xdc, 0x41, 0xf2, 0x7c, 0x71, 0x9b, - 0x28, 0xee, 0xe2, 0x6b, 0x6c, 0x13, 0x1b, 0xbb, 0xf8, 0x9a, 0xdb, 0xc4, 0xe6, 0x2e, 0xbe, 0xd3, - 0x6d, 0x62, 0x42, 0xca, 0xbc, 0xed, 0xf5, 0x87, 0x57, 0x66, 0x7c, 0xad, 0xd4, 0xae, 0xae, 0x7e, - 0xea, 0x0c, 0x3e, 0xaf, 0x99, 0xff, 0x12, 0x30, 0xcd, 0xf3, 0xd5, 0x7a, 0x95, 0x84, 0x86, 0x55, - 0x07, 0x08, 0x49, 0xbd, 0x71, 0x6a, 0x2f, 0x5a, 0x68, 0x46, 0xdc, 0xe9, 0x2c, 0x4a, 0xd7, 0xf4, - 0xc6, 0xa8, 0xf0, 0xdd, 0xe0, 0x93, 0x8c, 0xd7, 0x23, 0xe3, 0x1b, 0xe1, 0x0d, 0x5c, 0x18, 0x78, - 0x4b, 0x2d, 0x0b, 0x52, 0x07, 0xce, 0xf5, 0xf3, 0xe6, 0xc5, 0x82, 0x79, 0xf1, 0x25, 0xe6, 0xc5, - 0x0d, 0xf3, 0xe2, 0x01, 0xe6, 0x1b, 0x05, 0xf3, 0x8d, 0x97, 0x98, 0x6f, 0x6c, 0x98, 0x6f, 0x1c, - 0x60, 0xbe, 0x59, 0x30, 0xdf, 0x7c, 0x89, 0xf9, 0xe6, 0x86, 0xf9, 0xe6, 0xfa, 0x82, 0x40, 0x39, - 0x84, 0xbb, 0x90, 0xde, 0x16, 0x8e, 0x5e, 0x97, 0x74, 0x91, 0x2f, 0x10, 0xef, 0xfe, 0x4f, 0x7d, - 0x60, 0xc2, 0xb9, 0x2b, 0x65, 0x6a, 0xd9, 0xfb, 0xee, 0x9a, 0x70, 0xc3, 0xc6, 0xc6, 0x31, 0x1b, - 0x43, 0x73, 0xd0, 0xb6, 0xb9, 0xb3, 0xa3, 0xbc, 0x1e, 0x27, 0xd8, 0x79, 0x66, 0x0a, 0xa0, 0x06, - 0x0c, 0x13, 0x2a, 0xb4, 0x20, 0xa9, 0xd3, 0x86, 0xef, 0x7f, 0x9d, 0xf6, 0x81, 0xfa, 0xd2, 0xe9, - 0x82, 0xa9, 0xbb, 0x4e, 0xfa, 0x9e, 0x62, 0x07, 0x7e, 0x18, 0x66, 0xd2, 0x4b, 0x3f, 0x82, 0x56, - 0xe9, 0x42, 0xcd, 0x85, 0x1a, 0xbd, 0xc7, 0x04, 0x7c, 0xe5, 0xd4, 0xd6, 0xa1, 0x5d, 0x47, 0xe1, - 0xb9, 0x80, 0x3c, 0x57, 0x70, 0x3a, 0xa3, 0x1c, 0x6b, 0xc1, 0x95, 0x7c, 0x7a, 0x1a, 0xc2, 0xbb, - 0x34, 0x3d, 0xc2, 0x21, 0xe9, 0xd9, 0x00, 0x94, 0xd4, 0xef, 0xae, 0xde, 0xbb, 0xe8, 0x9a, 0xb2, - 0x78, 0x9a, 0xdf, 0xd8, 0x6b, 0x88, 0x3f, 0xd0, 0xd0, 0xb6, 0xad, 0x0d, 0x73, 0xef, 0xd7, 0x69, - 0x48, 0x07, 0x90, 0xb8, 0x6e, 0x71, 0xf9, 0x38, 0x65, 0x91, 0xdb, 0x26, 0xe7, 0xe3, 0x9c, 0x12, - 0x28, 0xe6, 0x22, 0x2d, 0x4d, 0xbd, 0xa1, 0x9f, 0x9b, 0x69, 0xc8, 0xef, 0xfc, 0x00, 0xec, 0x9d, - 0x21, 0xcf, 0xf7, 0x48, 0x0b, 0x86, 0x42, 0xc7, 0x81, 0x16, 0x94, 0x0b, 0x7d, 0x21, 0xfc, 0x9b, - 0x19, 0x28, 0x26, 0x7b, 0x0b, 0xc7, 0x26, 0x88, 0x3d, 0x27, 0xa3, 0xc8, 0x26, 0x0d, 0x37, 0xec, - 0x66, 0x16, 0xd7, 0xe2, 0x85, 0x20, 0xa4, 0x9a, 0xd6, 0x6a, 0x24, 0x2e, 0x6b, 0x69, 0x3f, 0xad, - 0xdd, 0xaf, 0x0d, 0xef, 0xee, 0xc1, 0x90, 0xc0, 0xee, 0x48, 0x3f, 0x97, 0x31, 0x07, 0xb5, 0x8a, - 0x7c, 0xab, 0xd3, 0x5f, 0x6b, 0x70, 0x32, 0xb6, 0x8c, 0x7b, 0x7f, 0xe8, 0xf2, 0x69, 0xbb, 0x0b, - 0xd7, 0x26, 0x1b, 0x46, 0x94, 0xf6, 0xb6, 0x5f, 0xcf, 0x7b, 0x92, 0x8f, 0x4b, 0x2c, 0x0b, 0x37, - 0x0f, 0xa6, 0xb6, 0x78, 0x8c, 0xa3, 0x3f, 0x2d, 0xfd, 0x0b, 0x44, 0x53, 0x4c, 0xd9, 0xa1, 0x12, - 0x00, 0x00, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x1f, 0x8b, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0b, 0x9d, 0x54, 0x5b, 0x6f, 0x9b, 0x30, 0x14, 0x7e, 0xde, - 0xa4, 0xfd, 0x87, 0x33, 0x26, 0x4d, 0x9b, 0xd4, 0x04, 0x92, 0x34, 0x5a, 0xb7, 0x42, 0x24, 0x02, - 0x4e, 0x82, 0x44, 0x43, 0x46, 0xdd, 0x46, 0x7d, 0x74, 0x88, 0x49, 0xac, 0x82, 0xcd, 0xc0, 0x6d, - 0x96, 0x7f, 0xbf, 0xc3, 0x65, 0x5d, 0xd6, 0xae, 0x2f, 0x7b, 0x01, 0xdf, 0xbe, 0x8b, 0x8f, 0x3f, - 0xdb, 0x7e, 0xef, 0x47, 0x1e, 0xbd, 0x5b, 0x11, 0x58, 0xd0, 0xab, 0x10, 0x56, 0x37, 0xd3, 0x30, - 0xf0, 0xc0, 0xe8, 0x99, 0xe6, 0x7a, 0xe4, 0x99, 0xa6, 0x4f, 0xfd, 0x76, 0xe2, 0xbc, 0x6f, 0x01, - 0x2d, 0x99, 0xac, 0x84, 0x16, 0x4a, 0xb2, 0xcc, 0x34, 0xc9, 0xd2, 0x98, 0xbc, 0x7b, 0x6b, 0xd7, - 0xb3, 0xcd, 0x9f, 0xb8, 0x3e, 0xfe, 0xdf, 0xd8, 0x57, 0x84, 0xba, 0x88, 0xa1, 0xab, 0x1e, 0xf9, - 0x7e, 0x13, 0xdc, 0x3a, 0x86, 0x17, 0x2d, 0x29, 0x59, 0xd2, 0x5e, 0xad, 0x62, 0x40, 0xd7, 0x73, - 0x0c, 0xcd, 0x7f, 0x6a, 0x73, 0xaf, 0xf3, 0xec, 0x12, 0x92, 0x3d, 0x2b, 0x2b, 0xae, 0x9d, 0x83, - 0x90, 0x5b, 0x75, 0xa8, 0x7a, 0x83, 0xe1, 0x78, 0x68, 0x34, 0x64, 0x34, 0xa0, 0x21, 0x99, 0x5c, - 0x6d, 0xf8, 0x16, 0x98, 0xdc, 0x82, 0xe7, 0x8d, 0x2c, 0xcb, 0xb2, 0xcd, 0x76, 0xf8, 0x49, 0x6d, - 0xe9, 0x5e, 0x11, 0xc7, 0x98, 0x93, 0x25, 0x89, 0x5d, 0x1a, 0xc5, 0x27, 0x22, 0x51, 0xc1, 0x65, - 0x94, 0xa6, 0x22, 0xe1, 0x7d, 0x55, 0xee, 0x60, 0xd4, 0x1f, 0x02, 0x7c, 0x5a, 0x0b, 0x39, 0x1a, - 0x7e, 0x36, 0x9e, 0xe3, 0xbd, 0x98, 0xb8, 0x94, 0xf8, 0x27, 0x68, 0xeb, 0xd2, 0x7a, 0xb9, 0x6a, - 0xe1, 0x2e, 0xe7, 0xc4, 0x9f, 0xde, 0x9d, 0xac, 0xf3, 0xd9, 0x23, 0x87, 0x59, 0xc6, 0x75, 0xb2, - 0xe7, 0xe5, 0x6b, 0x88, 0x93, 0xf5, 0x43, 0x6b, 0x30, 0xb2, 0xbe, 0x0e, 0xce, 0x2f, 0x07, 0x17, - 0xd6, 0xf8, 0x7c, 0x6c, 0xfd, 0xa7, 0x8a, 0x6d, 0x76, 0x45, 0xb7, 0xa7, 0x91, 0x7f, 0x07, 0x21, - 0x42, 0x1c, 0x83, 0xcb, 0xde, 0x7c, 0x6a, 0x80, 0x1f, 0xc4, 0x8e, 0x11, 0xd2, 0xb8, 0x3d, 0xa3, - 0x01, 0xb8, 0x61, 0x30, 0x5f, 0x3a, 0x1e, 0x12, 0x91, 0x78, 0x62, 0xcf, 0x90, 0x13, 0x89, 0xc3, - 0x08, 0x17, 0x7d, 0x48, 0x53, 0xac, 0x29, 0x5a, 0x58, 0xf3, 0x2c, 0x51, 0x39, 0x07, 0xaa, 0xba, - 0x3a, 0xc3, 0x9a, 0x6f, 0xe0, 0x9a, 0x97, 0x8f, 0xbc, 0xb4, 0xcd, 0x1a, 0x32, 0x41, 0xc5, 0x41, - 0x4d, 0xb8, 0x82, 0x6b, 0x7a, 0x17, 0xa2, 0xcf, 0x9c, 0x95, 0x3b, 0x21, 0x7b, 0x1b, 0xa5, 0xb5, - 0xca, 0xbf, 0x81, 0x95, 0xe4, 0xc6, 0xc4, 0x9e, 0xc6, 0x8d, 0xb9, 0x55, 0xfd, 0xed, 0x14, 0x9b, - 0xb3, 0x74, 0xa7, 0x21, 0x81, 0x75, 0xe0, 0xd3, 0x85, 0x33, 0x18, 0x22, 0xfd, 0x34, 0x8a, 0x7d, - 0x12, 0x3b, 0x16, 0x78, 0x24, 0x0c, 0x57, 0xae, 0xef, 0x07, 0xb8, 0x81, 0x61, 0xd3, 0xbb, 0x5e, - 0xb9, 0x5e, 0xd3, 0xab, 0x91, 0x08, 0x6d, 0x18, 0xea, 0x86, 0xdf, 0x11, 0x8c, 0xbe, 0x8c, 0x61, - 0x41, 0x82, 0xf9, 0x82, 0x3a, 0xe3, 0x8b, 0x21, 0x1a, 0xa3, 0xfe, 0xf3, 0x25, 0x58, 0x58, 0xb8, - 0x6d, 0xf7, 0x4d, 0xa3, 0x55, 0x3b, 0xfb, 0x06, 0xad, 0xb7, 0x43, 0x21, 0x99, 0xd1, 0x36, 0x58, - 0xe5, 0x83, 0xac, 0x80, 0x41, 0x95, 0xb3, 0x2c, 0x83, 0x9c, 0xe7, 0xaa, 0x3c, 0x42, 0xaa, 0x94, - 0x2e, 0x4a, 0x21, 0xf5, 0x49, 0x0d, 0xfa, 0x10, 0xe8, 0x96, 0x64, 0xcf, 0x2a, 0x48, 0x58, 0xc1, - 0x36, 0x22, 0x13, 0xfa, 0x08, 0x5a, 0xc1, 0x5e, 0x55, 0x1a, 0x2a, 0xcd, 0xb4, 0x48, 0x9a, 0xa0, - 0x6e, 0x8f, 0x92, 0xe5, 0xd8, 0x3e, 0x20, 0xba, 0x60, 0x3b, 0x5e, 0xf5, 0xdb, 0x7a, 0xbc, 0xb4, - 0x10, 0x48, 0xb8, 0x66, 0x79, 0x91, 0x71, 0x60, 0x45, 0x91, 0x89, 0x84, 0xd5, 0xf7, 0xeb, 0x0c, - 0x6e, 0x2a, 0x21, 0x77, 0x4f, 0xe7, 0x80, 0x47, 0xdb, 0x62, 0x13, 0x25, 0x25, 0x4f, 0xb4, 0x78, - 0x44, 0xdd, 0xb3, 0x13, 0x6f, 0x50, 0x94, 0xea, 0x51, 0x6c, 0xf9, 0x73, 0x5f, 0x25, 0x6e, 0x47, - 0xf3, 0xec, 0x08, 0x08, 0xd4, 0xa5, 0xca, 0x5a, 0x96, 0xea, 0x20, 0x30, 0x44, 0xb5, 0x40, 0x48, - 0xfc, 0x8f, 0x65, 0xf5, 0xe3, 0x41, 0x5d, 0x56, 0xa0, 0xa4, 0xa9, 0xd2, 0xb4, 0xb5, 0x2f, 0xaa, - 0x22, 0x63, 0xc7, 0x0a, 0xf4, 0x9e, 0x37, 0xdb, 0x7a, 0xc0, 0xe9, 0x14, 0x0e, 0x7b, 0xce, 0x3b, - 0x0a, 0xdc, 0xe8, 0x3d, 0x14, 0xc8, 0x2d, 0xd1, 0x6f, 0xce, 0x35, 0x5a, 0xe8, 0xbc, 0x61, 0x45, - 0x51, 0xb8, 0x06, 0x36, 0xd5, 0xdd, 0x28, 0x56, 0x76, 0xdf, 0x57, 0x6b, 0x60, 0xe3, 0x83, 0x11, - 0x93, 0x99, 0x63, 0x98, 0xc8, 0x91, 0x8a, 0x5d, 0xbf, 0x7e, 0x16, 0x8c, 0x89, 0x97, 0xd5, 0x22, - 0x18, 0x76, 0x6e, 0x9b, 0xee, 0xa4, 0x66, 0xc5, 0xe4, 0x27, 0xf7, 0xdd, 0x1e, 0x5a, 0x57, 0xb5, - 0xdb, 0x16, 0xf4, 0x50, 0xf2, 0x67, 0xaa, 0xa7, 0x72, 0x5d, 0x2a, 0x9b, 0xce, 0xef, 0xe1, 0x7f, - 0x85, 0x06, 0x73, 0xf5, 0x27, 0x4c, 0xd8, 0x68, 0xa3, 0x6b, 0x36, 0xd9, 0x6d, 0x52, 0xfd, 0x14, - 0xe8, 0x8e, 0xf3, 0xaf, 0xb4, 0x9b, 0xf5, 0x45, 0x6c, 0x6f, 0x66, 0xfd, 0x2c, 0xfe, 0x02, 0x4e, - 0x9e, 0x21, 0x33, 0x5d, 0x05, 0x00, 0x00 + 0x74, 0x6d, 0x6c, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0b, 0xad, 0x57, 0xe1, + 0x6e, 0xdb, 0x36, 0x10, 0xfe, 0xed, 0x00, 0x79, 0x07, 0x8e, 0xc3, 0x12, 0x79, 0x6e, 0x6c, 0xc9, + 0x76, 0x8a, 0x2e, 0xb1, 0x34, 0xb4, 0x69, 0x86, 0x14, 0x48, 0xd6, 0xa0, 0xf1, 0x96, 0x0d, 0x43, + 0x30, 0xd0, 0xd2, 0xd9, 0xe6, 0x22, 0x8b, 0x1a, 0x45, 0x39, 0xc9, 0xda, 0xbc, 0xfb, 0x8e, 0xa4, + 0x24, 0x4b, 0xb6, 0x93, 0x16, 0x5b, 0x03, 0x44, 0xa2, 0xc8, 0xbb, 0xfb, 0xbe, 0xe3, 0x1d, 0xef, + 0xe8, 0xd1, 0x37, 0x6f, 0xdf, 0x9f, 0x8c, 0x7f, 0xbf, 0x3c, 0x25, 0x73, 0xb5, 0x88, 0x83, 0xdd, + 0x9d, 0x51, 0xf5, 0x06, 0x16, 0x05, 0x2d, 0x1c, 0x28, 0xae, 0x62, 0x08, 0x2e, 0x26, 0x10, 0x11, + 0x96, 0x44, 0xe4, 0xe4, 0x64, 0xe0, 0xba, 0xee, 0xa8, 0x67, 0xa7, 0x71, 0x3d, 0x0b, 0x25, 0x4f, + 0x15, 0x51, 0x0f, 0x29, 0xf8, 0x54, 0xc1, 0xbd, 0xea, 0xfd, 0xc5, 0x96, 0xcc, 0xce, 0x52, 0x14, + 0x58, 0x32, 0x49, 0xce, 0xc6, 0xe3, 0x4b, 0x09, 0x7f, 0xe7, 0x90, 0x29, 0xe2, 0x93, 0x04, 0xee, + 0xc8, 0x6f, 0x17, 0xe7, 0x67, 0x4a, 0xa5, 0x1f, 0xec, 0xa4, 0xd3, 0x3e, 0xb6, 0x82, 0xa1, 0xc8, + 0x13, 0x2d, 0xe2, 0x16, 0xdf, 0x12, 0x42, 0xe0, 0x4b, 0x88, 0x3e, 0x40, 0x96, 0x8a, 0x24, 0x03, + 0x5c, 0xf2, 0x8a, 0xa5, 0x0c, 0x92, 0xe8, 0x67, 0xe1, 0x6b, 0xc9, 0x69, 0x9e, 0x84, 0x8a, 0x8b, + 0x84, 0x8c, 0xc5, 0x6c, 0x16, 0xc3, 0xf9, 0xe9, 0x5b, 0x07, 0xff, 0x93, 0x7c, 0xd1, 0xde, 0xdd, + 0xf9, 0xb8, 0xbb, 0xd3, 0xaa, 0xc1, 0x77, 0x45, 0x0a, 0x89, 0x43, 0x2f, 0xdf, 0x5f, 0x8d, 0xe9, + 0x0b, 0xda, 0x8b, 0x21, 0x3a, 0xc8, 0x14, 0x53, 0x79, 0xf6, 0x23, 0x8a, 0xfb, 0xb4, 0x63, 0xf5, + 0x3a, 0x74, 0x8f, 0x19, 0x8b, 0xbe, 0x32, 0x16, 0xe9, 0x0b, 0xa2, 0x64, 0x0e, 0x9a, 0x65, 0xc3, + 0x98, 0xe6, 0x60, 0xb8, 0x3f, 0xee, 0xee, 0xd4, 0x68, 0xa4, 0x20, 0xb9, 0x88, 0x78, 0xf8, 0x4b, + 0x1a, 0x31, 0x05, 0x4e, 0x5b, 0x73, 0xe0, 0x53, 0x67, 0xd3, 0x19, 0xf4, 0x86, 0x7c, 0xfa, 0x54, + 0x78, 0x1d, 0xf8, 0x64, 0x88, 0x84, 0x5b, 0x5a, 0x5a, 0x8b, 0x5b, 0x07, 0x47, 0x03, 0x3d, 0x67, + 0x27, 0x9f, 0x71, 0xe4, 0x6e, 0x0e, 0x10, 0x97, 0xae, 0x94, 0xe4, 0x67, 0xa0, 0xec, 0xcc, 0x41, + 0xdd, 0x81, 0xd6, 0x76, 0x17, 0x70, 0x7e, 0xcb, 0x6e, 0xbb, 0x76, 0xa5, 0x1e, 0x17, 0xfc, 0xb4, + 0xd4, 0x3a, 0x9d, 0x4d, 0x73, 0x22, 0x91, 0x98, 0x38, 0x0f, 0x1a, 0x16, 0xc2, 0x39, 0x4b, 0x66, + 0xda, 0x48, 0xb9, 0x31, 0x8e, 0x71, 0xa5, 0xf0, 0x05, 0x5d, 0x24, 0x4e, 0x5d, 0xd5, 0x28, 0x5e, + 0x69, 0x45, 0xdf, 0x1f, 0x92, 0xbd, 0x3d, 0xd2, 0xa0, 0x69, 0xfc, 0xf0, 0xfd, 0xbe, 0xeb, 0x5a, + 0x23, 0xa5, 0x95, 0xd6, 0x13, 0x29, 0x62, 0xd6, 0x6a, 0x39, 0x62, 0xbe, 0x75, 0xde, 0x98, 0x9d, + 0x42, 0xa1, 0x26, 0xb4, 0xd5, 0x1d, 0x63, 0xfa, 0x76, 0xb3, 0x34, 0xe6, 0xca, 0xa1, 0x47, 0xb4, + 0x5d, 0x57, 0x0b, 0xe7, 0xa8, 0x63, 0x74, 0xff, 0xe8, 0xdf, 0x74, 0xd1, 0x35, 0x79, 0x22, 0x22, + 0x78, 0xad, 0x1c, 0x57, 0x8b, 0x15, 0x82, 0x53, 0x21, 0x1d, 0x2d, 0xcc, 0x7d, 0xef, 0x98, 0xf0, + 0xd1, 0x21, 0x3e, 0x3a, 0x9d, 0x82, 0x6f, 0x45, 0x58, 0xc7, 0x16, 0xad, 0xed, 0x11, 0xaf, 0x5c, + 0x59, 0x2d, 0xb5, 0x22, 0x11, 0xe6, 0x0b, 0x48, 0x54, 0x17, 0x63, 0x77, 0x1a, 0x83, 0x1e, 0xbe, + 0x79, 0x78, 0x17, 0x39, 0x54, 0x27, 0xa6, 0xa0, 0x1d, 0x87, 0xb7, 0xdb, 0x88, 0x0e, 0xe1, 0x2d, + 0x44, 0xbe, 0x0e, 0xe9, 0xf1, 0x17, 0xa9, 0x16, 0x8a, 0x99, 0x7a, 0x88, 0xa1, 0x1b, 0x8a, 0x58, + 0x48, 0x9f, 0x4e, 0xe2, 0x1c, 0x68, 0xa5, 0xfe, 0x58, 0x0e, 0x20, 0xce, 0xe0, 0x7f, 0xf2, 0x9a, + 0x32, 0xb4, 0xf1, 0xdf, 0x89, 0x49, 0x88, 0xb6, 0xf0, 0x32, 0x01, 0x08, 0xe7, 0x41, 0x50, 0x45, + 0xf7, 0xb1, 0x16, 0x9e, 0xa5, 0x88, 0x15, 0x33, 0xc9, 0x96, 0x32, 0x99, 0xc1, 0xbb, 0x44, 0x39, + 0x36, 0x58, 0xde, 0x4d, 0x15, 0xc6, 0x27, 0x79, 0x5c, 0xa7, 0x22, 0xe3, 0x3a, 0x41, 0x69, 0xbb, + 0xcb, 0x93, 0x04, 0xe4, 0xd9, 0xf8, 0xe2, 0xbc, 0x0a, 0xb7, 0x7b, 0xf3, 0x79, 0x03, 0x05, 0xfc, + 0x56, 0x7d, 0xaf, 0xd2, 0x5f, 0x91, 0x2c, 0x46, 0xdf, 0x7b, 0xae, 0xbb, 0xb9, 0x58, 0x79, 0x50, + 0x4c, 0xf5, 0x86, 0xee, 0xab, 0x1f, 0x2a, 0x2f, 0x30, 0x7b, 0xd6, 0x05, 0xda, 0xba, 0x92, 0xb8, + 0x1b, 0x79, 0xf6, 0x24, 0xdd, 0x2c, 0xe6, 0x11, 0x48, 0x8f, 0x96, 0xfb, 0x3e, 0x61, 0xe1, 0xed, + 0x4c, 0xe2, 0x11, 0x8f, 0x4e, 0x74, 0x04, 0x90, 0x02, 0xfd, 0xf6, 0x27, 0xf3, 0x47, 0xd7, 0xf7, + 0xba, 0x96, 0x1d, 0x5f, 0x07, 0xc7, 0x75, 0x5f, 0x61, 0x3f, 0x59, 0xc5, 0xfb, 0x0b, 0x8c, 0xdd, + 0xf1, 0x48, 0xcd, 0xfd, 0x72, 0xbf, 0x3a, 0x84, 0x7e, 0x47, 0x8f, 0x5b, 0xa4, 0x49, 0xd4, 0xbe, + 0xcc, 0x53, 0x3f, 0xf4, 0x7f, 0x59, 0xc3, 0xec, 0xbb, 0x63, 0xab, 0x44, 0x06, 0x6a, 0xcc, 0x17, + 0x20, 0x72, 0xe5, 0x54, 0xe5, 0xdb, 0x69, 0x93, 0x8f, 0xeb, 0x25, 0xfc, 0x98, 0x3c, 0xbe, 0x20, + 0x18, 0x2d, 0xb7, 0xa8, 0xf6, 0xa3, 0x9e, 0xed, 0x70, 0xa6, 0x45, 0xf6, 0x4c, 0xb3, 0xc4, 0xc1, + 0x44, 0x44, 0x0f, 0x44, 0x24, 0xb1, 0x60, 0x91, 0x4f, 0xd7, 0x4d, 0x50, 0xd3, 0x56, 0x3d, 0xc2, + 0x62, 0x3e, 0x4b, 0xfc, 0x10, 0x1d, 0x03, 0x49, 0x82, 0xd1, 0x54, 0x20, 0x9b, 0x5a, 0xe6, 0x07, + 0xb6, 0xc3, 0x92, 0x6b, 0x98, 0x90, 0x2b, 0x90, 0x4b, 0x90, 0xa3, 0x9e, 0x96, 0x09, 0x10, 0xc6, + 0x33, 0x26, 0xfa, 0x0d, 0x13, 0x5b, 0x2c, 0x5c, 0x43, 0x1c, 0x8a, 0x05, 0x60, 0x3b, 0x24, 0xa6, + 0x6f, 0xbf, 0x11, 0x4c, 0x62, 0xe7, 0x16, 0xc9, 0x94, 0xcf, 0x72, 0xc9, 0xb4, 0x93, 0xdd, 0x95, + 0xd1, 0xbe, 0x36, 0x6a, 0x6c, 0x64, 0xfc, 0x1f, 0xec, 0xe1, 0xc3, 0xf4, 0xde, 0x50, 0x55, 0x6c, + 0x12, 0x03, 0x99, 0x08, 0x89, 0xdb, 0xee, 0x53, 0x97, 0x36, 0x89, 0xdb, 0x20, 0x78, 0x58, 0x8f, + 0xd3, 0x7b, 0x62, 0xc2, 0x8b, 0x1e, 0xb3, 0x28, 0xe2, 0xc9, 0xec, 0x40, 0x89, 0xf4, 0x68, 0xe8, + 0x96, 0x66, 0x90, 0xa1, 0x8a, 0x0a, 0xf9, 0x97, 0x46, 0x7c, 0x69, 0x2d, 0x51, 0x94, 0x6b, 0x5a, + 0xd5, 0xf2, 0xa9, 0xbd, 0x6b, 0x4c, 0x34, 0xe7, 0xfd, 0x8c, 0x60, 0x8d, 0x40, 0xdf, 0x6a, 0xcc, + 0x49, 0x9e, 0x21, 0x46, 0x71, 0x0f, 0x21, 0x2c, 0x23, 0xac, 0xda, 0xa6, 0xd4, 0xea, 0x0f, 0xc9, + 0x39, 0x68, 0x55, 0x25, 0xb4, 0xa6, 0x92, 0x22, 0xee, 0x16, 0x6b, 0x58, 0x9f, 0x17, 0xfa, 0xcd, + 0x93, 0x34, 0x57, 0x84, 0x63, 0x90, 0x4c, 0xf9, 0xf2, 0x68, 0x71, 0x7d, 0x31, 0x05, 0x6c, 0x22, + 0xee, 0x29, 0x49, 0xd8, 0x02, 0xcc, 0xea, 0x9f, 0xb8, 0x88, 0x7c, 0xf3, 0xd5, 0x97, 0x48, 0xc2, + 0x98, 0x87, 0xb7, 0x3e, 0x5d, 0xdd, 0x36, 0xf6, 0xbd, 0x7d, 0x0c, 0xef, 0x28, 0x4b, 0x59, 0x52, + 0x5a, 0xf5, 0x68, 0xa0, 0xa9, 0x7b, 0x98, 0x28, 0x38, 0x1b, 0x8c, 0x26, 0x72, 0x0b, 0x70, 0xff, + 0x39, 0xe0, 0x7e, 0x03, 0xb8, 0xbf, 0x1d, 0xb8, 0xbf, 0x01, 0xdc, 0xb7, 0xc0, 0xfd, 0x67, 0x81, + 0x07, 0xcf, 0x01, 0x0f, 0x1a, 0xc0, 0x83, 0xed, 0xc0, 0x83, 0x0d, 0xe0, 0x81, 0x05, 0x1e, 0x3c, + 0x0b, 0x3c, 0x7c, 0x0e, 0x78, 0xd8, 0x00, 0x1e, 0x6e, 0x07, 0x1e, 0x6e, 0x00, 0x0f, 0x2d, 0xf0, + 0xb0, 0x06, 0x5c, 0x80, 0xf7, 0xca, 0x80, 0xf7, 0x94, 0x3e, 0x9f, 0xb6, 0xc2, 0xe8, 0x9c, 0x8c, + 0x1a, 0x39, 0xb8, 0xca, 0xf6, 0x7a, 0x96, 0xae, 0x32, 0xbf, 0x96, 0xc6, 0x6b, 0xd9, 0x6a, 0x52, + 0xf5, 0xda, 0xdc, 0x28, 0xae, 0xcc, 0x0d, 0xa5, 0x06, 0x9e, 0x06, 0x66, 0x01, 0x13, 0xf1, 0xb2, + 0x68, 0x2f, 0x58, 0x7c, 0x46, 0x13, 0xc3, 0x7a, 0xd5, 0x71, 0x02, 0xbc, 0x4b, 0x4f, 0x82, 0x2a, + 0x77, 0x7f, 0x2d, 0xaa, 0xda, 0xeb, 0x50, 0x8a, 0x2c, 0x23, 0xa9, 0x50, 0x08, 0xc5, 0xf1, 0x30, + 0xeb, 0x33, 0xb7, 0x52, 0x2f, 0xfb, 0x4d, 0x43, 0x5b, 0x3b, 0x89, 0x0f, 0xb9, 0x41, 0x37, 0x86, + 0xa9, 0x5a, 0x3f, 0xa3, 0x7a, 0xee, 0xc8, 0x3b, 0x34, 0xa7, 0xb4, 0x20, 0xdc, 0x3c, 0xf0, 0x98, + 0xe9, 0x76, 0x37, 0x06, 0xde, 0x4b, 0xdc, 0x8d, 0x39, 0xf0, 0xd9, 0x5c, 0xf9, 0x83, 0x43, 0x1c, + 0xaf, 0x00, 0x82, 0xcd, 0x2a, 0xf1, 0x84, 0x52, 0x50, 0x52, 0xd2, 0xfc, 0xcb, 0x5a, 0x1e, 0x58, + 0xce, 0x96, 0x77, 0x41, 0x1e, 0x1f, 0xda, 0x64, 0xd0, 0x70, 0xa7, 0x98, 0x5b, 0x73, 0xf2, 0xb3, + 0xb3, 0xa6, 0xc4, 0x7d, 0xf5, 0x52, 0xb6, 0xa5, 0xfa, 0xda, 0xca, 0x79, 0x68, 0x36, 0x93, 0x91, + 0xb9, 0x84, 0xa9, 0x4f, 0x7b, 0x3c, 0x89, 0xe0, 0xbe, 0xab, 0x7f, 0x50, 0xd1, 0xe0, 0x0c, 0x43, + 0x38, 0xea, 0xb1, 0xa0, 0x2a, 0xbb, 0xdb, 0x09, 0xeb, 0x06, 0x62, 0x06, 0xe6, 0x67, 0xd8, 0xbf, + 0xfc, 0xe8, 0xa9, 0x2e, 0x9e, 0x0d, 0x00, 0x00, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, + 0x74, 0x6d, 0x6c, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0b, 0x6d, 0x53, 0x61, + 0x6b, 0xdb, 0x30, 0x10, 0xfd, 0x5e, 0xe8, 0x7f, 0xb8, 0xf9, 0x73, 0x89, 0x9d, 0x26, 0x61, 0x14, + 0x6c, 0xc3, 0x48, 0x5b, 0x28, 0xb4, 0x5b, 0x21, 0x1d, 0x65, 0x1f, 0x65, 0xeb, 0x1c, 0x89, 0xca, + 0x92, 0x90, 0x94, 0xa4, 0xde, 0xcf, 0xd8, 0x2f, 0xde, 0x49, 0x4a, 0x9b, 0x75, 0x14, 0x83, 0x25, + 0x9d, 0xef, 0xde, 0x7b, 0xf7, 0x7c, 0xaa, 0xbf, 0x5c, 0xff, 0x58, 0x3f, 0xfd, 0x7a, 0xbc, 0x01, + 0x11, 0x46, 0xd5, 0x9e, 0x9f, 0xd5, 0xef, 0x2b, 0x32, 0x1e, 0xd7, 0x20, 0x83, 0xc2, 0xf6, 0xa1, + 0x43, 0x0e, 0x4c, 0x73, 0x58, 0xaf, 0x17, 0x55, 0x55, 0xd5, 0x65, 0x0e, 0xd3, 0xf7, 0xf2, 0x2d, + 0xb1, 0x33, 0x7c, 0x02, 0xa6, 0xe4, 0x56, 0x37, 0x3d, 0xea, 0x80, 0x2e, 0xa1, 0xcc, 0x3f, 0x86, + 0xea, 0xc1, 0xe8, 0x00, 0xbd, 0x51, 0xc6, 0x35, 0x85, 0x43, 0x5e, 0xb4, 0xcf, 0xa8, 0x7a, 0x33, + 0x22, 0x3c, 0x99, 0x23, 0x36, 0x3c, 0x63, 0x07, 0x1b, 0x74, 0x7b, 0x74, 0x75, 0x19, 0xd3, 0x5b, + 0xe2, 0x98, 0x27, 0xaa, 0xee, 0x0d, 0xc0, 0xcb, 0xdf, 0xd8, 0x14, 0x4b, 0xfb, 0x5a, 0x24, 0x89, + 0xac, 0x53, 0x08, 0x9d, 0x71, 0x1c, 0x09, 0xb5, 0x2a, 0x3e, 0x50, 0xc2, 0x41, 0xf2, 0x20, 0x9a, + 0xf9, 0x65, 0x55, 0xd9, 0x57, 0x10, 0x28, 0xb7, 0x22, 0x34, 0xab, 0x2b, 0x3a, 0xa4, 0xd2, 0xa4, + 0x32, 0xf0, 0xcf, 0x4a, 0x16, 0x5f, 0x57, 0x44, 0x1d, 0xf8, 0x31, 0x23, 0x07, 0x97, 0xab, 0x08, + 0x93, 0xb3, 0x15, 0x0e, 0x01, 0xf6, 0x79, 0x5f, 0x04, 0x63, 0x93, 0x18, 0xdb, 0x42, 0x32, 0xcb, + 0xed, 0xb4, 0x07, 0x06, 0x7e, 0x64, 0x4a, 0xc1, 0x88, 0xa3, 0x71, 0x13, 0x0c, 0xc6, 0x04, 0xeb, + 0x24, 0x35, 0x70, 0xea, 0x71, 0x06, 0x77, 0x01, 0x04, 0xf3, 0xd0, 0x33, 0xcb, 0x3a, 0xa9, 0x64, + 0x98, 0x20, 0x18, 0x10, 0xc6, 0x53, 0x9b, 0x81, 0x05, 0xd9, 0x27, 0xdf, 0xf9, 0xa4, 0xd9, 0x48, + 0xfb, 0x03, 0x15, 0x5a, 0xb6, 0x45, 0x3f, 0xab, 0x4b, 0x9b, 0xf9, 0xee, 0x34, 0x6c, 0xd8, 0x68, + 0xc9, 0x02, 0x66, 0xad, 0x92, 0x3d, 0xd5, 0x18, 0x7d, 0x01, 0x3f, 0xbd, 0xd4, 0xdb, 0x77, 0x4f, + 0xef, 0xbf, 0x7d, 0x27, 0xdb, 0xb5, 0xc6, 0x3e, 0xc8, 0x3d, 0x71, 0x5c, 0xfc, 0x23, 0x01, 0xac, + 0x33, 0x7b, 0xc9, 0xf1, 0x7f, 0x0d, 0x8e, 0x54, 0x07, 0x54, 0x53, 0x2c, 0x0c, 0xce, 0x28, 0xf0, + 0x07, 0x19, 0x7a, 0x11, 0x61, 0xef, 0x6f, 0xae, 0xff, 0x78, 0x00, 0xa3, 0x4b, 0x33, 0x0c, 0x59, + 0xa0, 0xf4, 0x56, 0xb1, 0xc9, 0x43, 0x10, 0x98, 0x84, 0xef, 0x3c, 0x98, 0x01, 0x0e, 0x02, 0x51, + 0x01, 0x75, 0xf1, 0x02, 0x96, 0xc0, 0x34, 0x69, 0x1b, 0x31, 0x7a, 0x3c, 0x9a, 0x1d, 0x79, 0xcd, + 0x09, 0x22, 0x55, 0x3c, 0x6c, 0x1e, 0x97, 0x8b, 0xea, 0x76, 0xb5, 0xba, 0xbc, 0xea, 0x0c, 0x73, + 0x1c, 0xd2, 0xfb, 0xd4, 0x64, 0xcd, 0x40, 0x38, 0x1c, 0x9a, 0xa2, 0x24, 0x31, 0x83, 0xdc, 0xce, + 0xe2, 0x9c, 0x16, 0xed, 0x5a, 0x45, 0x64, 0x81, 0x0e, 0xeb, 0x92, 0xb5, 0x51, 0x74, 0x2f, 0x90, + 0x22, 0x47, 0x01, 0x51, 0x58, 0xce, 0xdf, 0x39, 0xcc, 0x3c, 0xf1, 0xdf, 0x24, 0xec, 0x23, 0x74, + 0x1c, 0xaa, 0xd3, 0x72, 0x9a, 0x04, 0x8d, 0x9f, 0x4f, 0x42, 0x99, 0x47, 0xa6, 0x4c, 0x43, 0xd7, + 0x1e, 0x27, 0xf4, 0xfc, 0x2c, 0x3e, 0x04, 0x42, 0x77, 0x20, 0x5f, 0x8a, 0x7c, 0x8b, 0xfe, 0x02, + 0xfa, 0xc1, 0x37, 0x9d, 0x5f, 0x03, 0x00, 0x00 };
--- a/WebServer/HttpDynamicHandler.cpp Sat Sep 14 22:34:00 2013 +0000 +++ b/WebServer/HttpDynamicHandler.cpp Mon Sep 16 18:37:14 2013 +0000 @@ -38,7 +38,7 @@ #include "wlan.h" #include "string.h" #include "Board.h" -//#include "Wheel.h" +#include "Wheel.h" /** * @addtogroup HttpDynamicHandler @@ -89,9 +89,9 @@ void HttpDynamicHandler_GetWheelValue(inputParams uWheelInParams, outputParams *uWheelOutParams) { uWheelOutParams->sWheelParam.uLedDummyOut = GetLEDStatus(); - uWheelOutParams->sWheelParam.uLedDummyOut = uWheelOutParams->sWheelParam.uLedDummyOut >> 3; - // uWheelOutParams->sWheelParam.uWheelPosition = Wheel_getPosition(); - // uWheelOutParams->sWheelParam.uWheelValue = Wheel_getValue(); + uWheelOutParams->sWheelParam.uLedDummyOut = uWheelOutParams->sWheelParam.uLedDummyOut; + uWheelOutParams->sWheelParam.uWheelPosition = Wheel_getPosition(); + uWheelOutParams->sWheelParam.uWheelValue = Wheel_getValue(); } /// @}
--- a/WebServer/WebServerApp.cpp Sat Sep 14 22:34:00 2013 +0000 +++ b/WebServer/WebServerApp.cpp Mon Sep 16 18:37:14 2013 +0000 @@ -47,12 +47,14 @@ //#include <msp430.h> #include "Board.h" #include "HttpCore.h" -//#include "Wheel.h" +#include "Wheel.h" #include "dispatcher.h" #define FALSE 0 #define SERVERAPPVERSION "v1.10.11.6.8.1" +//ADC pin is pin20 + volatile unsigned long ulCC3000Connected,ulCC3000DHCP,OkToDoShutDown; unsigned char obtainIpInfoFlag = FALSE; unsigned char ConnectUsingSmartConfig; @@ -157,8 +159,8 @@ initDriver(); isInitialized = TRUE; // For manual connect - //Wheel_init(); - //Wheel_enable(); + Wheel_init(); + Wheel_enable(); //__enable_interrupt(); DispatcherUartSendPacket("\r\n\r\n--Initializing Application--",32); DispatcherUartSendPacket("\r\nWeb Server App Version=",25);