update for Book Worm

txoof · Jan 14, 2024 · 131c569 · 131c569
1 parent 608cd05
commit 131c569
Show file tree

Hide file tree

Showing 29 changed files with 2,454 additions and 683 deletions.
diff --git a/README.md b/README.md
@@ -327,54 +327,62 @@ Most of the WaveShare screens that support 2/3 color output will also work with
 
 |Screen            |Supported      |Mode          |
 |:-----------------|:--------------|:-------------|
-|00. epd1in02      |False          |Unsupported   |
-|01. epd1in54      |True           |"1" 1 bit     |
-|02. epd1in54_V2   |True           |"1" 1 bit     |
-|03. epd1in54b     |True           |"1" 1 bit     |
-|04. epd1in54b_V2  |True           |"1" 1 bit     |
-|05. epd1in54c     |True           |"1" 1 bit     |
-|06. epd1in64g     |True           |"1" 1 bit     |
-|07. epd2in13      |True           |"1" 1 bit     |
-|08. epd2in13_V2   |True           |"1" 1 bit     |
-|09. epd2in13_V3   |True           |"1" 1 bit     |
-|10. epd2in13b_V3  |True           |"1" 1 bit     |
-|11. epd2in13b_V4  |True           |"1" 1 bit     |
-|12. epd2in13bc    |True           |"1" 1 bit     |
-|13. epd2in13d     |True           |"1" 1 bit     |
-|14. epd2in36g     |True           |"1" 1 bit     |
-|15. epd2in66      |True           |"1" 1 bit     |
-|16. epd2in66b     |True           |"1" 1 bit     |
-|17. epd2in7       |True           |"1" 1 bit     |
-|18. epd2in7_V2    |True           |"1" 1 bit     |
-|19. epd2in7b      |True           |"1" 1 bit     |
-|20. epd2in7b_V2   |True           |"1" 1 bit     |
-|21. epd2in9       |True           |"1" 1 bit     |
-|22. epd2in9_V2    |True           |"1" 1 bit     |
-|23. epd2in9b_V3   |True           |"1" 1 bit     |
-|24. epd2in9bc     |True           |"1" 1 bit     |
-|25. epd2in9d      |True           |"1" 1 bit     |
-|26. epd3in0g      |True           |"1" 1 bit     |
-|27. epd3in52      |True           |"1" 1 bit     |
-|28. epd3in7       |False          |Unsupported   |
-|29. epd4in01f     |True           |"RGB" 7 Color |
-|30. epd4in2       |True           |"1" 1 bit     |
-|31. epd4in2b_V2   |True           |"1" 1 bit     |
-|32. epd4in2bc     |True           |"1" 1 bit     |
-|33. epd4in37g     |True           |"1" 1 bit     |
-|34. epd5in65f     |True           |"RGB" 7 Color |
-|35. epd5in83      |True           |"1" 1 bit     |
-|36. epd5in83_V2   |True           |"1" 1 bit     |
-|37. epd5in83b_V2  |True           |"1" 1 bit     |
-|38. epd5in83bc    |True           |"1" 1 bit     |
-|39. epd7in3f      |True           |"RGB" 7 Color |
-|40. epd7in3g      |True           |"1" 1 bit     |
-|41. epd7in5       |True           |"1" 1 bit     |
-|42. epd7in5_HD    |True           |"1" 1 bit     |
-|43. epd7in5_V2    |True           |"1" 1 bit     |
-|44. epd7in5b_HD   |True           |"1" 1 bit     |
-|45. epd7in5b_V2   |True           |"1" 1 bit     |
-|46. epd7in5bc     |True           |"1" 1 bit     |
-|47. All HD IT8951 |True           |"L" 8 bit     |
+|00. epd13in3k     |True           |"1" 1 bit     |
+|01. epd1in02      |True           |"1" 1 bit     |
+|02. epd1in54      |True           |"1" 1 bit     |
+|03. epd1in54_V2   |True           |"1" 1 bit     |
+|04. epd1in54b     |True           |"1" 1 bit     |
+|05. epd1in54b_V2  |True           |"1" 1 bit     |
+|06. epd1in54c     |True           |"1" 1 bit     |
+|07. epd1in64g     |True           |"1" 1 bit     |
+|08. epd2in13      |True           |"1" 1 bit     |
+|09. epd2in13_V2   |True           |"1" 1 bit     |
+|10. epd2in13_V3   |True           |"1" 1 bit     |
+|11. epd2in13_V4   |True           |"1" 1 bit     |
+|12. epd2in13b_V3  |True           |"1" 1 bit     |
+|13. epd2in13b_V4  |True           |"1" 1 bit     |
+|14. epd2in13bc    |True           |"1" 1 bit     |
+|15. epd2in13d     |False          |Unsupported   |
+|16. epd2in13g     |True           |"1" 1 bit     |
+|17. epd2in36g     |True           |"1" 1 bit     |
+|18. epd2in66      |True           |"1" 1 bit     |
+|19. epd2in66b     |True           |"1" 1 bit     |
+|20. epd2in66g     |True           |"1" 1 bit     |
+|21. epd2in7       |True           |"1" 1 bit     |
+|22. epd2in7_V2    |True           |"1" 1 bit     |
+|23. epd2in7b      |True           |"1" 1 bit     |
+|24. epd2in7b_V2   |True           |"1" 1 bit     |
+|25. epd2in9       |True           |"1" 1 bit     |
+|26. epd2in9_V2    |True           |"1" 1 bit     |
+|27. epd2in9b_V3   |True           |"1" 1 bit     |
+|28. epd2in9b_V4   |True           |"1" 1 bit     |
+|29. epd2in9bc     |True           |"1" 1 bit     |
+|30. epd2in9d      |False          |Unsupported   |
+|31. epd3in0g      |True           |"1" 1 bit     |
+|32. epd3in52      |True           |"1" 1 bit     |
+|33. epd3in7       |False          |Unsupported   |
+|34. epd4in01f     |True           |"RGB" 7 Color |
+|35. epd4in2       |False          |Unsupported   |
+|36. epd4in26      |True           |"1" 1 bit     |
+|37. epd4in2_V2    |False          |Unsupported   |
+|38. epd4in2b_V2   |True           |"1" 1 bit     |
+|39. epd4in2bc     |True           |"1" 1 bit     |
+|40. epd4in37g     |True           |"1" 1 bit     |
+|41. epd5in65f     |True           |"RGB" 7 Color |
+|42. epd5in83      |True           |"1" 1 bit     |
+|43. epd5in83_V2   |True           |"1" 1 bit     |
+|44. epd5in83b_V2  |True           |"1" 1 bit     |
+|45. epd5in83bc    |True           |"1" 1 bit     |
+|46. epd7in3f      |True           |"RGB" 7 Color |
+|47. epd7in3g      |True           |"1" 1 bit     |
+|48. epd7in5       |True           |"1" 1 bit     |
+|49. epd7in5_HD    |True           |"1" 1 bit     |
+|50. epd7in5_V2    |True           |"1" 1 bit     |
+|51. epd7in5_V2_old|True           |"1" 1 bit     |
+|52. epd7in5b_HD   |True           |"1" 1 bit     |
+|53. epd7in5b_V2   |True           |"1" 1 bit     |
+|54. epd7in5bc     |True           |"1" 1 bit     |
+|55. All HD IT8951 |True           |"L" 8 bit     |
 
 <a name="knownIssues"> </a>
 ## Issues

diff --git a/documentation/Change_Log.md b/documentation/Change_Log.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.5.5.0
+
+* Deprecated `Crypto` plugin. 
+* Improved install experience for Bookworm (64 Bit)
+
 ## 0.5.4.1
 
 ### Update installer scripts

diff --git a/documentation/Plugins.md b/documentation/Plugins.md
@@ -17,16 +17,13 @@ All plugins are configured through the `paperpi.ini` files. For a single-user co
 
 ![basic_clock sample image](../paperpi/plugins/basic_clock/basic_clock.layout-L-sample.png)
 
-
-
 [end: basic_clock]: #
 
 
-
 [start: crypto]: #
 
-### [crypto](../paperpi/plugins/crypto/README.md)
-![crypto sample image](../paperpi/plugins/crypto/crypto.layout-L-sample.png)
+### crypto
+**NOTE: This plugin is not supported as of V0.5.5**
 
 [end: crypto]: #
 

diff --git a/install/install.sh b/install/install.sh
@@ -53,7 +53,6 @@ function Help {
   -h        This help screen
   -u        uninstall $APPNAME
   -p        uninstall $APPNAME and purge all config files
-  -s        skip OS version check for manuall install on 64 bit systems
   "
 
 }
@@ -489,11 +488,11 @@ while [[ $# -gt 0 ]]; do
     shift
     shift
     ;;
-  -s) # skip OS version check
-    SKIP_OS_CHECK=1
-    shift
-    shift
-    ;;
+  # -s) # skip OS version check
+  #   SKIP_OS_CHECK=1
+  #   shift
+  #   shift
+  #   ;;
   -u) # uninstall
     INSTALL=0
     UNINSTALL=1
@@ -518,7 +517,7 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-check_os
+#check_os
 stop_daemon
 check_permissions
 check_deb_packages

diff --git a/install/paperpi b/install/paperpi
@@ -7,7 +7,7 @@ VENV_PATH="$PROGRAM_PATH/venv_paperpi"
 
 source "$VENV_PATH/bin/activate"
 
-$(realpath $PROGRAM_PATH/paperpi.py "$@")
+$(realpath $PROGRAM_PATH/paperpi.py) "$@"
 
 deactivate
 

diff --git a/install/remote_install.sh b/install/remote_install.sh
@@ -73,11 +73,11 @@ then
   abort "Bash is required to interpret this script."
 fi
 
-# fail if not 32 bit os
-if [ ! "$long_bit" == "32" ]
-then
-  abort "PaperPi is officially supported only on 32 bit versions of RaspberryPi OS. See the READMEfor manual install instructions."
-fi
+# # fail if not 32 bit os
+# if [ ! "$long_bit" == "32" ]
+# then
+#   abort "PaperPi is officially supported only on 32 bit versions of RaspberryPi OS. See the README for manual install instructions."
+# fi
 
 # check if git is available
 if ! command -v git > /dev/null

diff --git a/jupytext.toml b/jupytext.toml
@@ -0,0 +1 @@
+formats = "ipynb,py:light"
diff --git a/paperpi/library/Plugin.ipynb b/paperpi/library/Plugin.ipynb
@@ -2,17 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": null,
-   "id": "6e4e69cb",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!jupyter-nbconvert --to python --template python_clean Plugin.ipynb"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "id": "da4e2973",
    "metadata": {},
    "outputs": [],
@@ -26,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "id": "d7062c99",
    "metadata": {},
    "outputs": [],
@@ -36,17 +26,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "id": "55b068de",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# logging.basicConfig(level='DEBUG')"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "id": "0f55fce5",
    "metadata": {},
    "outputs": [],
@@ -73,7 +53,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "id": "6a2fa426",
    "metadata": {},
    "outputs": [],
@@ -84,7 +64,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "id": "f155febf",
    "metadata": {},
    "outputs": [],
@@ -139,6 +119,7 @@
     "            '''\n",
     "        \n",
     "        self.name = name\n",
+    "        self.priority = 2**15\n",
     "        self.resolution = resolution\n",
     "        self.force_onebit = force_onebit\n",
     "        self.screen_mode = screen_mode\n",
@@ -336,16 +317,13 @@
     "        self.layout_obj = Layout(resolution=self.resolution, \n",
     "                                 layout=layout,\n",
     "                                 force_onebit=self.force_onebit,\n",
-    "                                 mode=self.screen_mode)\n",
-    "        \n",
-    "        \n",
-    "        "
+    "                                 mode=self.screen_mode)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "12b6b523",
+   "id": "338881bd-1800-454f-bded-113704393c47",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -409,8 +387,8 @@
     "               screen_mode='RGB',\n",
     "               plugin_timeout=5)\n",
     "\n",
-    "#     Plugin.update_function = bogus_plugin\n",
-    "    \n",
+    "    # Plugin.update_function = bogus_plugin\n",
+    "\n",
     "    logger.root.setLevel('INFO')\n",
     "    print('this demo is best run from inside jupyter notebook')\n",
     "    p.force_update()\n",
@@ -435,6 +413,24 @@
     "    return p"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "8cec32b5",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "87c95024",
+   "metadata": {
+    "lines_to_next_cell": 2
+   },
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -449,17 +445,17 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "e7d7c5f8",
+   "id": "78c46572",
    "metadata": {},
    "outputs": [],
    "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "PaperPi-VBShxqF-",
+   "display_name": "venv_paperpi-9876705927",
    "language": "python",
-   "name": "paperpi-vbshxqf-"
+   "name": "venv_paperpi-9876705927"
   },
   "language_info": {
    "codemirror_mode": {
@@ -471,7 +467,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.2"
+   "version": "3.11.2"
   }
  },
  "nbformat": 4,