build for CP8 and bump mpy-cross for CP7

Author: Neradoc

build.py

@@ -75,11 +75,12 @@ def date_to_version(tag):
 SET_VERSION_PATTERN = "\n__version__ = '{}'\n"
 THIS_REPOSITORY = "https://github.com/Neradoc/Circuitpython_Keyboard_Layouts.git"
 
-PLATFORMS = ["mpy6", "mpy7"]
+PLATFORMS = ["mpy6", "mpy7", "mpy8"]
 PLATFORM_NAMES = {
     "py": "py",
     "mpy6": "6.x-mpy",
     "mpy7": "7.x-mpy",
+    "mpy8": "8.x-mpy",
 }
 
 # https://adafruit-circuit-python.s3.amazonaws.com/index.html?prefix=bin/mpy-cross/
@@ -88,19 +89,23 @@ def date_to_version(tag):
 MPYCROSSES = {
     "darwin": {
         "mpy6": "mpy-cross-macos-catalina-6.3.0",
-        "mpy7": "mpy-cross-macos-universal-7.0.0",
+        "mpy7": "mpy-cross-macos-universal-7.3.0",
+        "mpy8": "mpy-cross-macos-universal-8.0.0-alpha.1",
     },
     "linux": {
         "mpy6": "mpy-cross.static-amd64-linux-6.3.0",
-        "mpy7": "mpy-cross.static-amd64-linux-7.0.0",
+        "mpy7": "mpy-cross.static-amd64-linux-7.3.0",
+        "mpy8": "mpy-cross.static-amd64-linux-8.0.0-alpha.1",
     },
     "win32": {
         "mpy6": "mpy-cross.static-x64-windows-6.3.0.exe",
-        "mpy7": "mpy-cross.static-x64-windows-7.0.0.exe",
+        "mpy7": "mpy-cross.static-x64-windows-7.3.0.exe",
+        "mpy8": "mpy-cross.static-x64-windows-8.0.0-alpha.1.exe",
     },
     "raspbian": {
         "mpy6": "mpy-cross.static-raspbian-6.3.0",
-        "mpy7": "mpy-cross.static-raspbian-7.0.0",
+        "mpy7": "mpy-cross.static-raspbian-7.3.0",
+        "mpy8": "mpy-cross.static-raspbian-8.0.0-alpha.1",
     },
 }
 MPYCROSS = MPYCROSSES[sys.platform]
@@ -282,7 +287,7 @@ def make_the_mpy_bundles():
             fstats = os.stat(cross_file)
             os.chmod(cross_file, fstats.st_mode | stat.S_IEXEC)
 
-    # duplicate the py dir to mpy6 and mpy7
+    # duplicate the py dir to mpy dirs
     pwd = os.getcwd()
     for platform in PLATFORMS:
         cross = os.path.join(BUILD_DEPS, MPYCROSS[platform])

generator-web/layout_generator.html

@@ -51,17 +51,15 @@
 		.download_link#download_link
 		{
 			display: none;
-			width: calc(800px - 6 * 8px - 80px - 3px);
+			/* with - padding - spacing */
+			width: calc(800px - 16px - 3 * (40px + 16px + 1px) - 1px);
 		}
-		.download_link#download_link6
+		.download_link#download_link6,
+		.download_link#download_link7,
+		.download_link#download_link8
 		{
 			display: none;
-			width: calc(40px);
-		}
-		.download_link#download_link7
-		{
-			display: none;
-			width: calc(40px);
+			width: 40px;
 		}
 		#debug_area { display: none; }
 		#sample_code {
@@ -80,16 +78,18 @@
 <div id="content">
 <!-- <p class="warning">This will not work with browsers that block access to external sites from javascript.<br/>Oh well, I'll try something else...</p> -->
 <p>Generate a Windows keyboard layout for Circuitpython's <a href="https://circuitpython.readthedocs.io/projects/hid/en/latest/">adafruit_hid</a>.</p>
+<p>This is the online generator for the <a href="https://github.com/Neradoc/Circuitpython_Keyboard_Layouts">Circuitpython Keyboard Layouts</a> repository.</p>
 <ul>
 	<li>Go to <a target="_BLANK" href="https://kbdlayout.info/">kbdlayout.info</a> and find your layout's page.</li>
 	<li>Paste the url of the layout into the box below (see example).</li>
 	<li>Press the "Make Zip Bundle Links" button.</li>
 	<li>Click the link to download the zip with the modules.</li>
 	<li>Unzip the zip.</li>
-	<li>Copy the files to your boards "lib" directory (the sample code is not needed).</li>
-	<li>Don't forget to install adafruit_hid too if it's not already there.</li>
+	<li>Copy the files to your boards "lib" directory (not the sample code).</li>
+	<li>Don't forget ton install adafruit_hid too if it's not already there.</li>
 	<li>Follow the sample code, included in the zip.</li>
-	<li>Come bother me <a href="https://adafru.it/discord">on discord</a> if it doesn't work (no private messages).</li>
+	<li>Come bother me <a href="https://adafru.it/discord">on the adafruit discord</a> if it doesn't work (no private messages).</li>
+	<li>Or <a href="https://github.com/Neradoc/Circuitpython_Keyboard_Layouts/issues">open an issue on github</a>.</li>
 </ul>
 <p class="note">Note: There are additional links to have the module files pre-compiled for Circuitpython 6 or 7. A pre-compiled (.mpy) file takes less space and is faster to load. It also requires less RAM to load, which <i>might</i> allow it to be used on a SAMD21 board (often refered to M0, they are very limited in memory when running Circuitpython).</p>
 <p>
@@ -100,6 +100,7 @@
 	<a class="download_link" id="download_link" href="">Download the zip file (.py)</a>
 	<a class="download_link" id="download_link6" href="">CP6</a>
 	<a class="download_link" id="download_link7" href="">CP7</a>
+	<a class="download_link" id="download_link8" href="">CP8</a>
 <p>
 <div id="debug_area">
 	<pre id="debug">DEBUG</pre>

generator-web/layout_generator.js

@@ -449,6 +449,7 @@ function download_layout() {
             { extension: ".py", extout: ".py", id: "", version: "py" },
             { extension: "6.mpy", extout: ".mpy", id: "6", version: "mpy6" },
             { extension: "7.mpy", extout: ".mpy", id: "7", version: "mpy7" },
+            { extension: "8.mpy", extout: ".mpy", id: "8", version: "mpy8" },
         ];
         for( z in zips ) {
             (() => {
@@ -463,6 +464,7 @@ function download_layout() {
                 var base_layout_local = BASE_LAYOUT_NAME.replace("{}", zipper.extension);
                 var base_layout_file = BASE_DIR + base_layout_local;
                 $.get(base_layout_file, (data) => {
+                	console.log(base_layout_name);
                     outputZip.file(base_layout_name, data);
                     outputZip.generateAsync({type:"base64"}).then(function (base64) {
                         zip_data = "data:application/zip;base64," + base64;

generator-web/layout_generator_link.js

@@ -12,6 +12,7 @@ function download_layout() {
         { extension: ".py", extout: ".py", id: "", version: "py" },
         { extension: "6.mpy", extout: ".mpy", id: "6", version: "mpy6" },
         { extension: "7.mpy", extout: ".mpy", id: "7", version: "mpy7" },
+        { extension: "8.mpy", extout: ".mpy", id: "8", version: "mpy8" },
     ];
     for( z in zips ) {
         var zipper = zips[z];
@@ -22,7 +23,7 @@ function download_layout() {
 
         //
         $("#download_link"+zipper.id).attr("href", zurl);
-        // $("#download_link"+zipper.id).attr("download", zip_file);
+        //$("#download_link"+zipper.id).attr("download", zip_file);
         $("#download_link"+zipper.id).attr("title", zip_file);
         $("#download_link"+zipper.id).show();
     }

generator-web/make_zip_bundle.php

@@ -5,7 +5,7 @@
 
 ob_start();
 $ERRORS = [];
-$LAYOUT_BASE = false;
+define("LAYOUT_BASE", false);
 
 $source_url = "";
 $platform = "win";
@@ -91,7 +91,7 @@
 
 $keycodes = preg_replace("/".preg_quote($VERSION0)."/", $VERSION, $keycodes);
 
-if($LAYOUT_BASE) {
+if(LAYOUT_BASE) {
 	if( !file_exists("src/keyboard_layout6.mpy") ) {
 		exec("mpy-cross/mpy-cross.static-amd64-linux-6 src/keyboard_layout.py");
 		rename("src/keyboard_layout.mpy", "src/keyboard_layout6.mpy");
@@ -100,6 +100,10 @@
 		exec("mpy-cross/mpy-cross.static-amd64-linux-7 src/keyboard_layout.py");
 		rename("src/keyboard_layout.mpy", "src/keyboard_layout7.mpy");
 	}
+	if( !file_exists("src/keyboard_layout8.mpy") ) {
+		exec("mpy-cross/mpy-cross.static-amd64-linux-8 src/keyboard_layout.py");
+		rename("src/keyboard_layout.mpy", "src/keyboard_layout8.mpy");
+	}
 }
 
 function make_zip($layout, $keycodes, $cpversion, $platform, $lang) {
@@ -110,6 +114,8 @@ function make_zip($layout, $keycodes, $cpversion, $platform, $lang) {
 		$filepath_zip = "data/layout_files_".$platform."_".$lang."-6mpy.zip";
 	} elseif( $cpversion == "7" ) {
 		$filepath_zip = "data/layout_files_".$platform."_".$lang."-7mpy.zip";
+	} elseif( $cpversion == "8" ) {
+		$filepath_zip = "data/layout_files_".$platform."_".$lang."-8mpy.zip";
 	} else {
 		$filepath_zip = "data/layout_files_".$platform."_".$lang."-py.zip";
 	}
@@ -125,7 +131,7 @@ function make_zip($layout, $keycodes, $cpversion, $platform, $lang) {
 		$layout_file = "keyboard_layout_" . $platform . "_" . $lang . ".py";
 		$keycodes_file = "keycode_" . $platform . "_" . $lang . ".py";
 
-		if( $cpversion == "6" || $cpversion == "7" ) {
+		if( $cpversion == "6" || $cpversion == "7" || $cpversion == "8" ) {
 			# layout
 			$layout_name = preg_replace("/\.py$/", ".mpy", $layout_file);
 			$tempfile = "data/" . uniqid() . "_" . $layout_file;
@@ -145,13 +151,13 @@ function make_zip($layout, $keycodes, $cpversion, $platform, $lang) {
 			$deletes[] = $tempfile;
 			$deletes[] = $mpyfile;
 			# layout base
-			if($LAYOUT_BASE) {
+			if(LAYOUT_BASE) {
 				$zip->addFile("src/keyboard_layout".$cpversion.".mpy", "keyboard_layout.mpy");
 			}
 		} else {
 			$zip->addFromString($layout_file, $layout);
 			$zip->addFromString($keycodes_file, $keycodes);
-			if($LAYOUT_BASE) {
+			if(LAYOUT_BASE) {
 				$zip->addFile("src/keyboard_layout.py", "keyboard_layout.py");
 			}
 		}