diff --git a/Arduino/epd1in54_V2/epd1in54_V2.cpp b/Arduino/epd1in54_V2/epd1in54_V2.cpp index c071a20..7df047b 100644 --- a/Arduino/epd1in54_V2/epd1in54_V2.cpp +++ b/Arduino/epd1in54_V2/epd1in54_V2.cpp @@ -79,30 +79,6 @@ unsigned char WF_PARTIAL_1IN54_0[159] = 0x02,0x17,0x41,0xB0,0x32,0x28, }; -// waveform partial refresh(quality) -// unsigned char WF_PARTIAL_1IN54_1[159] = -// { -// 0x0,0x00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0xA,0x0,0x0,0x0,0x0,0x0,0x1, -// 0x1,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x0,0x0,0x0,0x0,0x0,0x0,0x0, -// 0x22,0x22,0x22,0x22,0x22,0x22,0x0,0x0,0x0, -// 0x22,0x17,0x41,0x0,0x32,0x20, -// }; - Epd::~Epd() { }; diff --git a/Arduino/epd7in5_V2/epd7in5_V2.cpp b/Arduino/epd7in5_V2/epd7in5_V2.cpp index c129e90..242ed00 100644 --- a/Arduino/epd7in5_V2/epd7in5_V2.cpp +++ b/Arduino/epd7in5_V2/epd7in5_V2.cpp @@ -229,8 +229,8 @@ void Epd::DisplayFrame(const unsigned char* frame_buffer) { SendCommand(0x13); for (unsigned long j = 0; j < height; j++) { - for (unsigned long i = 0; i < width; i++) { - SendData(~frame_buffer[i + j * width]); + for (unsigned long i = 0; i < width/8; i++) { + SendData(~frame_buffer[i + j * width/8]); } } SendCommand(0x12); @@ -240,7 +240,6 @@ void Epd::DisplayFrame(const unsigned char* frame_buffer) { void Epd::Displaypart(const unsigned char* pbuffer, unsigned long xStart, unsigned long yStart,unsigned long Picture_Width,unsigned long Picture_Height) { SendCommand(0x13); - int * padd; // xStart = xStart/8; // xStart = xStart*8; for (unsigned long j = 0; j < height; j++) { diff --git a/RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_1in54_V2.c b/RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_1in54_V2.c index c448037..928e368 100644 --- a/RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_1in54_V2.c +++ b/RaspberryPi_JetsonNano/c/lib/e-Paper/EPD_1in54_V2.c @@ -78,30 +78,6 @@ unsigned char WF_PARTIAL_1IN54_0[159] = 0x02,0x17,0x41,0xB0,0x32,0x28, }; -// waveform partial refresh(quality) -unsigned char WF_PARTIAL_1IN54_1[159] = -{ -0x0,0x00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0xA,0x0,0x0,0x0,0x0,0x0,0x1, -0x1,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x22,0x22,0x22,0x22,0x22,0x22,0x0,0x0,0x0, -0x22,0x17,0x41,0x0,0x32,0x20, -}; - /****************************************************************************** function : Software reset parameter: @@ -109,11 +85,11 @@ parameter: static void EPD_1IN54_V2_Reset(void) { DEV_Digital_Write(EPD_RST_PIN, 1); - DEV_Delay_ms(200); + DEV_Delay_ms(20); DEV_Digital_Write(EPD_RST_PIN, 0); DEV_Delay_ms(2); DEV_Digital_Write(EPD_RST_PIN, 1); - DEV_Delay_ms(200); + DEV_Delay_ms(20); } /****************************************************************************** @@ -276,7 +252,7 @@ void EPD_1IN54_V2_Init_Partial(void) EPD_1IN54_V2_Reset(); EPD_1IN54_V2_ReadBusy(); - EPD_1IN54_V2_SetLut(WF_PARTIAL_1IN54_1); + EPD_1IN54_V2_SetLut(WF_PARTIAL_1IN54_0); EPD_1IN54_V2_SendCommand(0x37); EPD_1IN54_V2_SendData(0x00); EPD_1IN54_V2_SendData(0x00); @@ -382,7 +358,7 @@ void EPD_1IN54_V2_DisplayPart(UBYTE *Image) UWORD Width, Height; Width = (EPD_1IN54_V2_WIDTH % 8 == 0)? (EPD_1IN54_V2_WIDTH / 8 ): (EPD_1IN54_V2_WIDTH / 8 + 1); Height = EPD_1IN54_V2_HEIGHT; - + UDOUBLE Addr = 0; EPD_1IN54_V2_SendCommand(0x24); for (UWORD j = 0; j < Height; j++) { diff --git a/RaspberryPi_JetsonNano/python/examples/epd_7in5_V2_test.py b/RaspberryPi_JetsonNano/python/examples/epd_7in5_V2_test.py index d884510..38b0c78 100644 --- a/RaspberryPi_JetsonNano/python/examples/epd_7in5_V2_test.py +++ b/RaspberryPi_JetsonNano/python/examples/epd_7in5_V2_test.py @@ -32,7 +32,7 @@ try: draw = ImageDraw.Draw(Himage) draw.text((10, 0), 'hello world', font = font24, fill = 0) draw.text((10, 20), '7.5inch e-Paper', font = font24, fill = 0) - draw.text((150, 0), u'微雪电子', font = font24, fill = 0) + draw.text((150, 0), u'微雪电子', font = font24, fill = 0) draw.line((20, 50, 70, 100), fill = 0) draw.line((70, 50, 20, 100), fill = 0) draw.rectangle((20, 50, 70, 100), outline = 0) diff --git a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd1in54_V2.py b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd1in54_V2.py index 9719d7e..b489d9a 100644 --- a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd1in54_V2.py +++ b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd1in54_V2.py @@ -90,29 +90,6 @@ class EPD: 0x22,0x22,0x22,0x22,0x22,0x22,0x0,0x0,0x0, 0x02,0x17,0x41,0xB0,0x32,0x28, ] - - # waveform partial refresh(quality) - WF_PARTIAL_1IN54_1 = [ - 0x0,0x00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0xA,0x0,0x0,0x0,0x0,0x0,0x1, - 0x1,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x22,0x22,0x22,0x22,0x22,0x22,0x0,0x0,0x0, - 0x22,0x17,0x41,0x0,0x32,0x20, - ] # Hardware reset def reset(self): @@ -176,24 +153,24 @@ class EPD: self.send_data(lut[158]) def SetWindows(self, Xstart, Ystart, Xend, Yend): - self.send_command(0x44) # SET_RAM_X_ADDRESS_START_END_POSITION - self.send_data((Xstart>>3) & 0xFF) - self.send_data((Xend>>3) & 0xFF) + self.send_command(0x44); # SET_RAM_X_ADDRESS_START_END_POSITION + self.send_data((Xstart>>3) & 0xFF); + self.send_data((Xend>>3) & 0xFF); - self.send_command(0x45) # SET_RAM_Y_ADDRESS_START_END_POSITION - self.send_data(Ystart & 0xFF) - self.send_data((Ystart >> 8) & 0xFF) - self.send_data(Yend & 0xFF) - self.send_data((Yend >> 8) & 0xFF) + self.send_command(0x45); # SET_RAM_Y_ADDRESS_START_END_POSITION + self.send_data(Ystart & 0xFF); + self.send_data((Ystart >> 8) & 0xFF); + self.send_data(Yend & 0xFF); + self.send_data((Yend >> 8) & 0xFF); def SetCursor(self, Xstart, Ystart): - self.send_command(0x4E) # SET_RAM_X_ADDRESS_COUNTER - self.send_data(Xstart & 0xFF) + self.send_command(0x4E); # SET_RAM_X_ADDRESS_COUNTER + self.send_data(Xstart & 0xFF); - self.send_command(0x4F) # SET_RAM_Y_ADDRESS_COUNTER - self.send_data(Ystart & 0xFF) - self.send_data((Ystart >> 8) & 0xFF) + self.send_command(0x4F); # SET_RAM_Y_ADDRESS_COUNTER + self.send_data(Ystart & 0xFF); + self.send_data((Ystart >> 8) & 0xFF); def init(self, isPartial): if (epdconfig.module_init() != 0): @@ -315,7 +292,7 @@ class EPD: for i in range(0, int(self.width / 8)): self.send_data(image[i + j * int(self.width / 8)]) - self.TurnOnDisplayPart() + self.TurnOnDisplay() def displayPart(self, image): if (image == None): diff --git a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd2in9_V2.py b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd2in9_V2.py index d736c64..76d630e 100644 --- a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd2in9_V2.py +++ b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd2in9_V2.py @@ -51,7 +51,7 @@ class EPD: 0x40,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, - 0x0A,0x0,0x0,0x0,0x0,0x0,0x2, + 0x0A,0x0,0x0,0x0,0x0,0x0,0x1, 0x1,0x0,0x0,0x0,0x0,0x0,0x0, 0x1,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0, diff --git a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py index 32625fa..b1495ca 100644 --- a/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py +++ b/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in5_V2.py @@ -176,24 +176,24 @@ class EPD: # self.send_data(0x3f) #VDH=15V # self.send_data(0x3f) #VDL=-15V - self.send_command(0x01) # power setting - self.send_data(0x17) # 1-0=11: internal power - self.send_data(self.Voltage_Frame_7IN5_V2[6]) # VGH&VGL - self.send_data(self.Voltage_Frame_7IN5_V2[1]) # VSH - self.send_data(self.Voltage_Frame_7IN5_V2[2]) # VSL - self.send_data(self.Voltage_Frame_7IN5_V2[3]) # VSHR + self.send_command(0x01); # power setting + self.send_data(0x17); # 1-0=11: internal power + self.send_data(self.Voltage_Frame_7IN5_V2[6]); # VGH&VGL + self.send_data(self.Voltage_Frame_7IN5_V2[1]); # VSH + self.send_data(self.Voltage_Frame_7IN5_V2[2]); # VSL + self.send_data(self.Voltage_Frame_7IN5_V2[3]); # VSHR - self.send_command(0x82) # VCOM DC Setting - self.send_data(self.Voltage_Frame_7IN5_V2[4]) # VCOM + self.send_command(0x82); # VCOM DC Setting + self.send_data(self.Voltage_Frame_7IN5_V2[4]); # VCOM - self.send_command(0x06) # Booster Setting - self.send_data(0x27) - self.send_data(0x27) - self.send_data(0x2F) - self.send_data(0x17) + self.send_command(0x06); # Booster Setting + self.send_data(0x27); + self.send_data(0x27); + self.send_data(0x2F); + self.send_data(0x17); - self.send_command(0x30) # OSC Setting - self.send_data(self.Voltage_Frame_7IN5_V2[0]) # 2-0=100: N=4 5-3=111: M=7 3C=50Hz 3A=100HZ + self.send_command(0x30); # OSC Setting + self.send_data(self.Voltage_Frame_7IN5_V2[0]); # 2-0=100: N=4 ; 5-3=111: M=7 ; 3C=50Hz 3A=100HZ self.send_command(0x04) #POWER ON epdconfig.delay_ms(100) @@ -218,11 +218,11 @@ class EPD: self.send_command(0X60) #TCON SETTING self.send_data(0x22) - self.send_command(0x65) # Resolution setting - self.send_data(0x00) - self.send_data(0x00) # 800*480 - self.send_data(0x00) - self.send_data(0x00) + self.send_command(0x65); # Resolution setting + self.send_data(0x00); + self.send_data(0x00); # 800*480 + self.send_data(0x00); + self.send_data(0x00); self.SetLut(self.LUT_VCOM_7IN5_V2, self.LUT_WW_7IN5_V2, self.LUT_BW_7IN5_V2, self.LUT_WB_7IN5_V2, self.LUT_BB_7IN5_V2) # EPD hardware init end diff --git a/RaspberryPi_JetsonNano/python/pic/01.bmp b/RaspberryPi_JetsonNano/python/pic/01.bmp new file mode 100644 index 0000000..de70694 Binary files /dev/null and b/RaspberryPi_JetsonNano/python/pic/01.bmp differ diff --git a/RaspberryPi_JetsonNano/python/pic/4.2-B.bmp b/RaspberryPi_JetsonNano/python/pic/4.2-B.bmp new file mode 100644 index 0000000..4b4d4c2 Binary files /dev/null and b/RaspberryPi_JetsonNano/python/pic/4.2-B.bmp differ diff --git a/RaspberryPi_JetsonNano/python/pic/4.2-R.bmp b/RaspberryPi_JetsonNano/python/pic/4.2-R.bmp new file mode 100644 index 0000000..bb39bf4 Binary files /dev/null and b/RaspberryPi_JetsonNano/python/pic/4.2-R.bmp differ diff --git a/RaspberryPi_JetsonNano/python/pic/42.bmp b/RaspberryPi_JetsonNano/python/pic/42.bmp new file mode 100644 index 0000000..301685d Binary files /dev/null and b/RaspberryPi_JetsonNano/python/pic/42.bmp differ diff --git a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvguix.qiumingsong b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvguix.qiumingsong index 6ae885d..35dd883 100644 --- a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvguix.qiumingsong +++ b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvguix.qiumingsong @@ -80,8 +80,8 @@ 44 - 0 - 1 + 2 + 3 -1 -1 @@ -91,17 +91,17 @@ -1 - 139 - 609 - 2298 - 1304 + 78 + 2655 + 4344 + 1243 0 - 250 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000036453A5C6769746875625C452D50617065725F636F64655C53544D33325C53544D33322D463130335A4554365C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000085030000FA000000F2080000BC030000 + 251 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000037453A5C70726F6A6563745C452D50617065725F636F64655C53544D33325C53544D33322D463130335A4554365C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001C0B0000670000000014000024040000 @@ -124,7 +124,7 @@ 16 - AD030000FA000000D9090000C0010000 + 440B000067000000701100002D010000 @@ -140,7 +140,7 @@ 0 16 - 030000006D00000015010000F6020000 + 030000006D00000015010000F1030000 16 @@ -160,7 +160,7 @@ 0 16 - 030000006D00000015010000F6020000 + 030000006D00000015010000F1030000 16 @@ -440,7 +440,7 @@ 0 16 - 030000006D00000015010000F6020000 + 030000006D00000015010000F1030000 16 @@ -460,7 +460,7 @@ 0 16 - 030000006D00000015010000F6020000 + 030000006D00000015010000F1030000 16 @@ -480,7 +480,7 @@ 0 16 - 00000000300300008906000050040000 + 000000002B040000000A00004B050000 16 @@ -520,7 +520,7 @@ 0 16 - 03000000330300008606000034040000 + 030000002E040000FD0900002F050000 16 @@ -1140,7 +1140,7 @@ 0 16 - 030000006D00000015010000F6020000 + 030000006D00000015010000F1030000 16 @@ -1160,7 +1160,7 @@ 0 16 - 03000000330300008606000034040000 + 030000002E040000FD0900002F050000 16 @@ -1180,7 +1180,7 @@ 0 16 - 03000000330300008606000034040000 + 030000002E040000FD0900002F050000 16 @@ -1240,7 +1240,7 @@ 0 16 - 03000000330300008606000034040000 + 030000002E040000FD0900002F050000 16 @@ -1260,7 +1260,7 @@ 0 16 - 03000000330300008606000034040000 + 030000002E040000FD0900002F050000 16 @@ -1720,7 +1720,7 @@ 0 16 - 00000000500400008906000066040000 + 000000004B050000000A000061050000 16 @@ -1789,14 +1789,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF4401000016010000700700001A010000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000AD030000FA000000D9090000C0010000440100005000000070070000160100000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF2C0600005000000030060000FE020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000099080000FA000000D9090000A8030000300600005000000070070000FE02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF18010000500000001C0100001203000001000000020000100400000001000000C2FEFFFFB5030000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000069020000FA00000081030000BC030000000000005000000018010000120300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000E402000070070000E802000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000006902000092030000D90900007204000000000000E802000070070000C803000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFB8030000E8020000BC030000C803000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000012030000890600001603000001000000010000100400000001000000DDFBFFFFC4000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000069020000C0030000F2080000FA040000000000001603000089060000500400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF4401000016010000700700001A010000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000440B000067000000701100002D010000440100005000000070070000160100000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF2C0600005000000030060000FE020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000030100000670000007011000015030000300600005000000070070000FE02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF18010000500000001C0100000D04000001000000020000100400000001000000C2FEFFFFB5030000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000A000067000000180B0000240400000000000050000000180100000D0400000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000E402000070070000E802000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000A0000FF02000070110000DF03000000000000E802000070070000C803000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFB8030000E8020000BC030000C803000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000000D040000000A00001104000001000000010000100400000001000000DDFBFFFFC4000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000A00002804000000140000620500000000000011040000000A00004B0500000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2844 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000972657475726E20353B960000000000000012000972657475726E20353B0D67756C496D67427566416464720B4954383935315F3842505008486F7374496E69740A67704672616D654275660554427974650A4550445F35494E3635460C4550445F32696E37625F5632094550445F32494E3742036C7574115049435F646973706C61795F436C65616E0B7069635F646973706C61790C4550445F696E69745F4F5450104550445F3132696E34385F5265736574144550445F4D314D325F53656E64436F6D6D616E64184550445F4D3153314D3253325F53656E64436F6D6D616E64094550445F52657365740943545F5344415F494E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2577 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000054750494F4196000000000000000200054750494F41145243435F414842315065726970685F4750494F410000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3596,8 +3596,8 @@ 0 ../Src/main.c - 2 - 91 + 30 + 94 100 1 diff --git a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvoptx b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvoptx index d2c4958..f0cb47a 100644 --- a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvoptx +++ b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo.uvoptx @@ -263,7 +263,7 @@ Application/User - 0 + 1 0 0 0 @@ -343,7 +343,7 @@ Examples - 1 + 0 0 0 0 diff --git a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.build_log.htm b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.build_log.htm index d6a39b6..39ec92e 100644 --- a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.build_log.htm +++ b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.build_log.htm @@ -21,13 +21,14 @@ Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.1.0 Dialog DLL: TCM.DLL V1.35.1.0

Project:

-E:\github\E-Paper_code\STM32\STM32-F103ZET6\MDK-ARM\epd-demo.uvprojx +E:\project\E-Paper_code\STM32\STM32-F103ZET6\MDK-ARM\epd-demo.uvprojx Project File Date: 07/19/2021

Output:

*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Program Files\keil5\ARM\ARMCC\Bin' Build target 'epd-demo' compiling main.c... +compiling EPD_1in54_V2.c... linking... Program Size: Code=18544 RO-data=360 RW-data=20 ZI-data=4252 FromELF: creating hex file... diff --git a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.htm b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.htm index 04e31f0..bb9679e 100644 --- a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.htm +++ b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.htm @@ -3,7 +3,7 @@ Static Call Graph - [epd-demo\epd-demo.axf]

Static Call Graph for image epd-demo\epd-demo.axf

-

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Mon Jul 19 11:44:54 2021 +

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Wed Aug 11 14:53:17 2021

Maximum Stack Usage = 124 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

diff --git a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.map b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.map index ae79e14..0c92432 100644 --- a/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.map +++ b/STM32/STM32-F103ZET6/MDK-ARM/epd-demo/epd-demo.map @@ -1220,7 +1220,6 @@ Removing Unused input sections from the image. Removing epd_1in54_v2.o(.rrx_text), (6 bytes). Removing epd_1in54_v2.o(.text), (1024 bytes). Removing epd_1in54_v2.o(.data), (318 bytes). - Removing epd_1in54_v2.o(.data), (159 bytes). Removing epd_1in54b.o(.rev16_text), (4 bytes). Removing epd_1in54b.o(.revsh_text), (4 bytes). Removing epd_1in54b.o(.rrx_text), (6 bytes). @@ -1456,7 +1455,7 @@ Removing Unused input sections from the image. Removing cdrcmple.o(.text), (48 bytes). Removing depilogue.o(.text), (186 bytes). -461 unused section(s) (total 958922 bytes) removed from the image. +460 unused section(s) (total 958763 bytes) removed from the image. ============================================================================== @@ -2138,15 +2137,15 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object 0x08000000 0x08000000 0x00000130 Data RO 3 RESET startup_stm32f103xe.o - 0x08000130 0x08000130 0x00000000 Code RO 2861 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x08000130 0x08000130 0x00000004 Code RO 3161 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x08000134 0x08000134 0x00000004 Code RO 3164 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x08000138 0x08000138 0x00000000 Code RO 3166 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x08000138 0x08000138 0x00000000 Code RO 3168 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x08000138 0x08000138 0x00000008 Code RO 3169 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x08000140 0x08000140 0x00000000 Code RO 3171 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) - 0x08000140 0x08000140 0x00000000 Code RO 3173 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) - 0x08000140 0x08000140 0x00000004 Code RO 3162 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000130 0x08000130 0x00000000 Code RO 2860 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x08000130 0x08000130 0x00000004 Code RO 3160 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x08000134 0x08000134 0x00000004 Code RO 3163 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x08000138 0x08000138 0x00000000 Code RO 3165 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x08000138 0x08000138 0x00000000 Code RO 3167 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x08000138 0x08000138 0x00000008 Code RO 3168 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x08000140 0x08000140 0x00000000 Code RO 3170 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) + 0x08000140 0x08000140 0x00000000 Code RO 3172 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) + 0x08000140 0x08000140 0x00000004 Code RO 3161 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) 0x08000144 0x08000144 0x00000024 Code RO 4 .text startup_stm32f103xe.o 0x08000168 0x08000168 0x00000094 Code RO 13 .text main.o 0x080001fc 0x080001fc 0x00000060 Code RO 162 .text gpio.o @@ -2154,35 +2153,35 @@ Memory Map of the image 0x08000318 0x08000318 0x000000d8 Code RO 216 .text usart.o 0x080003f0 0x080003f0 0x00000030 Code RO 246 .text stm32f1xx_it.o 0x08000420 0x08000420 0x0000003c Code RO 273 .text stm32f1xx_hal_msp.o - 0x0800045c 0x0800045c 0x000000c4 Code RO 2470 .text system_stm32f1xx.o - 0x08000520 0x08000520 0x000015e8 Code RO 2526 .text stm32f1xx_hal_spi.o - 0x08001b08 0x08001b08 0x00000188 Code RO 2550 .text stm32f1xx_hal.o - 0x08001c90 0x08001c90 0x000008c8 Code RO 2580 .text stm32f1xx_hal_rcc.o - 0x08002558 0x08002558 0x000003d4 Code RO 2628 .text stm32f1xx_hal_gpio.o - 0x0800292c 0x0800292c 0x00000c48 Code RO 2652 .text stm32f1xx_hal_dma.o - 0x08003574 0x08003574 0x00000224 Code RO 2676 .text stm32f1xx_hal_cortex.o - 0x08003798 0x08003798 0x00000f9c Code RO 2840 .text stm32f1xx_hal_uart.o - 0x08004734 0x08004734 0x00000024 Code RO 2868 .text mc_w.l(memseta.o) - 0x08004758 0x08004758 0x0000002c Code RO 3176 .text mc_w.l(uidiv.o) - 0x08004784 0x08004784 0x00000024 Code RO 3193 .text mc_w.l(init.o) - 0x080047a8 0x080047a8 0x00000020 Code RO 2961 i.__0printf$3 mc_w.l(printf3.o) - 0x080047c8 0x080047c8 0x0000000e Code RO 3203 i.__scatterload_copy mc_w.l(handlers.o) - 0x080047d6 0x080047d6 0x00000002 Code RO 3204 i.__scatterload_null mc_w.l(handlers.o) - 0x080047d8 0x080047d8 0x0000000e Code RO 3205 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x0800045c 0x0800045c 0x000000c4 Code RO 2469 .text system_stm32f1xx.o + 0x08000520 0x08000520 0x000015e8 Code RO 2525 .text stm32f1xx_hal_spi.o + 0x08001b08 0x08001b08 0x00000188 Code RO 2549 .text stm32f1xx_hal.o + 0x08001c90 0x08001c90 0x000008c8 Code RO 2579 .text stm32f1xx_hal_rcc.o + 0x08002558 0x08002558 0x000003d4 Code RO 2627 .text stm32f1xx_hal_gpio.o + 0x0800292c 0x0800292c 0x00000c48 Code RO 2651 .text stm32f1xx_hal_dma.o + 0x08003574 0x08003574 0x00000224 Code RO 2675 .text stm32f1xx_hal_cortex.o + 0x08003798 0x08003798 0x00000f9c Code RO 2839 .text stm32f1xx_hal_uart.o + 0x08004734 0x08004734 0x00000024 Code RO 2867 .text mc_w.l(memseta.o) + 0x08004758 0x08004758 0x0000002c Code RO 3175 .text mc_w.l(uidiv.o) + 0x08004784 0x08004784 0x00000024 Code RO 3192 .text mc_w.l(init.o) + 0x080047a8 0x080047a8 0x00000020 Code RO 2960 i.__0printf$3 mc_w.l(printf3.o) + 0x080047c8 0x080047c8 0x0000000e Code RO 3202 i.__scatterload_copy mc_w.l(handlers.o) + 0x080047d6 0x080047d6 0x00000002 Code RO 3203 i.__scatterload_null mc_w.l(handlers.o) + 0x080047d8 0x080047d8 0x0000000e Code RO 3204 i.__scatterload_zeroinit mc_w.l(handlers.o) 0x080047e6 0x080047e6 0x00000002 PAD - 0x080047e8 0x080047e8 0x000001b8 Code RO 2968 i._printf_core mc_w.l(printf3.o) - 0x080049a0 0x080049a0 0x00000010 Data RO 2471 .constdata system_stm32f1xx.o - 0x080049b0 0x080049b0 0x00000008 Data RO 2472 .constdata system_stm32f1xx.o - 0x080049b8 0x080049b8 0x00000020 Data RO 3201 Region$$Table anon$$obj.o + 0x080047e8 0x080047e8 0x000001b8 Code RO 2967 i._printf_core mc_w.l(printf3.o) + 0x080049a0 0x080049a0 0x00000010 Data RO 2470 .constdata system_stm32f1xx.o + 0x080049b0 0x080049b0 0x00000008 Data RO 2471 .constdata system_stm32f1xx.o + 0x080049b8 0x080049b8 0x00000020 Data RO 3200 Region$$Table anon$$obj.o Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080049d8, Size: 0x000010b0, Max: 0x00010000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x080049d8 0x00000004 Data RW 2473 .data system_stm32f1xx.o - 0x20000004 0x080049dc 0x0000000c Data RW 2551 .data stm32f1xx_hal.o - 0x20000010 0x080049e8 0x00000004 Data RW 3175 .data mc_w.l(stdout.o) + 0x20000000 0x080049d8 0x00000004 Data RW 2472 .data system_stm32f1xx.o + 0x20000004 0x080049dc 0x0000000c Data RW 2550 .data stm32f1xx_hal.o + 0x20000010 0x080049e8 0x00000004 Data RW 3174 .data mc_w.l(stdout.o) 0x20000014 - 0x00000058 Zero RW 187 .bss spi.o 0x2000006c - 0x00000040 Zero RW 217 .bss usart.o 0x200000ac 0x080049ec 0x00000004 PAD @@ -2197,23 +2196,23 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 96 10 0 0 0 803 gpio.o - 148 20 0 0 0 461070 main.o - 188 18 0 0 88 1429 spi.o + 148 20 0 0 0 461082 main.o + 188 18 0 0 88 1437 spi.o 36 8 304 0 4096 796 startup_stm32f103xe.o 392 38 0 12 0 7649 stm32f1xx_hal.o - 548 12 0 0 0 30674 stm32f1xx_hal_cortex.o + 548 12 0 0 0 30678 stm32f1xx_hal_cortex.o 3144 164 0 0 0 7109 stm32f1xx_hal_dma.o 980 30 0 0 0 4391 stm32f1xx_hal_gpio.o - 60 8 0 0 0 826 stm32f1xx_hal_msp.o + 60 8 0 0 0 830 stm32f1xx_hal_msp.o 2248 88 0 0 0 6559 stm32f1xx_hal_rcc.o 5608 106 0 0 0 19625 stm32f1xx_hal_spi.o - 3996 46 0 0 0 17432 stm32f1xx_hal_uart.o + 3996 46 0 0 0 17436 stm32f1xx_hal_uart.o 48 22 0 0 0 1246 stm32f1xx_it.o - 196 28 24 4 0 1509 system_stm32f1xx.o + 196 28 24 4 0 1517 system_stm32f1xx.o 216 18 0 0 64 1753 usart.o ---------------------------------------------------------------------- - 17904 616 360 16 4252 562871 Object Totals + 17904 616 360 16 4252 562911 Object Totals 0 0 32 0 0 0 (incl. Generated) 0 0 0 0 4 0 (incl. Padding) @@ -2256,8 +2255,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 18544 646 360 20 4252 561955 Grand Totals - 18544 646 360 20 4252 561955 ELF Image Totals + 18544 646 360 20 4252 561995 Grand Totals + 18544 646 360 20 4252 561995 ELF Image Totals 18544 646 360 20 0 0 ROM Totals ============================================================================== diff --git a/STM32/STM32-F103ZET6/User/e-Paper/EPD_1in54_V2.c b/STM32/STM32-F103ZET6/User/e-Paper/EPD_1in54_V2.c index b674cd9..0350066 100644 --- a/STM32/STM32-F103ZET6/User/e-Paper/EPD_1in54_V2.c +++ b/STM32/STM32-F103ZET6/User/e-Paper/EPD_1in54_V2.c @@ -78,30 +78,6 @@ unsigned char WF_PARTIAL_1IN54_0[159] = 0x02,0x17,0x41,0xB0,0x32,0x28, }; -// waveform partial refresh(quality) -unsigned char WF_PARTIAL_1IN54_1[159] = -{ -0x0,0x00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0xA,0x0,0x0,0x0,0x0,0x0,0x1, -0x1,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x0,0x0,0x0,0x0,0x0,0x0,0x0, -0x22,0x22,0x22,0x22,0x22,0x22,0x0,0x0,0x0, -0x22,0x17,0x41,0x0,0x32,0x20, -}; - /****************************************************************************** function : Software reset parameter: @@ -276,21 +252,21 @@ void EPD_1IN54_V2_Init_Partial(void) EPD_1IN54_V2_Reset(); EPD_1IN54_V2_ReadBusy(); - EPD_1IN54_V2_SetLut(WF_PARTIAL_1IN54_1); - EPD_1IN54_V2_SendCommand(0x37); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x40); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - EPD_1IN54_V2_SendData(0x00); - - EPD_1IN54_V2_SendCommand(0x3C); //BorderWavefrom - EPD_1IN54_V2_SendData(0x80); + EPD_1IN54_V2_SetLut(WF_PARTIAL_1IN54_0); + EPD_1IN54_V2_SendCommand(0x37); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x40); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + EPD_1IN54_V2_SendData(0x00); + + EPD_1IN54_V2_SendCommand(0x3C); //BorderWavefrom + EPD_1IN54_V2_SendData(0x80); EPD_1IN54_V2_SendCommand(0x22); EPD_1IN54_V2_SendData(0xc0); diff --git a/Version_CN.txt b/Version_CN.txt index 477dd9d..2af2961 100644 --- a/Version_CN.txt +++ b/Version_CN.txt @@ -24,4 +24,4 @@ 2020-12-09：添加新程序5.83inch V2 e-Paper例程。 2020-12-25：添加新程序4.01inch (F) e-Paper例程。 2021-02-22：添加新程序2.7inch B V2 e-Paper例程。 -2021-07-19: 1.54V2、2.13V3、2.9V2、7.5V2程序均采用外部波形，并提升了刷新速度 \ No newline at end of file +2021-07-19：1.54V2、2.13V3、2.9V2、7.5V2程序均采用外部波形，并提升了刷新速度 \ No newline at end of file