diff --git a/1.54inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c b/1.54inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/1.54inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c +++ b/1.54inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/1.54inch_e-paper_b_code/python2/readme.txt b/1.54inch_e-paper_b_code/python2/readme.txt index bd0a460..bc15227 100644 --- a/1.54inch_e-paper_b_code/python2/readme.txt +++ b/1.54inch_e-paper_b_code/python2/readme.txt @@ -72,6 +72,7 @@ sudo apt-get install python-pip sudo pip install RPi.GPIO sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei 2, change the current directory to where the demo files located. 3, run the demo with: diff --git a/1.54inch_e-paper_b_code/python3/readme.txt b/1.54inch_e-paper_b_code/python3/readme.txt index bd0a460..bc15227 100644 --- a/1.54inch_e-paper_b_code/python3/readme.txt +++ b/1.54inch_e-paper_b_code/python3/readme.txt @@ -72,6 +72,7 @@ sudo apt-get install python-pip sudo pip install RPi.GPIO sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei 2, change the current directory to where the demo files located. 3, run the demo with: diff --git a/1.54inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c b/1.54inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/1.54inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c +++ b/1.54inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/1.54inch_e-paper_c_code/bcm2835/obj/GUI_BMPfile.c b/1.54inch_e-paper_c_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/1.54inch_e-paper_c_code/bcm2835/obj/GUI_BMPfile.c +++ b/1.54inch_e-paper_c_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/1.54inch_e-paper_c_code/python2/readme.txt b/1.54inch_e-paper_c_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/1.54inch_e-paper_c_code/python2/readme.txt +++ b/1.54inch_e-paper_c_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/1.54inch_e-paper_c_code/python3/readme.txt b/1.54inch_e-paper_c_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/1.54inch_e-paper_c_code/python3/readme.txt +++ b/1.54inch_e-paper_c_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/1.54inch_e-paper_c_code/wiringpi/obj/GUI_BMPfile.c b/1.54inch_e-paper_c_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/1.54inch_e-paper_c_code/wiringpi/obj/GUI_BMPfile.c +++ b/1.54inch_e-paper_c_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/1.54inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/1.54inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/1.54inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/1.54inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/1.54inch_e-paper_code/python2/readme.txt b/1.54inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/1.54inch_e-paper_code/python2/readme.txt +++ b/1.54inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/1.54inch_e-paper_code/python3/readme.txt b/1.54inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/1.54inch_e-paper_code/python3/readme.txt +++ b/1.54inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/1.54inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/1.54inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/1.54inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/1.54inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.13inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c b/2.13inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.13inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c +++ b/2.13inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.13inch_e-paper_b&c_code/python2/readme.txt b/2.13inch_e-paper_b&c_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/2.13inch_e-paper_b&c_code/python2/readme.txt +++ b/2.13inch_e-paper_b&c_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.13inch_e-paper_b&c_code/python3/readme.txt b/2.13inch_e-paper_b&c_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/2.13inch_e-paper_b&c_code/python3/readme.txt +++ b/2.13inch_e-paper_b&c_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.13inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c b/2.13inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.13inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c +++ b/2.13inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.13inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/2.13inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 022a6b0..b0aea56 100644 --- a/2.13inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/2.13inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -52,6 +53,7 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPFILEHEADER bmpFileHeader; //Define a bmp file header structure BMPINFOHEADER bmpInfoHeader; //Define a bmp info header structure + // Binary file open if((fp = fopen(path, "rb")) == NULL) { Debug("Cann't open the file!\n"); @@ -65,8 +67,7 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) printf("pixel = %d * %d\r\n", bmpInfoHeader.biWidth, bmpInfoHeader.biHeight); UWORD Image_Width_Byte = (bmpInfoHeader.biWidth % 8 == 0)? (bmpInfoHeader.biWidth / 8): (bmpInfoHeader.biWidth / 8 + 1); - UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); - + UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); UBYTE Image[Image_Width_Byte * bmpInfoHeader.biHeight]; memset(Image, 0xFF, Image_Width_Byte * bmpInfoHeader.biHeight); @@ -82,8 +83,10 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) UWORD Bcolor, Wcolor; UWORD bmprgbquadsize = pow(2, bmpInfoHeader.biBitCount);// 2^1 = 2 BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette + for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; @@ -105,6 +108,7 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) } if(x < Image_Width_Byte) { //bmp Image[x + (bmpInfoHeader.biHeight - y - 1) * Image_Width_Byte] = Rdata; + // printf("rdata = %d\r\n", Rdata); } } } diff --git a/2.13inch_e-paper_code/python2/readme.txt b/2.13inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/2.13inch_e-paper_code/python2/readme.txt +++ b/2.13inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.13inch_e-paper_code/python3/readme.txt b/2.13inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/2.13inch_e-paper_code/python3/readme.txt +++ b/2.13inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.13inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/2.13inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 022a6b0..b0aea56 100644 --- a/2.13inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/2.13inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -52,6 +53,7 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPFILEHEADER bmpFileHeader; //Define a bmp file header structure BMPINFOHEADER bmpInfoHeader; //Define a bmp info header structure + // Binary file open if((fp = fopen(path, "rb")) == NULL) { Debug("Cann't open the file!\n"); @@ -65,8 +67,7 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) printf("pixel = %d * %d\r\n", bmpInfoHeader.biWidth, bmpInfoHeader.biHeight); UWORD Image_Width_Byte = (bmpInfoHeader.biWidth % 8 == 0)? (bmpInfoHeader.biWidth / 8): (bmpInfoHeader.biWidth / 8 + 1); - UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); - + UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); UBYTE Image[Image_Width_Byte * bmpInfoHeader.biHeight]; memset(Image, 0xFF, Image_Width_Byte * bmpInfoHeader.biHeight); @@ -82,8 +83,10 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) UWORD Bcolor, Wcolor; UWORD bmprgbquadsize = pow(2, bmpInfoHeader.biBitCount);// 2^1 = 2 BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette + for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; @@ -105,6 +108,7 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) } if(x < Image_Width_Byte) { //bmp Image[x + (bmpInfoHeader.biHeight - y - 1) * Image_Width_Byte] = Rdata; + // printf("rdata = %d\r\n", Rdata); } } } diff --git a/2.13inch_e-paper_d_code/wiringpi/obj/GUI_BMPfile.c b/2.13inch_e-paper_d_code/wiringpi/obj/GUI_BMPfile.c deleted file mode 100644 index 8de80be..0000000 --- a/2.13inch_e-paper_d_code/wiringpi/obj/GUI_BMPfile.c +++ /dev/null @@ -1,130 +0,0 @@ -/***************************************************************************** -* | File : GUI_BMPfile.c -* | Author : Waveshare team -* | Function : Hardware underlying interface -* | Info : -* Used to shield the underlying layers of each master -* and enhance portability -*---------------- -* | This version: V2.0 -* | Date : 2018-11-12 -* | Info : -* 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c -* 2.fix: GUI_ReadBmp() -* Now Xstart and Xstart can control the position of the picture normally, -* and support the display of images of any size. If it is larger than -* the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# -******************************************************************************/ - -#include "GUI_BMPfile.h" -#include "GUI_Paint.h" -#include "Debug.h" - -#include -#include -#include -#include //exit() -#include //memset() -#include //memset() - -UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) -{ - FILE *fp; //Define a file pointer - BMPFILEHEADER bmpFileHeader; //Define a bmp file header structure - BMPINFOHEADER bmpInfoHeader; //Define a bmp info header structure - - - // Binary file open - if((fp = fopen(path, "rb")) == NULL) { - Debug("Cann't open the file!\n"); - exit(0); - } - - // Set the file pointer from the beginning - fseek(fp, 0, SEEK_SET); - fread(&bmpFileHeader, sizeof(BMPFILEHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 14 - fread(&bmpInfoHeader, sizeof(BMPINFOHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 50 - printf("pixel = %d * %d\r\n", bmpInfoHeader.biWidth, bmpInfoHeader.biHeight); - - UWORD Image_Width_Byte = (bmpInfoHeader.biWidth % 8 == 0)? (bmpInfoHeader.biWidth / 8): (bmpInfoHeader.biWidth / 8 + 1); - UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); - UBYTE Image[Image_Width_Byte * bmpInfoHeader.biHeight]; - memset(Image, 0xFF, Image_Width_Byte * bmpInfoHeader.biHeight); - - // Determine if it is a monochrome bitmap - int readbyte = bmpInfoHeader.biBitCount; - if(readbyte != 1){ - Debug("the bmp Image is not a monochrome bitmap!\n"); - exit(0); - } - - // Determine black and white based on the palette - UWORD i; - UWORD Bcolor, Wcolor; - UWORD bmprgbquadsize = pow(2, bmpInfoHeader.biBitCount);// 2^1 = 2 - BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette - - for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); - } - if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ - Bcolor = BLACK; - Wcolor = WHITE; - }else{ - Bcolor = WHITE; - Wcolor = BLACK; - } - - // Read image data into the cache - UWORD x, y; - UBYTE Rdata; - fseek(fp, bmpFileHeader.bOffset, SEEK_SET); - for(y = 0; y < bmpInfoHeader.biHeight; y++) {//Total display column - for(x = 0; x < Bmp_Width_Byte; x++) {//Show a line in the line - if(fread((char *)&Rdata, 1, readbyte, fp) != readbyte) { - perror("get bmpdata:\r\n"); - break; - } - if(x < Image_Width_Byte) { //bmp - Image[x + (bmpInfoHeader.biHeight - y - 1) * Image_Width_Byte] = Rdata; - // printf("rdata = %d\r\n", Rdata); - } - } - } - fclose(fp); - - // Refresh the image to the display buffer based on the displayed orientation - UBYTE color, temp; - for(y = 0; y < bmpInfoHeader.biHeight; y++){ - for(x = 0; x < bmpInfoHeader.biWidth; x++){ - if(x > Paint.Width || y > Paint.Height){ - break; - } - temp = Image[(x / 8) + (y * Image_Width_Byte)]; - color = (((temp << (x%8)) & 0x80) == 0x80) ?Bcolor:Wcolor; - Paint_SetPixel(Xstart + x, Ystart + y, color); - } - } - return 0; -} - - diff --git a/2.7inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c b/2.7inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.7inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c +++ b/2.7inch_e-paper_b_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.7inch_e-paper_b_code/python2/readme.txt b/2.7inch_e-paper_b_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/2.7inch_e-paper_b_code/python2/readme.txt +++ b/2.7inch_e-paper_b_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.7inch_e-paper_b_code/python3/readme.txt b/2.7inch_e-paper_b_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/2.7inch_e-paper_b_code/python3/readme.txt +++ b/2.7inch_e-paper_b_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.7inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c b/2.7inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.7inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c +++ b/2.7inch_e-paper_b_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.7inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/2.7inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.7inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/2.7inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.7inch_e-paper_code/python2/readme.txt b/2.7inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/2.7inch_e-paper_code/python2/readme.txt +++ b/2.7inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.7inch_e-paper_code/python3/readme.txt b/2.7inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/2.7inch_e-paper_code/python3/readme.txt +++ b/2.7inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.7inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/2.7inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.7inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/2.7inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.13inch_e-paper_d_code/bcm2835/obj/GUI_BMPfile.c b/2.9inch_e-paper_b similarity index 78% rename from 2.13inch_e-paper_d_code/bcm2835/obj/GUI_BMPfile.c rename to 2.9inch_e-paper_b index 8de80be..b0aea56 100644 --- a/2.13inch_e-paper_d_code/bcm2835/obj/GUI_BMPfile.c +++ b/2.9inch_e-paper_b @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.9inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c b/2.9inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c deleted file mode 100644 index 8de80be..0000000 --- a/2.9inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c +++ /dev/null @@ -1,130 +0,0 @@ -/***************************************************************************** -* | File : GUI_BMPfile.c -* | Author : Waveshare team -* | Function : Hardware underlying interface -* | Info : -* Used to shield the underlying layers of each master -* and enhance portability -*---------------- -* | This version: V2.0 -* | Date : 2018-11-12 -* | Info : -* 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c -* 2.fix: GUI_ReadBmp() -* Now Xstart and Xstart can control the position of the picture normally, -* and support the display of images of any size. If it is larger than -* the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# -******************************************************************************/ - -#include "GUI_BMPfile.h" -#include "GUI_Paint.h" -#include "Debug.h" - -#include -#include -#include -#include //exit() -#include //memset() -#include //memset() - -UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) -{ - FILE *fp; //Define a file pointer - BMPFILEHEADER bmpFileHeader; //Define a bmp file header structure - BMPINFOHEADER bmpInfoHeader; //Define a bmp info header structure - - - // Binary file open - if((fp = fopen(path, "rb")) == NULL) { - Debug("Cann't open the file!\n"); - exit(0); - } - - // Set the file pointer from the beginning - fseek(fp, 0, SEEK_SET); - fread(&bmpFileHeader, sizeof(BMPFILEHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 14 - fread(&bmpInfoHeader, sizeof(BMPINFOHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 50 - printf("pixel = %d * %d\r\n", bmpInfoHeader.biWidth, bmpInfoHeader.biHeight); - - UWORD Image_Width_Byte = (bmpInfoHeader.biWidth % 8 == 0)? (bmpInfoHeader.biWidth / 8): (bmpInfoHeader.biWidth / 8 + 1); - UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); - UBYTE Image[Image_Width_Byte * bmpInfoHeader.biHeight]; - memset(Image, 0xFF, Image_Width_Byte * bmpInfoHeader.biHeight); - - // Determine if it is a monochrome bitmap - int readbyte = bmpInfoHeader.biBitCount; - if(readbyte != 1){ - Debug("the bmp Image is not a monochrome bitmap!\n"); - exit(0); - } - - // Determine black and white based on the palette - UWORD i; - UWORD Bcolor, Wcolor; - UWORD bmprgbquadsize = pow(2, bmpInfoHeader.biBitCount);// 2^1 = 2 - BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette - - for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); - } - if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ - Bcolor = BLACK; - Wcolor = WHITE; - }else{ - Bcolor = WHITE; - Wcolor = BLACK; - } - - // Read image data into the cache - UWORD x, y; - UBYTE Rdata; - fseek(fp, bmpFileHeader.bOffset, SEEK_SET); - for(y = 0; y < bmpInfoHeader.biHeight; y++) {//Total display column - for(x = 0; x < Bmp_Width_Byte; x++) {//Show a line in the line - if(fread((char *)&Rdata, 1, readbyte, fp) != readbyte) { - perror("get bmpdata:\r\n"); - break; - } - if(x < Image_Width_Byte) { //bmp - Image[x + (bmpInfoHeader.biHeight - y - 1) * Image_Width_Byte] = Rdata; - // printf("rdata = %d\r\n", Rdata); - } - } - } - fclose(fp); - - // Refresh the image to the display buffer based on the displayed orientation - UBYTE color, temp; - for(y = 0; y < bmpInfoHeader.biHeight; y++){ - for(x = 0; x < bmpInfoHeader.biWidth; x++){ - if(x > Paint.Width || y > Paint.Height){ - break; - } - temp = Image[(x / 8) + (y * Image_Width_Byte)]; - color = (((temp << (x%8)) & 0x80) == 0x80) ?Bcolor:Wcolor; - Paint_SetPixel(Xstart + x, Ystart + y, color); - } - } - return 0; -} - - diff --git a/2.9inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c b/2.9inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c deleted file mode 100644 index 8de80be..0000000 --- a/2.9inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c +++ /dev/null @@ -1,130 +0,0 @@ -/***************************************************************************** -* | File : GUI_BMPfile.c -* | Author : Waveshare team -* | Function : Hardware underlying interface -* | Info : -* Used to shield the underlying layers of each master -* and enhance portability -*---------------- -* | This version: V2.0 -* | Date : 2018-11-12 -* | Info : -* 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c -* 2.fix: GUI_ReadBmp() -* Now Xstart and Xstart can control the position of the picture normally, -* and support the display of images of any size. If it is larger than -* the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# -******************************************************************************/ - -#include "GUI_BMPfile.h" -#include "GUI_Paint.h" -#include "Debug.h" - -#include -#include -#include -#include //exit() -#include //memset() -#include //memset() - -UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) -{ - FILE *fp; //Define a file pointer - BMPFILEHEADER bmpFileHeader; //Define a bmp file header structure - BMPINFOHEADER bmpInfoHeader; //Define a bmp info header structure - - - // Binary file open - if((fp = fopen(path, "rb")) == NULL) { - Debug("Cann't open the file!\n"); - exit(0); - } - - // Set the file pointer from the beginning - fseek(fp, 0, SEEK_SET); - fread(&bmpFileHeader, sizeof(BMPFILEHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 14 - fread(&bmpInfoHeader, sizeof(BMPINFOHEADER), 1, fp); //sizeof(BMPFILEHEADER) must be 50 - printf("pixel = %d * %d\r\n", bmpInfoHeader.biWidth, bmpInfoHeader.biHeight); - - UWORD Image_Width_Byte = (bmpInfoHeader.biWidth % 8 == 0)? (bmpInfoHeader.biWidth / 8): (bmpInfoHeader.biWidth / 8 + 1); - UWORD Bmp_Width_Byte = (Image_Width_Byte % 4 == 0) ? Image_Width_Byte: ((Image_Width_Byte / 4 + 1) * 4); - UBYTE Image[Image_Width_Byte * bmpInfoHeader.biHeight]; - memset(Image, 0xFF, Image_Width_Byte * bmpInfoHeader.biHeight); - - // Determine if it is a monochrome bitmap - int readbyte = bmpInfoHeader.biBitCount; - if(readbyte != 1){ - Debug("the bmp Image is not a monochrome bitmap!\n"); - exit(0); - } - - // Determine black and white based on the palette - UWORD i; - UWORD Bcolor, Wcolor; - UWORD bmprgbquadsize = pow(2, bmpInfoHeader.biBitCount);// 2^1 = 2 - BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette - - for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); - } - if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ - Bcolor = BLACK; - Wcolor = WHITE; - }else{ - Bcolor = WHITE; - Wcolor = BLACK; - } - - // Read image data into the cache - UWORD x, y; - UBYTE Rdata; - fseek(fp, bmpFileHeader.bOffset, SEEK_SET); - for(y = 0; y < bmpInfoHeader.biHeight; y++) {//Total display column - for(x = 0; x < Bmp_Width_Byte; x++) {//Show a line in the line - if(fread((char *)&Rdata, 1, readbyte, fp) != readbyte) { - perror("get bmpdata:\r\n"); - break; - } - if(x < Image_Width_Byte) { //bmp - Image[x + (bmpInfoHeader.biHeight - y - 1) * Image_Width_Byte] = Rdata; - // printf("rdata = %d\r\n", Rdata); - } - } - } - fclose(fp); - - // Refresh the image to the display buffer based on the displayed orientation - UBYTE color, temp; - for(y = 0; y < bmpInfoHeader.biHeight; y++){ - for(x = 0; x < bmpInfoHeader.biWidth; x++){ - if(x > Paint.Width || y > Paint.Height){ - break; - } - temp = Image[(x / 8) + (y * Image_Width_Byte)]; - color = (((temp << (x%8)) & 0x80) == 0x80) ?Bcolor:Wcolor; - Paint_SetPixel(Xstart + x, Ystart + y, color); - } - } - return 0; -} - - diff --git a/2.9inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/2.9inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.9inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/2.9inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/2.9inch_e-paper_code/python2/readme.txt b/2.9inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/2.9inch_e-paper_code/python2/readme.txt +++ b/2.9inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.9inch_e-paper_code/python3/readme.txt b/2.9inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/2.9inch_e-paper_code/python3/readme.txt +++ b/2.9inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/2.9inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/2.9inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/2.9inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/2.9inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/4.2inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c b/4.2inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/4.2inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c +++ b/4.2inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/4.2inch_e-paper_b&c_code/python2/readme.txt b/4.2inch_e-paper_b&c_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/4.2inch_e-paper_b&c_code/python2/readme.txt +++ b/4.2inch_e-paper_b&c_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/4.2inch_e-paper_b&c_code/python3/readme.txt b/4.2inch_e-paper_b&c_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/4.2inch_e-paper_b&c_code/python3/readme.txt +++ b/4.2inch_e-paper_b&c_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/4.2inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c b/4.2inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/4.2inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c +++ b/4.2inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/4.2inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/4.2inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/4.2inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/4.2inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/4.2inch_e-paper_code/python2/readme.txt b/4.2inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/4.2inch_e-paper_code/python2/readme.txt +++ b/4.2inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/4.2inch_e-paper_code/python3/readme.txt b/4.2inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/4.2inch_e-paper_code/python3/readme.txt +++ b/4.2inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/4.2inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/4.2inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/4.2inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/4.2inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/5.83inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c b/5.83inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/5.83inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c +++ b/5.83inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/5.83inch_e-paper_b&c_code/python2/readme.txt b/5.83inch_e-paper_b&c_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/5.83inch_e-paper_b&c_code/python2/readme.txt +++ b/5.83inch_e-paper_b&c_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/5.83inch_e-paper_b&c_code/python3/readme.txt b/5.83inch_e-paper_b&c_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/5.83inch_e-paper_b&c_code/python3/readme.txt +++ b/5.83inch_e-paper_b&c_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/5.83inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c b/5.83inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/5.83inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c +++ b/5.83inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/5.83inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/5.83inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/5.83inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/5.83inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/5.83inch_e-paper_code/python2/readme.txt b/5.83inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/5.83inch_e-paper_code/python2/readme.txt +++ b/5.83inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/5.83inch_e-paper_code/python3/readme.txt b/5.83inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/5.83inch_e-paper_code/python3/readme.txt +++ b/5.83inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/5.83inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/5.83inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/5.83inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/5.83inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/7.5inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c b/7.5inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/7.5inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c +++ b/7.5inch_e-paper_b&c_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/7.5inch_e-paper_b&c_code/python2/readme.txt b/7.5inch_e-paper_b&c_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/7.5inch_e-paper_b&c_code/python2/readme.txt +++ b/7.5inch_e-paper_b&c_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/7.5inch_e-paper_b&c_code/python3/readme.txt b/7.5inch_e-paper_b&c_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/7.5inch_e-paper_b&c_code/python3/readme.txt +++ b/7.5inch_e-paper_b&c_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/7.5inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c b/7.5inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/7.5inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c +++ b/7.5inch_e-paper_b&c_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/7.5inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c b/7.5inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/7.5inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c +++ b/7.5inch_e-paper_code/bcm2835/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK; diff --git a/7.5inch_e-paper_code/python2/readme.txt b/7.5inch_e-paper_code/python2/readme.txt index ffb8fc9..bc15227 100644 --- a/7.5inch_e-paper_code/python2/readme.txt +++ b/7.5inch_e-paper_code/python2/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/7.5inch_e-paper_code/python3/readme.txt b/7.5inch_e-paper_code/python3/readme.txt index ffb8fc9..bc15227 100644 --- a/7.5inch_e-paper_code/python3/readme.txt +++ b/7.5inch_e-paper_code/python3/readme.txt @@ -69,6 +69,11 @@ == How to use == 1, install the Python libraries. + sudo apt-get install python-pip + sudo pip install RPi.GPIO + sudo pip install spidev + sudo apt-get install ttf-wqy-zenhei ttf-wqy-microhei + 2, change the current directory to where the demo files located. 3, run the demo with: python main.py diff --git a/7.5inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c b/7.5inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c index 8de80be..b0aea56 100644 --- a/7.5inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c +++ b/7.5inch_e-paper_code/wiringpi/obj/GUI_BMPfile.c @@ -6,33 +6,34 @@ * Used to shield the underlying layers of each master * and enhance portability *---------------- -* | This version: V2.0 -* | Date : 2018-11-12 +* | This version: V2.1 +* | Date : 2019-03-29 * | Info : * 1.Change file name: GUI_BMP.c -> GUI_BMPfile.c * 2.fix: GUI_ReadBmp() * Now Xstart and Xstart can control the position of the picture normally, * and support the display of images of any size. If it is larger than * the actual display range, it will not be displayed. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documnetation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# +* 3.fix:line87 &bmprgbquad[i * 4] =》 &bmprgbquad[i] +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documnetation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +* ******************************************************************************/ #include "GUI_BMPfile.h" @@ -84,7 +85,8 @@ UBYTE GUI_ReadBmp(const char *path, UWORD Xstart, UWORD Ystart) BMPRGBQUAD bmprgbquad[bmprgbquadsize]; //palette for(i = 0; i < bmprgbquadsize; i++){ - fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + // fread(&bmprgbquad[i * 4], sizeof(BMPRGBQUAD), 1, fp); + fread(&bmprgbquad[i], sizeof(BMPRGBQUAD), 1, fp); } if(bmprgbquad[0].rgbBlue == 0xff && bmprgbquad[0].rgbGreen == 0xff && bmprgbquad[0].rgbRed == 0xff){ Bcolor = BLACK;