diff --git a/.dockerignore b/.dockerignore index 8b51619..b0c3f24 100644 --- a/.dockerignore +++ b/.dockerignore @@ -15,6 +15,9 @@ frontend/.vite/ wokwi-libs/avr8js/dist/ wokwi-libs/wokwi-elements/dist/ +# QEMU source & Windows builds (only prebuilt/qemu/ .so files are needed) +wokwi-libs/qemu-lcgamboa/ + # IDE and OS .vscode/ .idea/ diff --git a/.github/workflows/build-espidf-toolchain.yml b/.github/workflows/build-espidf-toolchain.yml new file mode 100644 index 0000000..1df1a98 --- /dev/null +++ b/.github/workflows/build-espidf-toolchain.yml @@ -0,0 +1,46 @@ +name: Build ESP-IDF Toolchain Image + +# Runs when Dockerfile.espidf-toolchain changes, or manually +on: + push: + branches: [master] + paths: + - 'Dockerfile.espidf-toolchain' + workflow_dispatch: + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository_owner }}/velxio-espidf-toolchain + +permissions: + contents: read + packages: write + +jobs: + build-toolchain: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to GHCR + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push ESP-IDF toolchain image + uses: docker/build-push-action@v6 + with: + context: . + file: Dockerfile.espidf-toolchain + push: true + tags: | + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:idf-4.4.7 + cache-from: type=gha,scope=espidf + cache-to: type=gha,scope=espidf,mode=max diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 945e762..b48c4bd 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -53,6 +53,8 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + ESPIDF_IMAGE=ghcr.io/davidmonterocrespo24/velxio-espidf-toolchain:latest cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.gitignore b/.gitignore index 7980fdc..1214e91 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,12 @@ backend/app/services/esp32-v3-rom.bin backend/app/services/esp32-v3-rom-app.bin backend/app/services/esp32c3-rom.bin +# Pre-built QEMU .so for Docker (built by build-qemu.sh — ~30MB Linux binaries) +prebuilt/* +!prebuilt/qemu/ +prebuilt/qemu/* +!prebuilt/qemu/.gitkeep + # ESP32 build artifacts (ELF/MAP debug symbols — large, not needed for tests) test/esp32-emulator/**/*.elf test/esp32-emulator/**/*.map diff --git a/Dockerfile.espidf-toolchain b/Dockerfile.espidf-toolchain new file mode 100644 index 0000000..613f894 --- /dev/null +++ b/Dockerfile.espidf-toolchain @@ -0,0 +1,28 @@ +# ESP-IDF toolchain image — built once, pulled many times. +# Published to GHCR by build-espidf-toolchain.yml Action. +# Usage: docker build -f Dockerfile.espidf-toolchain -t velxio-espidf-toolchain . +FROM ubuntu:22.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + git wget flex bison gperf python3 python3-pip python3-venv \ + cmake ninja-build ccache libffi-dev libssl-dev \ + libusb-1.0-0 ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# Install ESP-IDF 4.4.7 (matches Arduino ESP32 core 2.0.17 / lcgamboa QEMU ROM) +RUN git clone -b v4.4.7 --recursive --depth=1 --shallow-submodules \ + https://github.com/espressif/esp-idf.git /opt/esp-idf + +WORKDIR /opt/esp-idf + +# Install toolchains for esp32 (Xtensa) and esp32c3 (RISC-V) only +RUN ./install.sh esp32,esp32c3 + +# Clean up large unnecessary files to reduce image size +RUN rm -rf .git docs examples \ + && find /root/.espressif -name '*.tar.*' -delete 2>/dev/null || true + +# Install Arduino-as-component for full Arduino API support in ESP-IDF builds +RUN git clone --branch 2.0.17 --depth=1 --recursive --shallow-submodules \ + https://github.com/espressif/arduino-esp32.git /opt/arduino-esp32 \ + && rm -rf /opt/arduino-esp32/.git diff --git a/Dockerfile.standalone b/Dockerfile.standalone index 90444f0..b40262d 100644 --- a/Dockerfile.standalone +++ b/Dockerfile.standalone @@ -1,27 +1,30 @@ -# ---- Stage 0: Compile lcgamboa QEMU as Linux .so (full ESP32 GPIO emulation) ---- -FROM ubuntu:22.04 AS qemu-builder +# ---- Stage 0: QEMU .so + ROM binaries ---- +# Two modes: +# 1. Local: place files in prebuilt/qemu/ (from build-qemu.sh or manual copy) +# 2. CI/CD: downloads from GitHub Release (requires qemu-lcgamboa repo to be public) +# The COPY always runs; the RUN only downloads missing files. +FROM ubuntu:22.04 AS qemu-provider -RUN apt-get update && apt-get install -y --no-install-recommends \ - git python3 python3-pip python3-setuptools \ - ninja-build pkg-config flex bison \ - gcc g++ make ca-certificates \ - libglib2.0-dev libgcrypt20-dev libslirp-dev \ - libpixman-1-dev libfdt-dev \ +RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates \ && rm -rf /var/lib/apt/lists/* -# QEMU 8.x requires meson >= 1.0 -RUN pip3 install meson +ARG QEMU_RELEASE_URL=https://github.com/davidmonterocrespo24/velxio/releases/download/qemu-prebuilt -# Clone lcgamboa fork (picsimlab-esp32 branch adds GPIO/ADC/UART/RMT C callback API) -RUN git clone --depth=1 --branch picsimlab-esp32 \ - https://github.com/lcgamboa/qemu /qemu-lcgamboa +# Copy the prebuilt directory (may contain .so+ROM files or just the .gitkeep) +RUN mkdir -p /qemu +COPY prebuilt/qemu/ /qemu/ -WORKDIR /qemu-lcgamboa - -# Build libqemu-xtensa.so (ESP32/S3) and libqemu-riscv32.so (ESP32-C3). -# The script: configures with --extra-cflags=-fPIC, builds normally, then -# re-links without softmmu_main.c.o and with -shared. -RUN bash build_libqemu-esp32.sh +# Download any missing files from GitHub Release +RUN cd /qemu \ + && for f in libqemu-xtensa.so libqemu-riscv32.so esp32-v3-rom.bin esp32-v3-rom-app.bin esp32c3-rom.bin; do \ + if [ ! -f "$f" ]; then \ + echo "Downloading $f from release..." ; \ + curl -fSL -o "$f" "${QEMU_RELEASE_URL}/$f" ; \ + else \ + echo "Using local $f ($(stat -c%s "$f") bytes)" ; \ + fi ; \ + done \ + && ls -lh /qemu/ # ---- Stage 0.5: ESP-IDF toolchain for ESP32 compilation ---- @@ -133,11 +136,12 @@ COPY deploy/nginx.conf /etc/nginx/conf.d/default.conf # Copy built frontend assets from builder stage COPY --from=frontend-builder /app/frontend/dist /usr/share/nginx/html -# Copy and configure entrypoint script +# Copy and configure entrypoint script (fix Windows CRLF → LF) COPY deploy/entrypoint.sh /app/entrypoint.sh -RUN chmod +x /app/entrypoint.sh +RUN sed -i 's/\r$//' /app/entrypoint.sh && chmod +x /app/entrypoint.sh -# ── ESP32 emulation: lcgamboa QEMU .so + ROM binaries ──────────────────────── +# ── ESP32 emulation: pre-built QEMU .so + ROM binaries ────────────────────── +# Downloaded from GitHub Release (public — no access to qemu-lcgamboa needed) # libqemu-xtensa.so → ESP32 / ESP32-S3 (Xtensa LX6/LX7) # libqemu-riscv32.so → ESP32-C3 (RISC-V RV32IMC) # esp32-v3-rom*.bin → boot/app ROM images required by esp32-picsimlab machine @@ -145,11 +149,7 @@ RUN chmod +x /app/entrypoint.sh # NOTE: ROM files must live in the same directory as the .so (worker passes -L # to QEMU pointing at os.path.dirname(lib_path)) RUN mkdir -p /app/lib -COPY --from=qemu-builder /qemu-lcgamboa/build/libqemu-xtensa.so /app/lib/ -COPY --from=qemu-builder /qemu-lcgamboa/build/libqemu-riscv32.so /app/lib/ -COPY --from=qemu-builder /qemu-lcgamboa/pc-bios/esp32-v3-rom.bin /app/lib/ -COPY --from=qemu-builder /qemu-lcgamboa/pc-bios/esp32-v3-rom-app.bin /app/lib/ -COPY --from=qemu-builder /qemu-lcgamboa/pc-bios/esp32c3-rom.bin /app/lib/ +COPY --from=qemu-provider /qemu/ /app/lib/ # Activate ESP32 emulation # QEMU_ESP32_LIB → Xtensa library (ESP32, ESP32-S3) diff --git a/backend/app/services/espidf_compiler.py b/backend/app/services/espidf_compiler.py index b9e80a6..890de4a 100644 --- a/backend/app/services/espidf_compiler.py +++ b/backend/app/services/espidf_compiler.py @@ -105,6 +105,62 @@ class ESPIDFCompiler: code )) + def _normalize_wifi_for_qemu(self, code: str) -> str: + """ + Normalize WiFi SSID/password/channel in Arduino sketches for QEMU. + + QEMU's WiFi AP broadcasts "Velxio-GUEST" on channel 6 with open auth. + This method rewrites the user's sketch so that: + - Any SSID string literal → "Velxio-GUEST" + - Password → "" (open auth) + - Channel → 6 + The user's editor still shows their original code; only the compiled + binary is modified. + """ + if not self._detect_wifi_usage(code): + return code + + # 1) Replace SSID variable definitions: + # const char* ssid = "anything" → "Velxio-GUEST" + # char ssid[] = "anything" → "Velxio-GUEST" + # #define WIFI_SSID "anything" → "Velxio-GUEST" + code = re.sub( + r'((?:const\s+)?char\s*\*?\s*ssid\s*\[?\]?\s*=\s*)"[^"]*"', + rf'\1"{_QEMU_WIFI_SSID}"', + code, + flags=re.IGNORECASE + ) + code = re.sub( + r'(#define\s+\w*SSID\w*\s+)"[^"]*"', + rf'\1"{_QEMU_WIFI_SSID}"', + code, + flags=re.IGNORECASE + ) + + # 2) Normalize WiFi.begin() calls: + # WiFi.begin("X") → WiFi.begin("Velxio-GUEST", "", 6) + # WiFi.begin("X", "pass") → WiFi.begin("Velxio-GUEST", "", 6) + # WiFi.begin(ssid, pass, N) → WiFi.begin(ssid, "", 6) + # WiFi.begin(ssid) → WiFi.begin(ssid, "", 6) + + def _rewrite_wifi_begin(m: re.Match) -> str: + args = m.group(1) + parts = [a.strip() for a in args.split(',')] + ssid_arg = parts[0] + # If SSID is a string literal, force to Velxio-GUEST + if ssid_arg.startswith('"'): + ssid_arg = f'"{_QEMU_WIFI_SSID}"' + return f'WiFi.begin({ssid_arg}, "", 6)' + + code = re.sub( + r'WiFi\.begin\s*\(([^)]+)\)', + _rewrite_wifi_begin, + code + ) + + logger.info('[espidf] WiFi normalized: SSID→%s, channel→6, open auth', _QEMU_WIFI_SSID) + return code + def _translate_sketch_to_espidf(self, sketch_code: str) -> str: """ Translate an Arduino WiFi+WebServer sketch to pure ESP-IDF C code. @@ -400,26 +456,11 @@ class ESPIDFCompiler: if not main_content and files: main_content = files[0]['content'] - # Auto-fix missing channel argument in WiFi.begin for QEMU compatibility - # QEMU's mock WiFi AP is on channel 6, and active scanning hangs the simulator. - # Match WiFi.begin(...) without a channel, catching both literals and variables. - # 1 arg: WiFi.begin(ssid) -> WiFi.begin(ssid, "", 6) - main_content = re.sub( - r'WiFi\.begin\s*\(\s*([^,]+?)\s*\)', - r'WiFi.begin(\1, "", 6)', - main_content - ) - # 2 args: WiFi.begin(ssid, pass) -> WiFi.begin(ssid, pass, 6) - # Exclude matching if the second arg is obviously an int channel (which is wrong but possible) - # We match if there are exactly two args. We have to be careful with commas. - main_content = re.sub( - r'WiFi\.begin\s*\(\s*([^,]+?)\s*,\s*([^,]+?)\s*\)', - r'WiFi.begin(\1, \2, 6)', - main_content - ) - - # Since QEMU's AP accepts any SSID (as long as it's on channel 6), - # we let the user use Velxio-GUEST or whatever they want. + # ── QEMU WiFi compatibility ────────────────────────────────────── + # QEMU's WiFi AP broadcasts "Velxio-GUEST" on channel 6. + # We normalize ANY user SSID → "Velxio-GUEST", enforce channel 6, + # and use open auth (empty password) so the connection always works. + main_content = self._normalize_wifi_for_qemu(main_content) if self.has_arduino: # Arduino-as-component mode: copy sketch as .cpp diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 7466b5d..e64a6d7 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -14,6 +14,7 @@ services: - DATA_DIR=/app/data - IDF_PATH=/opt/esp-idf - IDF_TOOLS_PATH=/root/.espressif + - ARDUINO_ESP32_PATH=/opt/arduino-esp32 volumes: - ./data:/app/data - arduino-libs:/root/.arduino15 diff --git a/docker-compose.yml b/docker-compose.yml index be38022..8500a4c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,32 @@ +# Development Docker Compose — same image as production for full parity. +# Usage: docker compose up --build +# Access: http://localhost:3080 services: - backend: + velxio: build: - context: ./backend - dockerfile: Dockerfile - ports: - - "8001:8001" + context: . + dockerfile: Dockerfile.standalone + container_name: velxio-dev restart: unless-stopped + ports: + - "3080:80" + env_file: + - ./backend/.env environment: - DATABASE_URL=sqlite+aiosqlite:////app/data/velxio.db - DATA_DIR=/app/data + - IDF_PATH=/opt/esp-idf + - IDF_TOOLS_PATH=/root/.espressif + - ARDUINO_ESP32_PATH=/opt/arduino-esp32 volumes: - ./data:/app/data + - arduino-libs:/root/.arduino15 healthcheck: - test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8001/health')"] + test: ["CMD", "curl", "-f", "http://localhost/health"] interval: 30s timeout: 10s retries: 3 - start_period: 30s + start_period: 90s - frontend: - build: - context: . - dockerfile: frontend/Dockerfile - ports: - - "3000:80" - depends_on: - backend: - condition: service_healthy - restart: unless-stopped +volumes: + arduino-libs: diff --git a/prebuilt/qemu/.gitkeep b/prebuilt/qemu/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/prebuilt/qemu/.gitkeep @@ -0,0 +1 @@ + diff --git a/vscode-extension/LICENSE b/vscode-extension/LICENSE new file mode 100644 index 0000000..45e74de --- /dev/null +++ b/vscode-extension/LICENSE @@ -0,0 +1,665 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or distribute copies of it, +and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other free software +developers to incorporate. Many developers of free software are +heartened and encouraged by the resulting cooperation. However, in +the case of software used on network servers, this result may fail to +come about. The GNU General Public License permits making a modified +version and letting the public access it on a server without ever +releasing its source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public +License. + + "Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a user interface displays "Appropriate Legal Notices" does not +include works that are not covered by this License. The source code +for a work means the preferred form of the work for making +modifications to it. "Object code" means any non-source form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the System +Libraries, or general-purpose tools or generally available free +programs which are unmodified are used unmodified in performing those +activities but which are not part of the work. For example, Corresponding +Source includes interface definition files associated with source files +for the work, and the source code for shared libraries and dynamically +linked subprograms that the work specifically requires, such as by +intimate data communication or control flow between those subprograms +and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your legal rights or third parties' legal rights to forbid +circumvention of technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all notices stating that this +License and any non-warranty terms added in accord with section 7 +apply to the code; keep intact all notices of absence of any +warranty; and give all recipients a copy of this License along with +the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or a warranty for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes to possess a copy. This License will + therefore apply, along with any applicable section 7 additional + terms, to the whole of the work, and all its parts, regardless of + how they are packaged. This License gives no permission to license + the work in any other way, but it does not invalidate such + permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its associated use rights do not +restrict access or use of the other works in the aggregate beyond what +the individual works permit. Inclusion of a covered work in an +aggregate does not cause this License to apply to the other parts of +the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for + anyone who possesses the object code or uses the product, to give + anyone who possesses the object code either (1) a copy of the + Corresponding Source for all the software in the product that is + covered by this License, on a durable physical medium customarily + used for software interchange, for a price no more than your + reasonable cost of physically performing this conveying of source, + or (2) access to copy the Corresponding Source from a network + server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the public at no charge + under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for use in homes. +In determining whether a product is a consumer product, doubtful cases +shall be resolved in favor of coverage. For a particular product +received by a particular user, "normally used" refers to a typical or +common use of that class of product, regardless of the status of the +particular user or the way in which the particular user or organization +uses, or expects or is expected to use, the product. A product is a +consumer product regardless of whether the product has substantial +commercial, industrial or non-commercial uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or executing. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have the appropriate copyright license permission to do so. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that those contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the additional +terms that apply to those files, or a notice indicating where to find +the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not have the right to receive new copies of the +covered work made after the termination of your license. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that transaction +who receives a copy of the work also receives whatever licenses to the +work the party's predecessor in interest had or could give under the +previous paragraph, plus a right to possession of the Corresponding +Source of the work from the predecessor in interest, if the predecessor +has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or any work on which the Program is based. The +work thus licensed is called the contributor's "version" of the work. + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a consequence +of further modification of the contributor version. For purposes of +this definition, "control" includes the right to grant patent +sublicenses in a manner consistent with the requirements of this +License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise transfer the +Contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or arrangement, however denominated, in which one party +grants another a conditional or unconditional right to exercise a +patent (such as an express permission to practice a patent or covenant +not to sue for patent infringement). To "grant" such a patent license +to a party means to make such an agreement or arrangement with that +party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to grant, to +downstream recipients, a copy of the Corresponding Source of the work +from a publicly accessible network server at no charge, under the terms +of this License, to at least one copy of the work to be made at no +additional charge. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not convey it at all. For example, if you agree to terms that +obligate you to collect a royalty for further conveying from those to +whom you convey the Program, the only way you could satisfy both those +terms and this License would be to refrain entirely from conveying the +Program. + + 13. Use with the GNU General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a combined +work, and to convey the resulting work. The terms of this License +will continue to apply to the part which is the covered work, but +the work that it is so combined with will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero +General Public License "or any later version" applies to it, you have +the option of following the terms and conditions either of that +numbered version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever +published by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that +proxy's public statement of acceptance of a version permanently +authorizes you to choose that version for the Program. + + Later license versions may give you more additional permissions. +Their requirements of the other parts of the same program, if any, +may also be given additional permissions to avoid their consequences +and make the Program more compatible with other free software. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU SHOULD ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES +AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR +DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM +(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSS SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF +THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in exchange for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to state the exclusion +of warranty; and each file should have at least the "copyright" line +and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and conventional mail. + + If your program does interaction through a network, you should make it +output a short notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + +--- + +Velxio — Copyright (C) 2025 David Montero Crespo + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +--- + +DUAL LICENSING NOTICE + +Velxio is available under a dual licensing model: + +1. GNU AGPLv3 (this file) — free for any use, including commercial, provided + that all modifications and derivative works are also released under AGPLv3. + This means: if you run a modified version on a network server, you must + make the full source code available to users of that server. + +2. Commercial License — if you wish to integrate Velxio into a proprietary + product or service without the AGPLv3 source-sharing obligation, contact + the copyright holder to purchase a Commercial License. + + Contact: davidmonterocrespo24@gmail.com + GitHub: https://github.com/davidmonterocrespo24 diff --git a/vscode-extension/media/icon.png b/vscode-extension/media/icon.png new file mode 100644 index 0000000..ad5a248 Binary files /dev/null and b/vscode-extension/media/icon.png differ diff --git a/vscode-extension/velxio-simulator-0.1.0.vsix b/vscode-extension/velxio-simulator-0.1.0.vsix new file mode 100644 index 0000000..d02a590 Binary files /dev/null and b/vscode-extension/velxio-simulator-0.1.0.vsix differ diff --git a/vscode-extension/webview/package-lock.json b/vscode-extension/webview/package-lock.json index 07bd85d..cef5f2f 100644 --- a/vscode-extension/webview/package-lock.json +++ b/vscode-extension/webview/package-lock.json @@ -8,6 +8,8 @@ "name": "velxio-webview", "version": "0.1.0", "dependencies": { + "@wokwi/elements": "^1.9.2", + "avr8js": "^0.21.0", "react": "^19.0.0", "react-dom": "^19.0.0" }, @@ -793,6 +795,21 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@lit-labs/ssr-dom-shim": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.5.1.tgz", + "integrity": "sha512-Aou5UdlSpr5whQe8AA/bZG0jMj96CoJIWbGfZ91qieWu5AWUMKw8VR/pAkQkJYvBNhmCcWnZlyyk5oze8JIqYA==", + "license": "BSD-3-Clause" + }, + "node_modules/@lit/reactive-element": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.1.2.tgz", + "integrity": "sha512-pbCDiVMnne1lYUIaYNN5wrwQXDtHaYtg7YEFPeW+hws6U47WeFvISGUWekPGKWOP1ygrs0ef0o1VJMk1exos5A==", + "license": "BSD-3-Clause", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.5.0" + } + }, "node_modules/@rolldown/pluginutils": { "version": "1.0.0-beta.27", "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz", @@ -1206,7 +1223,6 @@ "version": "19.2.14", "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz", "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", - "dev": true, "license": "MIT", "dependencies": { "csstype": "^3.2.2" @@ -1222,6 +1238,12 @@ "@types/react": "^19.2.0" } }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "license": "MIT" + }, "node_modules/@vitejs/plugin-react": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz", @@ -1243,6 +1265,29 @@ "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, + "node_modules/@wokwi/elements": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/@wokwi/elements/-/elements-1.9.2.tgz", + "integrity": "sha512-bommouWNrBl6bQqxi8ZT/Keh1MbGpL7bl2pVf4DxbrngXw3G7iejt5XA2990q9i5tidGoxMYJxoP11Ai6xuQdg==", + "license": "MIT", + "dependencies": { + "@types/react": ">=16", + "lit": "^3.0.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/avr8js": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/avr8js/-/avr8js-0.21.0.tgz", + "integrity": "sha512-kjFzxorERow5YFFV25ElhscG57TJqpT6M0m5GDDbXiMYoBmG6K99MQcq6AU1Ly4L+uB1g1o79dMmBNb5O+toxQ==", + "license": "MIT", + "engines": { + "node": ">= 20.19.0", + "npm": ">= 10.0.0" + } + }, "node_modules/baseline-browser-mapping": { "version": "2.10.12", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.12.tgz", @@ -1322,7 +1367,6 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", - "dev": true, "license": "MIT" }, "node_modules/debug": { @@ -1478,6 +1522,37 @@ "node": ">=6" } }, + "node_modules/lit": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.3.2.tgz", + "integrity": "sha512-NF9zbsP79l4ao2SNrH3NkfmFgN/hBYSQo90saIVI1o5GpjAdCPVstVzO1MrLOakHoEhYkrtRjPK6Ob521aoYWQ==", + "license": "BSD-3-Clause", + "dependencies": { + "@lit/reactive-element": "^2.1.0", + "lit-element": "^4.2.0", + "lit-html": "^3.3.0" + } + }, + "node_modules/lit-element": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.2.2.tgz", + "integrity": "sha512-aFKhNToWxoyhkNDmWZwEva2SlQia+jfG0fjIWV//YeTaWrVnOxD89dPKfigCUspXFmjzOEUQpOkejH5Ly6sG0w==", + "license": "BSD-3-Clause", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.5.0", + "@lit/reactive-element": "^2.1.0", + "lit-html": "^3.3.0" + } + }, + "node_modules/lit-html": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.3.2.tgz", + "integrity": "sha512-Qy9hU88zcmaxBXcc10ZpdK7cOLXvXpRoBxERdtqV9QOrfpMZZ6pSYP91LhpPtap3sFMUiL7Tw2RImbe0Al2/kw==", + "license": "BSD-3-Clause", + "dependencies": { + "@types/trusted-types": "^2.0.2" + } + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", diff --git a/vscode-extension/webview/package.json b/vscode-extension/webview/package.json index 2d0ed27..f14c119 100644 --- a/vscode-extension/webview/package.json +++ b/vscode-extension/webview/package.json @@ -7,6 +7,8 @@ "dev": "vite build --watch" }, "dependencies": { + "@wokwi/elements": "^1.9.2", + "avr8js": "^0.21.0", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/wokwi-libs/qemu-lcgamboa b/wokwi-libs/qemu-lcgamboa index 1441302..822927b 160000 --- a/wokwi-libs/qemu-lcgamboa +++ b/wokwi-libs/qemu-lcgamboa @@ -1 +1 @@ -Subproject commit 14413023344605ceb2dacdd666b7cc59c407f09a +Subproject commit 822927b6da5818b7e3b44e8bf48b967e5465f840