[omega] 1.22.1

This ensures the compiler doesn't assume that the username is fixed, allowing
us top change it before flashing, to let the user change his username.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,13 +2,26 @@
 name: Bug report
 about: Omega is not working like it should? Let us know!
 title: ''
-labels: Bug, Triage
+labels: 'Status: Triage, Type: Bug'
 assignees: ''
 
 ---
 
-#### Describe the bug
+**Describe the bug**
+A clear and concise description of what the bug is.
 
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
-#### Environment
- - Omega Version: {go to settings > about > Omega Version and type the version here}
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Omega Version: [go to settings > about > Omega Version and type the version here]

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +1,17 @@
 ---
 name: Feature request
-about: Suggest an idea for an improvement of Omega
+about: Suggest an idea for Omega
 title: ''
-labels: Feature, Triage
+labels: 'Status: Triage, Type: Feature'
 assignees: ''
 
 ---
 
-#### What I want to see in the next version of Omega
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/omega-beta-only---bug-report.md

@@ -0,0 +1,28 @@
+---
+name: OMEGA BETA ONLY - Bug report
+about: Omega 1.21 is not working like it should? Let us know!
+title: "[BETA-1.21] …"
+labels: 'Status: Triage, Type: Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Omega Version: [go to settings > about > Omega Version and type the version here]
+ - Discord username: ..........#....

.github/ISSUE_TEMPLATE/other.md

@@ -1,8 +1,8 @@
 ---
 name: Other
-about: A question? A problem? ...
+about: A question? A problem? …
 title: ''
-labels: Triage
+labels: 'Status: Triage'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/problems-during-installation.md

@@ -2,18 +2,18 @@
 name: Problems during installation
 about: Need help to install Omega?
 title: ''
-labels: Installation issue, Triage
+labels: 'Status: Triage, Type: Installation issue'
 assignees: ''
 
 ---
 
-#### Describe the problem
+**Describe the problem**
 
 
-#### Logs
+**Logs**
 ```
 Copy/paste the logs here (If you have some)
 ```
 
-#### Environment
+**Environment**
  - Omega Version: {go to settings > about > Omega Version and type the version here}

.github/workflows/ci-workflow.yml

@@ -1,6 +1,7 @@
 name: Continuous integration
 #on: [pull_request, push]
 on:
+  push:
   pull_request:
   workflow_dispatch:
     inputs:
@@ -12,32 +13,42 @@ on:
         description: 'Run macOS tests'
         required: true
         default: 'no'
+      trigger3DS:
+        description: 'Run 3DS tests'
+        required: true
+        default: 'no'
 
 jobs:
-  # nintendo_3ds:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
-  #     - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
-  #     - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
-  #     - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
-  #     - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
-  #     - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
-
-  #     - uses: actions/checkout@v1
-  #       with:
-  #         submodules: true
-  #     - run: make -j2 PLATFORM=simulator TARGET=3ds
-  #     - uses: actions/upload-artifact@master
-  #       with:
-  #         name: epsilon-3ds.3dsx
-  #         path: output/release/simulator/3ds/epsilon.3dsx
-  android:
+  nintendo_3ds:
+    if: github.event.inputs.trigger3DS == 'yes'
     runs-on: ubuntu-latest
     steps:
+      - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
+      - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
+      - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
+      - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
+      - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
+      - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
+
       - uses: actions/checkout@v1
         with:
           submodules: true
+      - run: make -j2 PLATFORM=simulator TARGET=3ds
+      - run: make -j2 PLATFORM=simulator TARGET=3ds epsilon.cia
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-3ds.3dsx
+          path: output/release/simulator/3ds/epsilon.3dsx
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-3ds.cia
+          path: output/release/simulator/3ds/epsilon.cia
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=android
       - uses: actions/upload-artifact@master
         with:
@@ -48,9 +59,9 @@ jobs:
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: mkdir final-output
       - run: make -j2 MODEL=n0100 EPSILON_I18N=en output/release/device/n0100/epsilon.onboarding.two_binaries
       - run: mv output/release/device/n0100/epsilon.onboarding.internal.bin final-output/epsilon.onboarding.internal.en.bin
@@ -89,9 +100,9 @@ jobs:
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: make -j2 epsilon.dfu
       - run: make -j2 epsilon.onboarding.dfu
       - run: make -j2 epsilon.onboarding.update.dfu
@@ -114,11 +125,10 @@ jobs:
     steps:
       - uses: msys2/setup-msys2@v2
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator epsilon.official.exe
-      - run: make -j2 PLATFORM=simulator test.headless.exe
-      - run: output/release/simulator/windows/test.headless.exe
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-windows.exe
@@ -129,9 +139,9 @@ jobs:
       - uses: numworks/setup-emscripten@v1
         with:
           sdk: latest-upstream
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=web
       - uses: actions/upload-artifact@master
         with:
@@ -141,25 +151,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-linux.bin
           path: output/release/simulator/linux/epsilon.bin
-      - run: make -j2 PLATFORM=simulator test.headless.bin
   macos:
     if: github.event.inputs.triggerMacos == 'yes'
     runs-on: macOS-latest
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator epsilon.official.app
-      - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.headless.bin
-      - run: output/release/simulator/macos/x86_64/test.headless.bin
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-macos.zip
@@ -170,9 +178,9 @@ jobs:
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
-      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 epsilon.official.ipa
-      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 test.ipa
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 APPLE_PLATFORM=ios-simulator
       - uses: actions/upload-artifact@master
         with:

.github/workflows/unit-workflow.yml

@@ -0,0 +1,14 @@
+name: Unit tests
+on: [pull_request_target]
+
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    steps:
+      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - run: make -j2 PLATFORM=simulator test.headless.bin
+      - run: output/release/simulator/linux/test.headless.bin
+

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "apps/rpn"]
 	path = apps/rpn
 	url = https://github.com/Omega-Numworks/Omega-RPN.git
-[submodule "apps/atom"]
-	path = apps/atom
-	url = https://github.com/Omega-Numworks/Omega-Atom.git
+[submodule "apps/atomic"]
+	path = apps/atomic
+	url = https://github.com/Omega-Numworks/Omega-Atomic.git

README.fr.md

@@ -0,0 +1,177 @@
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
+
+<p align="center">
+  <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
+  <a href="https://github.com/Omega-Numworks/Omega/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Omega-Numworks/Omega.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
+  <br/>
+  <a href="https://discord.gg/X2TWhh9"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
+</p>
+
+> Don't understand french ? speak english ? here's the [english README](./README.md) !
+
+## À propos
+
+Omega est un fork d'Epsilon, l'OS de Numworks tournant sur les calculatrices du même nom, qui apporte beaucoup de fonctionnalités en plus. Omega est fait pour ceux qui aimeraient ajouter certaines fonctionnalités ayant été rejetées par Numworks à leurs calculatrices (pour des raisons 100% compréhensibles !). [Essayez en ligne](https://getomega.web.app/simulator).
+
+### Quelques fonctionnalités supplémentaires
+- Retour du calcul littéral
+- Une application RPN
+- Application Externes
+- Des thèmes
+- Python amélioré (module os, méthode open...)
+- Un tableau périodique et toutes les masses molaires des éléments dans la toolbox
+- *Ainsi que d'autres à découvrir...* [Changelogs complets](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Fonctionnalités princpales & captures d'écran](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
+
+## Installation
+
+### Automatique
+
+Vous pouvez installer Omega automatiquement depuis [notre site](https://getomega.web.app/) sur la page "installer".
+
+<a href="https://getomega.web.app"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86352956-e9000480-bc66-11ea-82b7-79fd7e56fa27.png" /></p></a>
+
+### Manuelle
+
+Tout d'abord, suivez **la première étape** [ici](https://www.numworks.com/resources/engineering/software/build/), puis :
+
+<details>
+  <summary><b>Modèle n0100</b></summary>
+
+(note : vous pouvez changer `EPSILON_I18N=fr` en `en`, `nl`, `pt`, `it`, `de`, `es` ou `hu`).
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make MODEL=n0100 clean
+make MODEL=n0100 EPSILON_I18N=fr OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
+make MODEL=n0100 epsilon_flash
+```
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+
+</details>
+
+<details>
+  <summary><b>Modèle n0110</b></summary>
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
+make epsilon_flash
+```
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+
+</details>
+
+<details>
+  <summary><b>Fichiers binaires</b></summary>
+  
+Ces fichiers peuvent être utilisés pour distribuer Omega (pour que tout le monde puisse le flasher via [Webdfu_Numworks](https://ti-planet.github.io/webdfu_numworks/)).
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make MODEL=n0100 OMEGA_USERNAME="" -j8
+make MODEL=n0100 OMEGA_USERNAME="" binpack -j8
+make OMEGA_USERNAME="" -j8
+make OMEGA_USERNAME="" binpack -j8
+```
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+  
+</details>
+
+<details>
+  <summary><b>Simulateur web</b></summary>
+  
+D'abord, installez emsdk :
+
+```bash
+git clone https://github.com/emscripten-core/emsdk.git
+cd emsdk
+./emsdk install latest-fastcomp
+./emsdk activate latest-fastcomp
+source emsdk_env.sh
+```
+
+Puis, compilez Omega :
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
+```
+
+Le simulateur se trouve dans `output/release/simulator/web/simulator.zip`
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+
+</details>
+
+<details>
+  <summary><b>Simulateur 3DS</b></summary>
+  
+Vous aurez besoin de devkitPro et de devkitARM disponible dans votre `$PATH` (instructions [ici](https://devkitpro.org/wiki/Getting_Started) (en anglais))
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout --recursive omega-dev
+make PLATFORM=simulator TARGET=3ds -j
+```
+
+Vous pouvez ensuite copier epsilon.3dsx sur une carte SD pour l'exécuter depuis le HBC ou utiliser 3dslink pour le lancer via le réseau :
+
+```bash
+3dslink output/release/simulator/3ds/epsilon.3dsx -a <ADRESSE IP 3DS>
+```
+
+</details>
+
+Si vous avez besoin d'aide, n'hésitez pas à rejoindre notre serveur discord : https://discord.gg/X2TWhh9
+
+<a href="https://discord.gg/X2TWhh9"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
+---
+
+## Contribution
+
+Pour contribuer, merci de lire le [Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing)
+
+## Nos autres projets
+
+* [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
+* [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
+* [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
+* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
+* [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
+* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
+* [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
+* [External Apps](https://github.com/Omega-Numworks/External-Apps)
+
+## À propos d'Epsilon
+
+Omega est un fork d'Epsilon, un système d'exploitation performant pour calculatrices graphiques. Il inclut huit applications pour les mathématiques de lycée et d'études supérieurs
+
+Vous pouvez essayer Epsilon depuis votre navigateur sur le [simulateur en ligne](https://www.numworks.com/simulator/).
+
+## Licence
+
+NumWorks est une marque déposée de NumWorks SAS, 24 Rue Godot de Mauroy, 75009 Paris, France.
+Nintendo est Nintendo 3DS sont des marques déposées de Nintendo of America Inc, 4600 150th Ave NE, Redmond, WA 98052, Etats-Unis.
+NumWorks SAS et Nintendo of America Inc ne sont en aucun cas associés avec ce projet.
+
+* NumWorks Epsilon est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
+* Omega est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://github.com/Omega-Numworks/Omega-Design/blob/master/Banners/Omega-Banner-Dev-Branch.png?raw=true" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
@@ -7,6 +7,8 @@
   <a href="https://discord.gg/X2TWhh9"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
 </p>
 
+> Vous ne comprenez pas l'anglais ? vous êtes francophone ? Regardez le [*LISEZ-MOI* français](./README.fr.md) !
+
 ## About
 
 Omega is a fork of Numworks' Epsilon, the OS that runs on their calculator, which brings many features to it. Omega is for the people who want to add features to the calculator, but cannot because they have been rejected by Numworks (for reasons that are 100% understandable!). [Try it online](https://getomega.web.app/simulator).
@@ -152,7 +154,7 @@ To contribute, please refer to the [Wiki](https://github.com/Omega-Numworks/Omeg
 * [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
 * [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
 * [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
+* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
 * [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
 * [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
 * [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)

apps/Makefile

@@ -11,6 +11,25 @@ apps =
 # (path to the apps header).
 $(foreach i,${apps_list},${eval include apps/$(i)/Makefile})
 
+app_equals = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+# We list all the apps that are missing
+apps_missing = $(foreach i, ${apps_list}, $(if $(call app_equals, apps/$(i)/Makefile, $(wildcard apps/$(i)/Makefile)),, $(i) ) )
+
+# If the two doesn't match, we got an error.
+ifneq ($(strip $(apps_missing)),)
+    miss_modules = 0
+
+    # Check if the missing apps are one that are supposed to be submodules
+    $(foreach i, $(SUBMODULES_APPS), $(if $(call app_equals, $(filter $(i), $(apps_missing)), $(i)), $(eval miss_modules=1)))
+
+    ifeq ($(miss_modules), 1)
+        PLS_IGNORE := $(shell >&2 printf "\nSome submodules apps seem to be missing. To download them, assumming you git clone'd the repo, do\n")
+        PLS_IGNORE := $(shell >&2 printf "  git submodule init\n")
+        PLS_IGNORE := $(shell >&2 printf "  git submodule update\n\n")
+    endif
+    $(error Missing apps: $(strip $(apps_missing)))
+endif
+
 apps_src += $(addprefix apps/,\
   alternate_empty_nested_menu_controller.cpp \
   apps_container.cpp \
@@ -43,7 +62,7 @@ apps_src += $(addprefix apps/,\
 )
 
 tests_src += $(addprefix apps/,\
-  exam_mode_configuration_official.cpp \
+  exam_mode_configuration_non_official.cpp \
 )
 
 
@@ -91,6 +110,7 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp
 $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))
 
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
+$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
 
 apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_graph_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)

apps/apps_container.cpp

@@ -8,6 +8,8 @@
 #include <ion/backlight.h>
 #include <poincare/preferences.h>
 
+#include <algorithm>
+
 extern "C" {
 #include <assert.h>
 }
@@ -196,7 +198,7 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
       }
       if (changedZoom) {
         KDIonContext::sharedContext()->updatePostProcessingEffects();
-        redrawWindow();
+        redrawWindow(true);
         return true;
       }
     }
@@ -218,6 +220,13 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
   return didProcessEvent || alphaLockWantsRedraw;
 }
 
+static constexpr Ion::Events::Event switch_events[] = {
+    Ion::Events::ShiftSeven, Ion::Events::ShiftEight, Ion::Events::ShiftNine,
+    Ion::Events::ShiftFour, Ion::Events::ShiftFive, Ion::Events::ShiftSix,
+    Ion::Events::ShiftOne, Ion::Events::ShiftTwo, Ion::Events::ShiftThree,
+    Ion::Events::ShiftZero, Ion::Events::ShiftDot, Ion::Events::ShiftEE
+};
+
 bool AppsContainer::processEvent(Ion::Events::Event event) {
   // Warning: if the window is dirtied, you need to call window()->redraw()
   if (event == Ion::Events::USBPlug) {
@@ -242,6 +251,15 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
     switchTo(appSnapshotAtIndex(1));
     return true;
   }
+
+  for(int i = 0; i < std::min((int) (sizeof(switch_events) / sizeof(Ion::Events::Event)), APPS_CONTAINER_SNAPSHOT_COUNT); i++) {
+    if (event == switch_events[i]) {
+      m_window.redraw(true);
+      switchTo(appSnapshotAtIndex(i+1));
+      return true;
+    }
+  }
+
   if (event == Ion::Events::OnOff) {
     suspend(true);
     return true;

apps/calculation/base.en.i18n

@@ -11,4 +11,4 @@ AdditionalDeterminant = "Determinant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Row echelon form"
 AdditionalReducedRowEchelonForm = "Reduced row echelon form"
-AdditionalTrace = "Trace"
+AdditionalTrace = "Trace"

apps/calculation/base.hu.i18n

@@ -3,7 +3,12 @@ CalculAppCapital = "SZÁMOLÁS"
 AdditionalResults = "További eredmények"
 DecimalBase = "Decimális"
 HexadecimalBase = "Hexadecimális"
-BinaryBase = "Kétkomponensü"
+BinaryBase = "Bináris"
 PrimeFactors = "Alapvetö tényezök"
 MixedFraction = "Vegyes frakció"
 EuclideanDivision = "Euklideszi osztás"
+AdditionalDeterminant = "Meghatározó"
+AdditionalInverse = "inverz"
+AdditionalRowEchelonForm = "Sor echelon forma"
+AdditionalReducedRowEchelonForm = "Csökkentett sorú Echelon forma"
+AdditionalTrace = "Nyomkövetés"

apps/calculation/expression_field.cpp

@@ -17,7 +17,8 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
        event == Ion::Events::Power ||
        event == Ion::Events::Square ||
        event == Ion::Events::Division ||
-       event == Ion::Events::Sto)) {
+       event == Ion::Events::Sto ||
+       event == Ion::Events::EE)) {
     handleEventWithText(Poincare::Symbol::k_ans);
   }
   return(::ExpressionField::handleEvent(event));

apps/calculation/test/calculation_store.cpp

@@ -114,10 +114,10 @@ QUIZ_CASE(calculation_display_exact_approximate) {
 
   assertCalculationIs("1/2", DisplayOutput::ExactAndApproximate, EqualSign::Equal, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("1/3", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("1/0", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("2x-x", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("1/0", DisplayOutput::ExactOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("2x-x", DisplayOutput::ExactOnly, EqualSign::Unknown, "x", "undef", "undef", &globalContext, &store);
   assertCalculationIs("[[1,2,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("[[1,x,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "undef", "undef", &globalContext, &store);
+  assertCalculationIs("[[1,x,3]]", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, "[[1,undef,3]]", "[[1,undef,3]]", &globalContext, &store);
   assertCalculationIs("28^7", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("3+√(2)→a", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "√(2)+3", nullptr, nullptr, &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy();
@@ -130,9 +130,9 @@ QUIZ_CASE(calculation_display_exact_approximate) {
   assertCalculationIs("1+1+random()", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("1+1+round(1.343,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "3.34", "3.34", &globalContext, &store);
   assertCalculationIs("randint(2,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "5", "5", "5", &globalContext, &store);
-  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
 
 }
 
@@ -140,10 +140,10 @@ QUIZ_CASE(calculation_symbolic_computation) {
   Shared::GlobalContext globalContext;
   CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ExactOnly, EqualSign::Unknown, "2×x+√(π)+4", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "f×x", "undef", "undef", &globalContext, &store);
   assertCalculationIs("1+x→f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", "undef", "undef", &globalContext, &store);
   assertCalculationIs("f(2)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", "3", "3", &globalContext, &store);
   assertCalculationIs("2→x", DisplayOutput::ApproximateOnly, EqualSign::Equal, "2", nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", nullptr, nullptr, &globalContext, &store);

apps/code/Makefile

@@ -15,6 +15,7 @@ app_code_src = $(addprefix apps/code/,\
   sandbox_controller.cpp \
   script_name_cell.cpp \
   script_parameter_controller.cpp \
+  toolbox_ion_keys.cpp \
 )
 
 app_code_test_src = $(addprefix apps/code/,\

apps/code/app.cpp

@@ -124,6 +124,10 @@ Toolbox * App::toolboxForInputEventHandler(InputEventHandler * textInput) {
   return &m_toolbox;
 }
 
+Code::toolboxIonKeys * App::toolboxIonKeys() {
+  return &m_toolboxIonKeys;
+}
+
 VariableBoxController * App::variableBoxForInputEventHandler(InputEventHandler * textInput) {
   return &m_variableBoxController;
 }

apps/code/app.h

@@ -10,6 +10,7 @@
 #include "python_toolbox.h"
 #include "variable_box_controller.h"
 #include "../shared/shared_app.h"
+#include "toolbox_ion_keys.h"
 
 namespace Code {
 
@@ -77,6 +78,8 @@ public:
 
   static constexpr int k_pythonHeapSize = 100000;
 
+  Code::toolboxIonKeys * toolboxIonKeys();
+
 private:
   /* Python delegate:
    * MicroPython requires a heap. To avoid dynamic allocation, we keep a working
@@ -93,6 +96,7 @@ private:
   StackViewController m_codeStackViewController;
   PythonToolbox m_toolbox;
   VariableBoxController m_variableBoxController;
+  Code::toolboxIonKeys m_toolboxIonKeys;
 };
 
 }

apps/code/base.fr.i18n

@@ -12,4 +12,4 @@ ImportedModulesAndScripts = "Modules et scripts importés"
 NoWordAvailableHere = "Aucun mot disponible à cet endroit."
 ScriptInProgress = "Script en cours"
 ScriptOptions = "Options de script"
-ScriptSize = "Script size"
+ScriptSize = "Taille du script"

apps/code/base.hu.i18n

@@ -1,15 +1,15 @@
-AddScript = "Script hozzadáadása"
+AddScript = "Script hozzáadása"
 AllowedCharactersaz09 = "Engedélyezett karakterek: a-z, 0-9, _"
-Autocomplete = "Autocomplete"
+Autocomplete = "Önkiegészítés"
 AutoImportScript = "Script automata importálása"
-BuiltinsAndKeywords = "Builtins and keywords"
+BuiltinsAndKeywords = "Beépített fonkciók és szókincs"
 Console = "Konzol"
 DeleteScript = "Script törlése"
 DuplicateScript = "Script másolása"
 ExecuteScript = "Script indítása"
-FunctionsAndVariables = "Függvények és változók"
-ImportedModulesAndScripts = "Imported modules and scripts"
-NoWordAvailableHere = "No word available here."
-ScriptInProgress = "Script in progress"
+FunctionsAndVariables = "Fonktiók és változók"
+ImportedModulesAndScripts = "Importált scriptek és modulok"
+NoWordAvailableHere = "Nincs rendelkezésre álló szó."
+ScriptInProgress = "Script müködésben"
 ScriptOptions = "Script beállítások"
-ScriptSize = "Script size"
+ScriptSize = "Script mérete"

apps/code/catalog.de.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Zählt wie oft x vorkommt"
 PythonDegrees = "x von Radian zu Grad umwandeln"
 PythonDivMod = "Quotient und Rest"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Schreibt Text bei (x,y)"
 PythonErf = "Fehlerfunktion"
 PythonErfc = "Complementary error function"
@@ -86,52 +87,6 @@ PythonIsInfinite = "Prüft ob x unendlich ist"
 PythonIsNaN = "Prüft ob x NaN ist"
 PythonIsKeyDown = "true wenn k gedrückt ist"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "Linke Pfeiltaste"
-PythonKeyUp = "Pfeiltaste nach oben"
-PythonKeyDown = "Pfeiltaste nach unten"
-PythonKeyRight = "Rechte Pfeiltaste"
-PythonKeyOk = "OK Taste"
-PythonKeyBack = "ZURÜCK Taste"
-PythonKeyHome = "HOME Taste"
-PythonKeyOnOff = "AN/AUS Taste"
-PythonKeyShift = "SHIFT Taste"
-PythonKeyAlpha = "ALPHA Taste"
-PythonKeyXnt = "X,N,T Taste"
-PythonKeyVar = "VAR Taste"
-PythonKeyToolbox = "WERKZEUGBOX Taste"
-PythonKeyBackspace = "LÖSCHEN Taste"
-PythonKeyExp = "EXPONENTIAL Taste"
-PythonKeyLn = "NATURAL LOGARITHM Taste"
-PythonKeyLog = "DECIMAL LOGARITHM Taste"
-PythonKeyImaginary = "IMAGINÄRES I Taste"
-PythonKeyComma = "KOMMA Taste"
-PythonKeyPower = "HOCH Taste"
-PythonKeySine = "SINUS Taste"
-PythonKeyCosine = "COSINUS Taste"
-PythonKeyTangent = "TANGENZ Taste"
-PythonKeyPi = "PI Taste"
-PythonKeySqrt = "WURZEL Taste"
-PythonKeySquare = "QUADRAT Taste"
-PythonKeySeven = "7 Taste"
-PythonKeyEight = "8 Taste"
-PythonKeyNine = "9 Taste"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 Taste"
-PythonKeyFive = "5 Taste"
-PythonKeySix = "6 Taste"
-PythonKeyMultiplication = "MULTIPLIKATIONSTASTE"
-PythonKeyDivision = "DIVISIONSTASTE"
-PythonKeyOne = "1 Taste"
-PythonKeyTwo = "2 Taste"
-PythonKeyThree = "3 Taste"
-PythonKeyPlus = "PLUS Taste"
-PythonKeyMinus = "MINUS Taste"
-PythonKeyZero = "0 Taste"
-PythonKeyDot = "PUNKT Taste"
-PythonKeyEe = "10 HOCH X Taste"
-PythonKeyAns = "ANS Taste"
-PythonKeyExe = "EXE Taste"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"

apps/code/catalog.en.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"

apps/code/catalog.es.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"

apps/code/catalog.fr.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Cosinus hyperbolique"
 PythonCount = "Compte les occurrences de x"
 PythonDegrees = "Conversion de radians en degrés"
 PythonDivMod = "Quotient et reste"
+PythonDrawLine = "Trace une ligne"
 PythonDrawString = "Affiche un texte au pixel (x,y)"
 PythonErf = "Fonction d'erreur"
 PythonErfc = "Fonction d'erreur complémentaire"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Teste si x est infini"
 PythonIsKeyDown = "Renvoie True si touche k enfoncée"
 PythonIsNaN = "Teste si x est NaN"
 PythonKandinskyFunction = "Préfixe fonction module kandinsky"
-PythonKeyLeft = "Touche FLECHE GAUCHE"
-PythonKeyUp = "Touche FLECHE HAUT"
-PythonKeyDown = "Touche FLECHE BAS"
-PythonKeyRight = "Touche FLECHE DROITE"
-PythonKeyOk = "Touche OK"
-PythonKeyBack = "Touche RETOUR"
-PythonKeyHome = "Touche HOME"
-PythonKeyOnOff = "Touche ON/OFF"
-PythonKeyShift = "Touche SHIFT"
-PythonKeyAlpha = "Touche ALPHA"
-PythonKeyXnt = "Touche X,N,T"
-PythonKeyVar = "Touche VAR"
-PythonKeyToolbox = "Touche BOITE A OUTILS"
-PythonKeyBackspace = "Touche EFFACER"
-PythonKeyExp = "Touche EXPONENTIELLE"
-PythonKeyLn = "Touche LOGARITHME NEPERIEN"
-PythonKeyLog = "Touche LOGARITHME DECIMAL"
-PythonKeyImaginary = "Touche I IMAGINAIRE"
-PythonKeyComma = "Touche VIRGULE"
-PythonKeyPower = "Touche PUISSANCE"
-PythonKeySine = "Touche SINUS"
-PythonKeyCosine = "Touche COSINUS"
-PythonKeyTangent = "Touche TANGENTE"
-PythonKeyPi = "Touche PI"
-PythonKeySqrt = "Touche RACINE CARREE"
-PythonKeySquare = "Touche CARRE"
-PythonKeySeven = "Touche 7"
-PythonKeyEight = "Touche 8"
-PythonKeyNine = "Touche 9"
-PythonKeyLeftParenthesis = "Touche PARENTHESE GAUCHE"
-PythonKeyRightParenthesis = "Touche PARENTHESE DROITE"
-PythonKeyFour = "Touche 4"
-PythonKeyFive = "Touche 5"
-PythonKeySix = "Touche 6"
-PythonKeyMultiplication = "Touche MULTIPLICATION"
-PythonKeyDivision = "Touche DIVISION"
-PythonKeyOne = "Touche 1"
-PythonKeyTwo = "Touche 2"
-PythonKeyThree = "Touche 3"
-PythonKeyPlus = "Touche PLUS"
-PythonKeyMinus = "Touche MOINS"
-PythonKeyZero = "Touche 0"
-PythonKeyDot = "Touche POINT"
-PythonKeyEe = "Touche 10 PUISSANCE X"
-PythonKeyAns = "Touche ANS"
-PythonKeyExe = "Touche EXE"
 PythonLdexp = "Inverse de frexp : x*(2**i)"
 PythonLength = "Longueur d'un objet"
 PythonLgamma = "Logarithme de la fonction gamma"
@@ -203,19 +158,19 @@ PythonOsRename = "Renomme oldname en newname"
 PythonOsListdir = "Liste les fichiers"
 PythonTimePrefix = "Préfixe fonction du module temps"
 PythonTimeSleep = "Attendre n secondes"
-PythonMonotonic = "Retourne le temps monotonic"
+PythonMonotonic = "Retourne le temps monotone"
 PythonFileOpen = "Ouvre un fichier"
 PythonFileSeekable = "Indique si seek peut être utilisé"
 PythonFileSeek = "Déplace le curseur interne"
 PythonFileTell = "Donne la posititon du curseur"
 PythonFileClose = "Ferme un fichier"
 PythonFileClosed = "True si le fichier a été fermé"
-PythonFileRead = "Lis jusqu'à size bytes"
-PythonFileWrite = "Écris b dans le fichier"
-PythonFileReadline = "Lis une ligne ou jusqu'à size bytes"
-PythonFileReadlines = "Lis une liste de lignes"
+PythonFileRead = "Lit jusqu'à size bytes"
+PythonFileWrite = "Écrit b dans le fichier"
+PythonFileReadline = "Lit une ligne ou jusqu'à size bytes"
+PythonFileReadlines = "Lit une liste de lignes"
 PythonFileTruncate = "Redimensionne le fichier"
-PythonFileWritelines = "Écris une liste de lignes"
+PythonFileWritelines = "Écrit une liste de lignes"
 PythonFileName = "Nom du fichier"
 PythonFileMode = "Mode d'ouverture du fichier"
 PythonFileReadable = "Indique si read peut être utilisé"

apps/code/catalog.hu.i18n

@@ -1,222 +1,177 @@
 PythonPound = "Megjegyzés"
 PythonPercent = "Modulo"
 Python1J = "Képzeletbeli i"
-PythonLF = "Line feed"
+PythonLF = "Enter"
 PythonTab = "Táblázat"
-PythonAmpersand = "Bitwise és"
-PythonSymbolExp = "Bitwise exkluzív vagy"
-PythonVerticalBar = "Bitwise vagy"
+PythonAmpersand = "Logikus és"
+PythonSymbolExp = "logikus exkluzív vagy pedig"
+PythonVerticalBar = "logikus vagy pedig"
 PythonImag = "z képzeletbeli része"
 PythonReal = "z valódi része"
-PythonSingleQuote = "Egyetlen idézet"
-PythonAbs = "Abszolút érték / nagyság"
-PythonAcos = "Arc koszinusz"
-PythonAcosh = "Íves hiperbolikus koszinusz"
-PythonAppend = "x hozzáadása a lista végéhez"
-PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
-PythonAsin = "Arc szinusz"
-PythonAsinh = "Íves hiperbolikus szinusz"
-PythonAtan = "Arc érintö"
-PythonAtan2 = "Visszatérés atan (y / x)"
-PythonAtanh = "Arc hiperbolikus érintö"
-PythonAxis = "Set axes to (xmin,xmax,ymin,ymax)"
-PythonBar = "Draw a bar plot with x values"
+PythonSingleQuote = "apostróf"
+PythonAbs = "Abszolút érték/nagyság"
+PythonAcos = "Ív (arc) koszinusz"
+PythonAcosh = "Hiperbolikus arc koszinusz"
+PythonAppend = "Lista végére hozzáadni x-et"
+PythonArrow = "(x,y) nyíla (x+dx,y+dy) nyílához"
+PythonAsin = "Ív (arc) szinusz"
+PythonAsinh = "Hiperbolikus ív (arc) szinusz"
+PythonAtan = "Ív (arc) érintö (tan)"
+PythonAtan2 = "atan(y/x) sámolása"
+PythonAtanh = "Hiperbolikus ív (arc) érintö (atan)"
+PythonAxis = "Tengelyeket (xmin,xmax,ymin,ymax)-ra állitani"
+PythonBar = "Az x lista oszlopdiagramja"
 PythonBin = "Egész szám konvertálása binárisra"
 PythonCeil = "Mennyezet"
 PythonChoice = "Véletlenszerü szám a listában"
 PythonClear = "A lista ürítése"
 PythonCmathFunction = "cmath modul funkció elötag"
-PythonColor = "Rgb szín meghatározása"
+PythonColor = "Rgb (pzk) szín allítása"
 PythonColorBlack = "Fekete szín"
 PythonColorBlue = "Kék szín"
 PythonColorBrown = "Barna szín"
 PythonColorGreen = "Zöld szín"
-PythonColorGrey = "Szürke szín"
+PythonColorGray = "Szürke szín"
 PythonColorOrange = "Narancssárga szín"
 PythonColorPink = "Rózsaszín szín"
 PythonColorPurple = "Lila szín"
 PythonColorRed = "Piros szín"
-PythonColorWhite = "White color"
+PythonColorWhite = "Fehér szín"
 PythonColorYellow = "Sárga szín"
 PythonComplex = "A + ib visszaadása"
-PythonCopySign = "Visszatérés x-val y jelével"
+PythonCopySign = "X visszaadása y jelével"
 PythonCos = "Koszinusz"
 PythonCosh = "Hiperbolikus koszinusz"
 PythonCount = "Számolja az x elöfordulását"
-PythonDegrees = "x konvertálása x-röl radiánokra fokokra"
+PythonDegrees = "x konvertálása radiánokrol fokokra"
 PythonDivMod = "Hányados és maradék"
-PythonDrawString = "Szöveg megjelenítése pixelböl (x, y)"
+PythonDrawLine = "Húzzon egy vonalat "
+PythonDrawString = "Szöveg megjelenítése (x, y)-en"
 PythonErf = "Hiba funkció"
-PythonErfc = "Kiegészítö hibafunkció"
+PythonErfc = "Kiegészítö hiba funkció"
 PythonEval = "Visszaadja az értékelt kifejezést"
 PythonExp = "Exponenciális függvény"
-PythonExpm1 = "Számítsuk ki az exp (x) -1-et"
+PythonExpm1 = "exp(x)-1 sámitása"
 PythonFabs = "Abszolút érték"
-PythonFillRect = "Töltsön meg egy téglalapot pixelnél (x, y)"
-PythonFloat = "x konvertálása float-ra"
-PythonFloor = "Emelet"
+PythonFillRect = "Téglalap töltése"
+PythonFloat = "Konvertálása tizedes számra"
+PythonFloor = "Egész része"
 PythonFmod = "a modulo b"
-PythonFrExp = "Mantissa és az x exponense"
+PythonFrExp = "X mantissája és kiállítója"
 PythonGamma = "Gamma funkció"
-PythonGetPixel = "Visszatérési pixel (x, y) szín"
-PythonGetrandbits = "Egész szám k véletlen bittel"
-PythonGrid = "Toggle the visibility of the grid"
-PythonHex = "Egész szám konvertálása hexadecimálisra"
-PythonHist = "Draw the histogram of x"
+PythonGetPixel = "Visszatéríti (x,y) színét"
+PythonGetrandbits = "Váletlenszám visszatérítése k biten"
+PythonGrid = "Rács megjelenítése/elrejtése"
+PythonHex = "Decimális szám konvertálása hexadecimális számra"
+PythonHist = "x hisztográmiája"
 PythonImportCmath = "cmath modul importálása"
 PythonImportIon = "Ion modul importálása"
 PythonImportKandinsky = "Kandinsky modul importálása"
 PythonImportRandom = "Véletlenszerü modul importálása"
-PythonImportMath = "Import matematikai modul"
-PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
-PythonImportTime = "Idömodul importálása"
-PythonImportOs = "Os modul importálása"
-PythonOsUname = "Információ a rendszerről"
-PythonOsRemove = "Fájl eltávolítása"
-PythonOsRename = "Fájl átnevezése"
-PythonOsListdir = "Fájlok listázása"
-PythonImportTurtle = "Import teknös modul"
+PythonImportMath = "math modul importálása"
+PythonImportMatplotlibPyplot = "matplotlib.pyplot modul importálása"
+PythonImportTurtle = "turtle modul importálása"
+PythonImportTime = "time modul importálása"
 PythonIndex = "Az elsö x esemény indexe"
-PythonInput = "Érték kérése"
-PythonInsert = "Helyezzen x-t az i indexbe a listában"
-PythonInt = "x konvertálása egész számra"
+PythonInput = "Irjon egy értéket (számot)"
+PythonInsert = "x-et i. pozícióra helyezze a listában"
+PythonInt = "egész számra konvertálás"
 PythonIonFunction = "ion modul funkció elötag"
-PythonIsFinite = "Ellenörizze, hogy x véges-e"
-PythonIsInfinite = "Ellenörizze, hogy x végtelen-e"
-PythonIsKeyDown = "True true, ha a k gomb le van nyomva"
-PythonIsNaN = "Ellenörizze, hogy x nem NaN"
-PythonKandinskyFunction = "kandinsky modul function prefix"
-PythonKeyLeft = "Balra nyíl gomb"
-PythonKeyUp = "FEL NYÍL gomb"
-PythonKeyDown = "LE nyíl gomb"
-PythonKeyRight = "JOBB NYÍL gomb"
-PythonKeyOk = "OK gomb"
-PythonKeyBack = "VISSZA kulcs"
-PythonKeyHome = "HOME kulcs"
-PythonKeyOnOff = "BE / KI gomb"
-PythonKeyShift = "SHIFT kulcs"
-PythonKeyAlpha = "ALPHA kulcs"
-PythonKeyXnt = "X, N, T kulcs"
-PythonKeyVar = "VAR kulcs"
-PythonKeyToolbox = "TOOLBOX kulcs"
-PythonKeyBackspace = "BACKSPACE kulcs"
-PythonKeyExp = "EXPONENTIAL kulcs"
-PythonKeyLn = "NATURAL LOGARITHM kulcs"
-PythonKeyLog = "DECIMAL LOGARITHM kulcs"
-PythonKeyImaginary = "IMAGINÁRIS I kulcs"
-PythonKeyComma = "COMMA kulcs"
-PythonKeyPower = "POWER kulcs"
-PythonKeySine = "SINE kulcs"
-PythonKeyCosine = "KOSZIN kulcs"
-PythonKeyTangent = "TANGENT kulcs"
-PythonKeyPi = "PI kulcs"
-PythonKeySqrt = "SQUARE ROOT kulcs"
-PythonKeySquare = "SQUARE kulcs"
-PythonKeySeven = "7 kulcs"
-PythonKeyEight = "8 kulcs"
-PythonKeyNine = "9 kulcs"
-PythonKeyLeftParenthesis = "Bal oldali PARENTHESIS kulcs"
-PythonKeyRightParenthesis = "JOGOS SZÜLETÉS kulcs"
-PythonKeyFour = "4 kulcs"
-PythonKeyFive = "5 kulcs"
-PythonKeySix = "6 kulcs"
-PythonKeyMultiplication = "TÖBB MüKÖDÉS kulcs"
-PythonKeyDivision = "DIVISION kulcs"
-PythonKeyOne = "1 kulcs"
-PythonKeyTwo = "2 kulcs"
-PythonKeyThree = "3 kulcs"
-PythonKeyPlus = "PLUS kulcs"
-PythonKeyMinus = "MINUS kulcs"
-PythonKeyZero = "0 kulcs"
-PythonKeyDot = "DOT kulcs"
-PythonKeyEe = "10 POWER X kulcs"
-PythonKeyAns = "ANS kulcs"
-PythonKeyExe = "EXE kulcs"
-PythonLdexp = "Visszatérés x * (2 ** i), inverz a frexp értékhez"
-PythonLength = "Objektum hossza"
-PythonLgamma = "Log-gamma funkció"
-PythonLog = "Logaritmus az alap"
-PythonLog10 = "Logaritmus az alaphoz 10"
-PythonLog2 = "Logaritmus az alaphoz 2"
-PythonMathFunction = "matematikai modul funkció elötag"
-PythonMatplotlibPyplotFunction = "matplotlib.pyplot module prefix"
+PythonIsFinite = "x véges-e"
+PythonIsInfinite = "x végtelen-e"
+PythonIsKeyDown = "True-t válaszol ha a k gomb le van nyomva"
+PythonIsNaN = "Ellenörizze hogy x nem NaN"
+PythonKandinskyFunction = "kandinsky modul funkció elötag"
+PythonLdexp = "frexp ellentéte : x*(2**i)"
+PythonLength = "Egy targy hossza"
+PythonLgamma = "Gamma funkció logaritmusa"
+PythonLog = "a alapú logaritmus"
+PythonLog10 = "Decimális logaritmus"
+PythonLog2 = "Bináris logaritmus"
+PythonMathFunction = "math modul funkció elötag"
+PythonMatplotlibPyplotFunction = "matplotlib.pyplot elötag"
 PythonMax = "Maximum"
 PythonMin = "Minimum"
-PythonModf = "Az x tört és egész részei"
-PythonMonotonic = "A monoton óra értéke"
-PythonOct = "Egész szám konvertálása oktális értékre"
-PythonPhase = "z fázis"
-PythonPlot = "Plot y versus x as lines"
-PythonPolar = "z poláris koordinátákban"
-PythonPop = "Az utolsó elem eltávolítása és visszaküldése"
-PythonPower = "x emelve az y teljesítményre"
-PythonPrint = "Objektum nyomtatása"
-PythonRadians = "x konvertálása x fokról radiánra"
-PythonRandint = "Véletlen egész szám [a, b] -ben"
-PythonRandom = "Lebegöpontos szám [0,1-ben ["
-PythonRandomFunction = "véletlenszerü modul funkció elötag"
-PythonRandrange = "Véletlen szám a tartományban (start, stop)"
-PythonRangeStartStop = "Lista az elejétöl a stop-1-ig"
-PythonRangeStop = "Lista 0-tól stop-1-ig"
-PythonRect = "z derékszögü koordinátákban"
-PythonRemove = "Távolítsa el az x elsö elöfordulását"
-PythonReverse = "A lista elemeinek megfordítása"
-PythonRound = "N számjegyre kerekítve"
-PythonScatter = "Draw a scatter plot of y versus x"
-PythonSeed = "Inicializálja a véletlenszám-generátort"
-PythonSetPixel = "Színes pixel (x, y)"
-PythonShow = "Display the figure"
-PythonSin = "Sine"
+PythonModf = "x-nek tört és egész részei"
+PythonMonotonic = "Az óra értékét adja vissza"
+PythonOct = "Decimális szám konvertálása octális számra"
+PythonPhase = "z fázisa"
+PythonPlot = "y-t jelöli x függvényében"
+PythonPolar = "Verctorizálni"
+PythonPop = "Az utolsó elemet el törölni"
+PythonPower = "x y. kitevö"
+PythonPrint = "Ki irni a elemeket"
+PythonRadians = "Fokról radiánra konvertálni"
+PythonRandint = "Véletlen egész szám [a;b] -ban"
+PythonRandom = "Decimális szám [0;1] -ban"
+PythonRandomFunction = "random modul funkció elötag"
+PythonRandrange = "Véletlen szám range(start,stop)-ban"
+PythonRangeStartStop = "start-tol stop-ig listája"
+PythonRangeStop = "0 tol stop-ig lista"
+PythonRect = "Algebrai számra konvertálni"
+PythonRemove = "Elsö x elöfordulását törolni"
+PythonReverse = "A lista elemeit megfordítani (másik irány)"
+PythonRound = "N számjegyre kerekítni"
+PythonScatter = "(x,y) halmaza"
+PythonSeed = "Inicializálni a véletlenszám-választót"
+PythonSetPixel = "Az (x,y) pixel-t ki szinezni"
+PythonShow = "Mutassa az ábrát"
+PythonSin = "Szinusz"
 PythonSinh = "Hiperbolikus szinusz"
-PythonSleep = "A végrehajtás felfüggesztése t másodpercre"
-PythonSort = "A lista rendezése"
+PythonSleep = "t másodpercre meg állitani a programmot"
+PythonSort = "A listát rendezni"
 PythonSqrt = "Négyzetgyök"
-PythonSum = "Összegzi a lista elemeit"
-PythonTan = "Érintö"
-PythonTanh = "Hiperbolikus érintö"
-PythonText = "Display a text at (x,y) coordinates"
-PythonTimeFunction = "idömodul funkció elötag"
-PythonTrunc = "x egészre csonkítva"
-PythonTurtleBackward = "Visszalépés x pixelrel"
-PythonTurtleCircle = "r pixel sugarú kör"
-PythonTurtleColor = "Állítsa be az toll színét"
-PythonTurtleColorMode = "Set the color mode to 1.0 or 255"
-PythonTurtleForward = "Ugrás x pixelrel"
-PythonTurtleFunction = "teknös modul funkció elötag"
-PythonTurtleGoto = "Mozgatás (x, y) koordinátákra"
-PythonTurtleHeading = "Visszaadja az aktuális címsort"
+PythonSum = "Összeadni a lista elemeit"
+PythonTan = "Érintö (tan)"
+PythonTanh = "Hiperbolikus érintö (tan)"
+PythonText = "(x,y) nél egy szöveget irni"
+PythonTimeFunction = "time funkció elötag"
+PythonTrunc = "Egész csonka (?)"
+PythonTurtleBackward = "x pixelt hátra"
+PythonTurtleCircle = "r pixel sugarú kört rajzolni"
+PythonTurtleColor = "Toll szinét beállitani"
+PythonTurtleColorMode = "Szin módot 1.0-ra vagy 255-ra állitani"
+PythonTurtleForward = "x pixelt elölre"
+PythonTurtleFunction = "turtle modul funkció elötag"
+PythonTurtleGoto = "Menjen a (x,y) koordinátákra"
+PythonTurtleHeading = "Visszaadja az aktuális irányt"
 PythonTurtleHideturtle = "A teknös elrejtése"
-PythonTurtleIsdown = "Visszatérés igazhoz, ha az toll lefelé"
-PythonTurtleLeft = "Forduljon fokkal balra"
+PythonTurtleIsdown = "True-t válaszol ha a toll irás pozícióban van"
+PythonTurtleLeft = "a fokkot forduljon balra"
 PythonTurtlePendown = "Húzza le a tollat"
 PythonTurtlePensize = "Állítsa a vonalvastagságot x pixelre"
 PythonTurtlePenup = "Húzza fel a tollat"
-PythonTurtlePosition = "Az aktuális (x, y) hely visszaadása"
-PythonTurtleReset = "A rajz visszaállítása"
-PythonTurtleRight = "Forduljon fokkal jobbra"
-PythonTurtleSetheading = "Állítsa be a tájolást fokokra"
-PythonTurtleSetposition = "A helymeghatározás"
-PythonTurtleShowturtle = "Mutasd a teknösöt"
+PythonTurtlePosition = "Az aktuális (x,y) pozíciót visszaadása"
+PythonTurtleReset = "Visszaállitani a rajzot (torléssel)"
+PythonTurtleRight = "a fokkot forduljon jobbra"
+PythonTurtleSetheading = "a fokokra állítja be az irányt"
+PythonTurtleSetposition = "A teknös pozicioját allitja"
+PythonTurtleShowturtle = "A teknöst meg mutatni"
 PythonTurtleSpeed = "Rajzolási sebesség 0 és 10 között"
-PythonTurtleWrite = "Display a text"
-PythonUniform = "Lebegöpontos szám [a, b] -ben"
-PythonImportTime = "Idömodul importálása"
-PythonTimePrefix = "idömodul funkció elötag"
-PythonTimeSleep = "Várj n másodpercet"
-PythonMonotonic = "Vissza a monoton idö"
+PythonTurtleWrite = "Szöveg irás"
+PythonUniform = "Lebegöpontos szám [a,b] -ban"
+PythonImportTime = "time modul importálása"
+PythonTimePrefix = "time funkció elötag"
+PythonTimeSleep = "n másodpercet várni"
+PythonMonotonic = "Meg fordítani a monoton idö"
 PythonFileOpen = "Fájl megnyitása"
-PythonFileSeekable = "A fájl kereshető?"
-PythonFileSeek = "A fájl kurzorának áthelyezése"
-PythonFileTell = "A fájl kurzorának helye"
-PythonFileClose = "Bezár egy fájlt"
-PythonFileClosed = "Igaz, ha a fájl bezárt"
-PythonFileRead = "Olvasson méretbájtig"
-PythonFileWrite = "B beírása fájlba"
-PythonFileReadline = "Olvas egy sort"
-PythonFileReadlines = "Olvassa a sorok listáját"
-PythonFileTruncate = "A fájl átméretezése méretre"
-PythonFileWritelines = "Sorok listáját írja"
-PythonFileName = "a fájl neve"
-PythonFileMode = "a fájl nyitott módja"
-PythonFileReadable = "A fájl olvasható?"
-PythonFileWritable = "A fájl írható?"
+PythonFileSeekable = "Seek-et lehete használni"
+PythonFileSeek = "A kurzort áthelyezni"
+PythonFileTell = "Visszaadja a kurzor helye"
+PythonFileClose = "Bezárni egy fájlt"
+PythonFileClosed = "True ha a fájl bezárva"
+PythonFileRead = "Olvas 16 bájtig"
+PythonFileWrite = "b-t irjon a fájlba"
+PythonFileReadline = "Olvas egy sort vagy 16 bájtig"
+PythonFileReadlines = "Olvas több sort"
+PythonFileTruncate = "A fájl átméretezése"
+PythonFileWritelines = "Irjon több sort"
+PythonFileName = "A fájl neve"
+PythonFileMode = "A fájl nyitott módja"
+PythonFileReadable = "read-et lehete használni"
+PythonFileWritable = "write-ot lehete használni"
+PythonImportOs = "os modul importálása"
+PythonOsUname = "Rendszer informaciók"
+PythonOsRemove = "Fájl törlése"
+PythonOsRename = "Fájl átnevezése"
+PythonOsListdir = "Fájlok listája"

apps/code/catalog.it.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Coseno iperbolico"
 PythonCount = "Conta le ricorrenze di x"
 PythonDegrees = "Conversione di radianti in gradi"
 PythonDivMod = "Quoziente e resto"
+PythonDrawLine = "Disegna una linea"
 PythonDrawString = "Visualizza il testo dal pixel x,y"
 PythonErf = "Funzione d'errore"
 PythonErfc = "Funzione d'errore complementare"
@@ -86,52 +87,6 @@ PythonIsInfinite = "Testa se x est infinito"
 PythonIsKeyDown = "Restituisce True premendo tasto k"
 PythonIsNaN = "Testa se x è NaN"
 PythonKandinskyFunction = "Prefisso funzione modulo kandinsky"
-PythonKeyLeft = "Tasto FRECCIA SINISTRA"
-PythonKeyUp = "Tasto FRECCIA ALTO"
-PythonKeyDown = "Tasto FRECCIA BASSO"
-PythonKeyRight = "Tasto FRECCIA DESTRA"
-PythonKeyOk = "Tasto OK"
-PythonKeyBack = "Tasto INDIETRO"
-PythonKeyHome = "Tasto CASA"
-PythonKeyOnOff = "Tasto ON/OFF"
-PythonKeyShift = "Tasto SHIFT"
-PythonKeyAlpha = "Tasto ALPHA"
-PythonKeyXnt = "Tasto X,N,T"
-PythonKeyVar = "Tasto VAR"
-PythonKeyToolbox = "Tasto TOOLBOX"
-PythonKeyBackspace = "Tasto CANCELLA"
-PythonKeyExp = "Tasto ESPONENZIALE"
-PythonKeyLn = "Tasto LOGARITMO NEPERIANO"
-PythonKeyLog = "Tasto LOGARITMO DECIMALE"
-PythonKeyImaginary = "Tasto I IMMAGINE"
-PythonKeyComma = "Tasto VIRGOLA"
-PythonKeyPower = "Tasto POTENZA"
-PythonKeySine = "Tasto SENO"
-PythonKeyCosine = "Tasto COSENO"
-PythonKeyTangent = "Tasto TANGENTE"
-PythonKeyPi = "Tasto PI"
-PythonKeySqrt = "Tasto RADICE QUADRATA"
-PythonKeySquare = "Tasto QUADRATO"
-PythonKeySeven = "Tasto 7"
-PythonKeyEight = "Tasto 8"
-PythonKeyNine = "Tasto 9"
-PythonKeyLeftParenthesis = "Tasto PARENTESI SINISTRA"
-PythonKeyRightParenthesis = "Tasto PARENTESI DESTRA"
-PythonKeyFour = "Tasto 4"
-PythonKeyFive = "Tasto 5"
-PythonKeySix = "Tasto 6"
-PythonKeyMultiplication = "Tasto MOLTIPLICAZIONE"
-PythonKeyDivision = "Tasto DIVISIONE"
-PythonKeyOne = "Tasto 1"
-PythonKeyTwo = "Tasto 2"
-PythonKeyThree = "Tasto 3"
-PythonKeyPlus = "Tasto PIÙ"
-PythonKeyMinus = "Tasto MENO"
-PythonKeyZero = "Tasto 0"
-PythonKeyDot = "Tasto PUNTO"
-PythonKeyEe = "Tasto 10 POTENZA X"
-PythonKeyAns = "Tasto ANS"
-PythonKeyExe = "Tasto EXE"
 PythonLdexp = "Inversa di frexp : x*(2**i)"
 PythonLength = "Longhezza di un oggetto"
 PythonLgamma = "Logaritmo della funzione gamma"

apps/code/catalog.nl.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Cosinus hyperbolicus"
 PythonCount = "Tel voorkomen van x"
 PythonDegrees = "Zet x om van radialen naar graden"
 PythonDivMod = "Quotiënt en rest"
+PythonDrawLine = "Teken een lijn"
 PythonDrawString = "Geef een tekst weer van pixel (x,y)"
 PythonErf = "Error functie"
 PythonErfc = "Complementaire error functie"
@@ -86,52 +87,6 @@ PythonIsInfinite = "Controleer of x oneindig is"
 PythonIsKeyDown = "Geef True als k toets omlaag is"
 PythonIsNaN = "Controleer of x geen getal is"
 PythonKandinskyFunction = "kandinsky module voorvoegsel"
-PythonKeyLeft = "PIJL NAAR LINKS toets"
-PythonKeyUp = "PIJL OMHOOG toets"
-PythonKeyDown = "PIJL OMLAAG toets"
-PythonKeyRight = "PIJL NAAR RECHTS toets"
-PythonKeyOk = "OK toets"
-PythonKeyBack = "TERUG toets"
-PythonKeyHome = "HOME toets"
-PythonKeyOnOff = "AAN/UIT toets"
-PythonKeyShift = "SHIFT toets"
-PythonKeyAlpha = "ALPHA toets"
-PythonKeyXnt = "X,N,T toets"
-PythonKeyVar = "VAR toets"
-PythonKeyToolbox = "TOOLBOX toets"
-PythonKeyBackspace = "BACKSPACE toets"
-PythonKeyExp = "EXPONENTIEEL toets"
-PythonKeyLn = "NATUURLIJKE LOGARITME toets"
-PythonKeyLog = "BRIGGSE LOGARITME toets"
-PythonKeyImaginary = "IMAGINAIRE I toets"
-PythonKeyComma = "KOMMA toets"
-PythonKeyPower = "MACHT toets"
-PythonKeySine = "SINUS toets"
-PythonKeyCosine = "COSINUS toets"
-PythonKeyTangent = "TANGENS toets"
-PythonKeyPi = "PI toets"
-PythonKeySqrt = "VIERKANTSWORTEL toets"
-PythonKeySquare = "KWADRAAT toets"
-PythonKeySeven = "7 toets"
-PythonKeyEight = "8 toets"
-PythonKeyNine = "9 toets"
-PythonKeyLeftParenthesis = "HAAKJE OPENEN toets"
-PythonKeyRightParenthesis = "HAAKJE SLUITEN toets"
-PythonKeyFour = "4 toets"
-PythonKeyFive = "5 toets"
-PythonKeySix = "6 toets"
-PythonKeyMultiplication = "VERMENIGVULDIGEN toets"
-PythonKeyDivision = "DELEN toets"
-PythonKeyOne = "1 toets"
-PythonKeyTwo = "2 toets"
-PythonKeyThree = "3 toets"
-PythonKeyPlus = "PLUS toets"
-PythonKeyMinus = "MIN toets"
-PythonKeyZero = "0 toets"
-PythonKeyDot = "PUNT toets"
-PythonKeyEe = "10 TOT DE MACHT X toets"
-PythonKeyAns = "ANS toets"
-PythonKeyExe = "EXE toets"
 PythonLdexp = "Geeft x*(2**i), inversie van frexp"
 PythonLength = "Lengte van een object"
 PythonLgamma = "Log-gammafunctie"

apps/code/catalog.pt.i18n

@@ -45,6 +45,7 @@ PythonCosh = "Cosseno hiperbólico"
 PythonCount = "Contar as ocorrências de x"
 PythonDegrees = "Converter x de radianos para graus"
 PythonDivMod = "Quociente e resto"
+PythonDrawLine = "Desenhe uma linha"
 PythonDrawString = "Mostrar o texto do pixel (x,y)"
 PythonErf = "Função erro"
 PythonErfc = "Função erro complementar"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Verificar se x é infinito"
 PythonIsKeyDown = "Devolve True se tecla k pressionada"
 PythonIsNaN = "Verificar se x é um NaN"
 PythonKandinskyFunction = "Prefixo da função do módulo kandinsky"
-PythonKeyLeft = "tecla SETA ESQUERDA"
-PythonKeyUp = "tecla SETA CIMA "
-PythonKeyDown = "tecla SETA BAIXO"
-PythonKeyRight = "tecla SETA DIREITA"
-PythonKeyOk = "tecla OK"
-PythonKeyBack = "tecla VOLTAR"
-PythonKeyHome = "tecla HOME"
-PythonKeyOnOff = "tecla ON/OFF"
-PythonKeyShift = "tecla SHIFT"
-PythonKeyAlpha = "tecla ALPHA"
-PythonKeyXnt = "tecla X,N,T"
-PythonKeyVar = "tecla VAR"
-PythonKeyToolbox = "tecla CAIXA DE FERRAMENTAS"
-PythonKeyBackspace = "tecla APAGAR"
-PythonKeyExp = "tecla EXPONENCIAL"
-PythonKeyLn = "tecla LOGARITMO NATURAL"
-PythonKeyLog = "tecla LOGARITMO DECIMAL"
-PythonKeyImaginary = "tecla I IMAGINÁRIO"
-PythonKeyComma = "tecla VÍRGULA"
-PythonKeyPower = "tecla EXPOENTE"
-PythonKeySine = "tecla SENO"
-PythonKeyCosine = "tecla COSSENO"
-PythonKeyTangent = "tecla TANGENTE"
-PythonKeyPi = "tecla PI"
-PythonKeySqrt = "tecla RAIZ QUADRADA"
-PythonKeySquare = "tecla AO QUADRADO"
-PythonKeySeven = "tecla 7"
-PythonKeyEight = "tecla 8"
-PythonKeyNine = "tecla 9"
-PythonKeyLeftParenthesis = "tecla PARÊNTESE ESQUERDO"
-PythonKeyRightParenthesis = "tecla PARÊNTESE DIREITO"
-PythonKeyFour = "tecla 4"
-PythonKeyFive = "tecla 5"
-PythonKeySix = "tecla 6"
-PythonKeyMultiplication = "tecla MULTIPLICAÇÃO"
-PythonKeyDivision = "tecla DIVISÃO"
-PythonKeyOne = "tecla 1"
-PythonKeyTwo = "tecla 2"
-PythonKeyThree = "tecla 3"
-PythonKeyPlus = "tecla MAIS"
-PythonKeyMinus = "tecla MENOS"
-PythonKeyZero = "tecla 0"
-PythonKeyDot = "tecla PONTO"
-PythonKeyEe = "tecla 10 expoente X"
-PythonKeyAns = "tecla ANS"
-PythonKeyExe = "tecla EXE"
 PythonLdexp = "Devolve x*(2**i), inverso de frexp"
 PythonLength = "Comprimento de um objeto"
 PythonLgamma = "Logaritmo da função gama"

apps/code/catalog.universal.i18n

@@ -50,6 +50,7 @@ PythonCommandCount = "list.count(x)"
 PythonCommandCountWithoutArg = ".count(\x11)"
 PythonCommandDegrees = "degrees(x)"
 PythonCommandDivMod = "divmod(a,b)"
+PythonCommandDrawLine = "draw_line(x1,y1,x2,y2,color)"
 PythonCommandDrawString = "draw_string(\"text\",x,y)"
 PythonCommandConstantE = "e"
 PythonCommandErf = "erf(x)"

apps/code/python_toolbox.cpp

@@ -5,6 +5,7 @@ extern "C" {
 #include <string.h>
 #include <ctype.h>
 }
+#include "app.h"
 
 namespace Code {
 
@@ -192,6 +193,7 @@ const ToolboxMessageTree KandinskyModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColor, I18n::Message::PythonColor),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect)
 };
 
@@ -200,52 +202,7 @@ const ToolboxMessageTree IonModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromIon, I18n::Message::PythonImportIon, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIonFunction, I18n::Message::PythonIonFunction, false, I18n::Message::PythonCommandIonFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeft, I18n::Message::PythonKeyLeft, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyUp, I18n::Message::PythonKeyUp, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDown, I18n::Message::PythonKeyDown, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyRight, I18n::Message::PythonKeyRight, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOk, I18n::Message::PythonKeyOk, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyBack, I18n::Message::PythonKeyBack, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyHome, I18n::Message::PythonKeyHome, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOnOff, I18n::Message::PythonKeyOnOff, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyShift, I18n::Message::PythonKeyShift, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyAlpha, I18n::Message::PythonKeyAlpha, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyXnt, I18n::Message::PythonKeyXnt, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyVar, I18n::Message::PythonKeyVar, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyToolbox, I18n::Message::PythonKeyToolbox, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyBackspace, I18n::Message::PythonKeyBackspace, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExp, I18n::Message::PythonKeyExp, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLn, I18n::Message::PythonKeyLn, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLog, I18n::Message::PythonKeyLog, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyImaginary, I18n::Message::PythonKeyImaginary, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyComma, I18n::Message::PythonKeyComma, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPower, I18n::Message::PythonKeyPower, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySine, I18n::Message::PythonKeySine, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyCosine, I18n::Message::PythonKeyCosine, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyTangent, I18n::Message::PythonKeyTangent, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPi, I18n::Message::PythonKeyPi, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySqrt, I18n::Message::PythonKeySqrt, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySquare, I18n::Message::PythonKeySquare, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySeven, I18n::Message::PythonKeySeven, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyEight, I18n::Message::PythonKeyEight, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyNine, I18n::Message::PythonKeyNine, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeftParenthesis, I18n::Message::PythonKeyLeftParenthesis, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyRightParenthesis, I18n::Message::PythonKeyRightParenthesis, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyFour, I18n::Message::PythonKeyFour, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyFive, I18n::Message::PythonKeyFive, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySix, I18n::Message::PythonKeySix, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyMultiplication, I18n::Message::PythonKeyMultiplication, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDivision, I18n::Message::PythonKeyDivision, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOne, I18n::Message::PythonKeyOne, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyTwo, I18n::Message::PythonKeyTwo, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyThree, I18n::Message::PythonKeyThree, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPlus, I18n::Message::PythonKeyPlus, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyMinus, I18n::Message::PythonKeyMinus, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyZero, I18n::Message::PythonKeyZero, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDot, I18n::Message::PythonKeyDot, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyEe, I18n::Message::PythonKeyEe, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyAns, I18n::Message::PythonKeyAns, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExe, I18n::Message::PythonKeyExe, false)
+  ToolboxMessageTree::Leaf(I18n::Message::IonSelector, I18n::Message::IonSelector)
 };
 
 const ToolboxMessageTree TimeModuleChildren[] = {
@@ -315,6 +272,7 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCosh, I18n::Message::PythonCosh),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDegrees, I18n::Message::PythonDegrees),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDivMod, I18n::Message::PythonDivMod),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandErf, I18n::Message::PythonErf),
@@ -536,6 +494,11 @@ KDCoordinate PythonToolbox::rowHeight(int j) {
 bool PythonToolbox::selectLeaf(int selectedRow) {
   m_selectableTableView.deselectTable();
   ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
+  if(node->insertedText() == I18n::Message::IonSelector){
+    App::app()->toolboxIonKeys()->setSender(sender());
+    Container::activeApp()->displayModalViewController(static_cast<ViewController*>(App::app()->toolboxIonKeys()), 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
+    return true;
+  }
   const char * editedText = I18n::translate(node->insertedText());
   // strippedEditedText array needs to be in the same scope as editedText
   char strippedEditedText[k_maxMessageSize];

apps/code/toolbox.universal.i18n

@@ -57,3 +57,5 @@ PythonCommandDef = "def \x11():\n  "
 PythonCommandDefWithArg = "def function(x):"
 PythonCommandReturn = "return "
 RandomModule = "random"
+IonSelector = "Key selector"
+PressAKey = "Press a key"

apps/code/toolbox_ion_keys.cpp

@@ -0,0 +1,50 @@
+#include "toolbox_ion_keys.h"
+#include <apps/apps_container.h>
+#include <assert.h>
+#include <ion.h>
+extern "C" {
+#include <py/obj.h>
+#include <py/objfun.h>
+}
+extern const mp_rom_map_elem_t modion_module_globals_table[48];
+
+namespace Code {
+  toolboxIonKeys::toolboxIonKeys() :
+  ViewController(nullptr),
+  m_view()
+  {
+  }
+
+  bool toolboxIonKeys::handleEvent(Ion::Events::Event e) {
+    Ion::Keyboard::State state = Ion::Keyboard::scan();
+    for(uint16_t i = 0; i < sizeof(modion_module_globals_table)/sizeof(_mp_rom_map_elem_t); i++){
+      _mp_rom_map_elem_t element = modion_module_globals_table[i];
+      if(mp_obj_is_small_int(element.value)){
+        int key = mp_obj_get_int(element.value);
+        if(state.keyDown(static_cast<Ion::Keyboard::Key>(key))){
+          m_sender->handleEventWithText(qstr_str(MP_OBJ_QSTR_VALUE(element.key)), true);
+        }
+      }
+    }
+    Container::activeApp()->dismissModalViewController();
+    AppsContainer::sharedAppsContainer()->redrawWindow();
+    return true;
+  }
+
+  toolboxIonKeys::toolboxIonView::toolboxIonView():
+    View()
+    {
+    }
+
+  void toolboxIonKeys::toolboxIonView::drawRect(KDContext * ctx, KDRect rect) const {
+    ctx->fillRect(rect, Palette::GrayBright);
+    ctx->strokeRect(rect, Palette::GrayDark);
+    ctx->drawString(I18n::translate(I18n::Message::PressAKey),KDPoint(rect.left()+80, rect.top()+20));
+
+  }
+
+  View * toolboxIonKeys::view(){
+    return &m_view;
+  }
+
+}

apps/code/toolbox_ion_keys.h

@@ -0,0 +1,21 @@
+#include <escher.h>
+
+namespace Code {
+
+  class toolboxIonKeys : public ViewController {
+    public :
+      toolboxIonKeys();
+      View * view() override;
+      bool handleEvent(Ion::Events::Event e) override;
+      void setSender(InputEventHandler * sender) { m_sender = sender; }
+    private :
+      class toolboxIonView : public View {
+        public :
+          toolboxIonView();
+          void drawRect(KDContext * ctx, KDRect rect) const override;
+      };
+      toolboxIonView m_view;
+      InputEventHandler * m_sender;
+  };
+
+}

apps/external/archive.cpp

@@ -55,29 +55,43 @@ bool fileAtIndex(size_t index, File &entry) {
    * TAR files are comprised of a set of records aligned to 512 bytes boundary
    * followed by data.
    */
-  while (index-- > 0) {
+  
+  for(;;) {
+    // Calculate the size
     size = 0;
     for (int i = 0; i < 11; i++)
       size = size * 8 + (tar->size[i] - '0');
+    
+    // Check if we found our file.
+    if (index == 0) {
+      // If yes, check for sanity and for exam mode stuff
+      if (!isSane(tar) || isExamModeAndFileNotExecutable(tar)) {
+        return false;
+      }
 
-    // Move to the next TAR header.
-    unsigned stride = (sizeof(TarHeader) + size + 511);
-    stride = (stride >> 9) << 9;
-    tar = reinterpret_cast<const TarHeader*>(reinterpret_cast<const char*>(tar) + stride);
+      // File entry found, copy data out.
+      entry.name = tar->name;
+      entry.data = reinterpret_cast<const uint8_t*>(tar) + sizeof(TarHeader);
+      entry.dataLength = size;
+      entry.isExecutable = (tar->mode[4] & 0x01) == 1;
 
-    // Sanity check.
-    if (!isSane(tar) || isExamModeAndFileNotExecutable(tar)) {
-      return false;
+      return true;
+    } else {
+      // move to the next TAR header.
+      unsigned stride = (sizeof(TarHeader) + size + 511);
+      stride = (stride >> 9) << 9;
+      tar = reinterpret_cast<const TarHeader*>(reinterpret_cast<const char*>(tar) + stride);
+
+      // Sanity check.
+      if (!isSane(tar)) {
+        return false;
+      }
     }
+    index--;
   }
-
-  // File entry found, copy data out.
-  entry.name = tar->name;
-  entry.data = reinterpret_cast<const uint8_t*>(tar) + sizeof(TarHeader);
-  entry.dataLength = size;
-  entry.isExecutable = (tar->mode[4] & 0x01) == 1;
-
-  return true;
+  
+  // Achievement unlock: How did we get there ?
+  return false;
 }
 
 extern "C" void (* const apiPointers[])(void);

apps/external/base.fr.i18n

@@ -1,7 +1,7 @@
 ExternalApp = "External"
 ExternalAppCapital = "EXTERNAL"
-ExternalAppApiMismatch = "API mismatch"
-ExternalAppExecError = "Cannot execute file"
+ExternalAppApiMismatch = "Décalage API"
+ExternalAppExecError = "Le fichier ne peut pas être exécuté"
 ExternalNotCompatible = "External n'est pas compatible"
 WithSimulator = "avec le simulateur"
 WithN0100 = "avec n0100"

apps/external/base.hu.i18n

@@ -1,9 +1,9 @@
 ExternalApp = "Külsö"
-ExternalAppCapital = "KÜLSö"
+ExternalAppCapital = "KÜLSÖ"
 ExternalAppApiMismatch = "API eltérés"
 ExternalAppExecError = "A fájl nem futtatható"
-ExternalNotCompatible = "Ez az alkalmazás nem kompatibilis a "
+ExternalNotCompatible = "Externál nem kompatibilis"
 WithSimulator = "Szimulátorral"
-WithN0100 = "a n0100-el"
-GetMoreAppsAt = "Mégtöbb alkalmazás a"
-NoAppsInstalled = "Nincs letöltött alkalmazás"
+WithN0100 = "n0100-al"
+GetMoreAppsAt = "Mégtöbb alkalmazás itt :"
+NoAppsInstalled = "Nincs letöltött externál"

apps/graph/base.hu.i18n

@@ -13,21 +13,21 @@ IntervalX = "x intervallum"
 FunctionDomain = "Tervtartomány"
 FunctionColor = "Funkció színe"
 NoFunction = "Nincs funkció"
-NoActivatedFunction = "Nincs bekapcsolt funkció"
-PlotOptions = "Tervezési lehetöségek"
-Compute = "Számítás"
+NoActivatedFunction = "Nincs használt funkció"
+PlotOptions = "Görbe beállítások"
+Compute = "Kiszámolás"
 Zeros = "Nullák"
 Tangent = "Tangens"
-Intersection = "Keresztezés"
+Intersection = "Metszéspont"
 Preimage = "Inverz kép"
 SelectLowerBound = "Alsó határ kiválasztása"
 SelectUpperBound = "Felsö határ kiválasztása"
-NoMaximumFound = "Nem található maximális érték"
-NoMinimumFound = "Nem található minimum"
-NoZeroFound = "Nem található nulla"
+NoMaximumFound = "Nem talált maximum-ot"
+NoMinimumFound = "Nem talált minimum-ot"
+NoZeroFound = "Nem talált nullát"
 NoIntersectionFound = "Nem található keresztezödés"
 NoPreimageFound = "Nem található inverz kép"
-DerivativeFunctionColumn = "Származékos függvény oszlop"
-HideDerivativeColumn = "A derivatív függvény elrejtése"
-AllowedCharactersAZaz09 = "Engedélyezett karakterek: A-Z, a-z, 0-9, _"
+DerivativeFunctionColumn = "A derivált fügvény oszlopa"
+HideDerivativeColumn = "A derivált függvény oszlop elrejtése"
+AllowedCharactersAZaz09 = "Engedélyezett karakterek: A..Z, a..z, 0..9, _"
 ReservedName = "Fenntartott név"

apps/home/app_cell.cpp

@@ -33,9 +33,20 @@ void AppCell::layoutSubviews(bool force) {
   m_nameView.setFrame(KDRect((bounds().width()-nameSize.width())/2-k_nameWidthMargin, bounds().height()-nameSize.height() - 2*k_nameHeightMargin, nameSize.width()+2*k_nameWidthMargin, nameSize.height()+2*k_nameHeightMargin), force);
 }
 
+void AppCell::setExtAppDescriptor(const char* name, const uint8_t *icon, size_t iconLength) {
+  m_external_app = true;
+  m_iconView.setImage(icon, iconLength);
+  m_iconView.setImage(nullptr);
+  m_nameView.setText(name);
+  m_nameView.setTextColor(Palette::HomeCellTextExternal);
+  m_nameView.setMessage(I18n::Message::Default);
+  layoutSubviews();
+}
+
 void AppCell::setExtAppDescriptor(const char* name, const Image* icon) {
   m_external_app = true;
   m_iconView.setImage(icon);
+  m_iconView.setImage(nullptr, 0);
   m_nameView.setText(name);
   m_nameView.setTextColor(Palette::HomeCellTextExternal);
   m_nameView.setMessage(I18n::Message::Default);
@@ -45,6 +56,7 @@ void AppCell::setExtAppDescriptor(const char* name, const Image* icon) {
 void AppCell::setAppDescriptor(::App::Descriptor * descriptor) {
   m_external_app = false;
   m_iconView.setImage(descriptor->icon());
+  m_iconView.setImage(nullptr, 0);
   m_nameView.setMessage(descriptor->name());
   m_nameView.setTextColor(Palette::HomeCellText);
   m_nameView.setText(nullptr);

apps/home/app_cell.h

@@ -18,6 +18,7 @@ public:
   void reloadCell() override;
   void setAppDescriptor(::App::Descriptor * appDescriptor);
   void setExtAppDescriptor(const char* name, const Image* icon);
+  void setExtAppDescriptor(const char* name, const uint8_t *icon, size_t iconLength);
 private:
   static constexpr KDCoordinate k_iconMargin = 22;
   static constexpr KDCoordinate k_iconWidth = 55;

apps/home/apps_layout.csv

@@ -1,2 +1,2 @@
-Default,calculation,rpn,graph,code,statistics,probability,solver,atom,sequence,regression,settings
-HidePython,calculation,rpn,graph,code,statistics,probability,solver,atom,sequence,regression,settings
+Default,calculation,rpn,graph,code,statistics,probability,solver,atomic,sequence,regression,settings
+HidePython,calculation,rpn,graph,code,statistics,probability,solver,atomic,sequence,regression,settings

apps/home/controller.cpp

@@ -189,9 +189,8 @@ void Controller::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
       if (img_index != -1) {
         External::Archive::File image_file;
         if (External::Archive::fileAtIndex(img_index, image_file)) {
-          const Image* img = new Image(55, 56, image_file.data, image_file.dataLength);
-          appCell->setExtAppDescriptor(app_file.name, img);
-
+          // const Image* img = new Image(55, 56, image_file.data, image_file.dataLength);
+          appCell->setExtAppDescriptor(app_file.name, image_file.data, image_file.dataLength);
         } else {
           appCell->setExtAppDescriptor(app_file.name, ImageStore::ExternalIcon);
         }
@@ -234,7 +233,7 @@ void Controller::tableViewDidChangeSelection(SelectableTableView * t, int previo
    * (so the previous one is always visible). */
   int appIndex = (t->selectedColumn()+t->selectedRow()*k_numberOfColumns)+1;
   if (appIndex >= this->numberOfIcons()+1) {
-    t->selectCellAtLocation(previousSelectedCellX, previousSelectedCellY);
+    t->selectCellAtLocation((this->numberOfIcons()%3)-1, (this->numberOfIcons() / k_numberOfColumns));
   }
 }
 

apps/main.cpp

@@ -53,8 +53,12 @@ void ion_main(int argc, const char * const argv[]) {
     const char * appNames[] = {"home", EPSILON_APPS_NAMES};
     for (int j = 0; j < AppsContainer::sharedAppsContainer()->numberOfApps(); j++) {
       App::Snapshot * snapshot = AppsContainer::sharedAppsContainer()->appSnapshotAtIndex(j);
-      int cmp = strcmp(argv[i]+2, appNames[j]);
-      if (cmp == '-') {
+      // Compare name in order to find if the firsts chars which are different are NULL and '-'
+      // -> check if the app name is in the argv
+      const char * s1 = argv[i]+2;
+      const char * s2 = appNames[j];
+      while (*s1 != '\0' && (*s1 == *s2)) {s1++; s2++;}
+      if (*s2 == '\0' && *s1 == '-') {
         snapshot->setOpt(argv[i]+2+strlen(appNames[j])+1, argv[i+1]);
         break;
       }

apps/math_toolbox.cpp

@@ -25,6 +25,7 @@ const ToolboxMessageTree calculChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::IntCommandWithArg, I18n::Message::Integral, false, I18n::Message::IntCommand),
   ToolboxMessageTree::Leaf(I18n::Message::SumCommandWithArg, I18n::Message::Sum, false, I18n::Message::SumCommand),
   ToolboxMessageTree::Leaf(I18n::Message::ProductCommandWithArg, I18n::Message::Product, false, I18n::Message::ProductCommand),
+  ToolboxMessageTree::Leaf(I18n::Message::Infinity, I18n::Message::InfinityMessage, false, I18n::Message::Infinity),
 };
 
 const ToolboxMessageTree complexChildren[] = {

apps/on_boarding/base.hu.i18n

@@ -1,7 +1,7 @@
 UpdateAvailable = "Elérhetö Frissítések!"
 UpdateMessage1 = "Fontos frissítések vannak"
 UpdateMessage2 = "a számológépéhez."
-UpdateMessage3 = "Látogasson el a weboldalunkra a számítógépröl"
+UpdateMessage3 = "Töltje le a weboldalunkról az utolso verziót"
 UpdateMessage4 = "www.numworks.com/update"
 BetaVersion = "BETA VERZIÓ"
 BetaVersionMessage1 = ""
@@ -10,4 +10,4 @@ BetaVersionMessage3 = "Lehet, hogy hibákat észlel."
 BetaVersionMessage4 = ""
 BetaVersionMessage5 = "Kérjük, küldjön minden visszajelzést a"
 BetaVersionMessage6 = "contact@numworks.com email címre"
-Skip = "Ugrás"
+Skip = "Tovább"

apps/probability/base.hu.i18n

@@ -11,17 +11,17 @@ ExponentialDistribution = "Exponenciális eloszlás"
 GeometricDistribution = "Geometriai eloszlás"
 PoissonDistribution = "Poisson eloszlás"
 ChiSquaredDistribution = "Chi-négyzet eloszlás"
-StudentDistribution = "Diák eloszlása"
-FisherDistribution = "Poisson eloszlás"
+StudentDistribution = "Student eloszlása"
+FisherDistribution = "Fisher eloszlás"
 ChooseParameters = "Paraméterek kiválasztása"
-RepetitionNumber = "n: A kísérletek száma"
-SuccessProbability = "p: A siker valószínüsége"
+RepetitionNumber = "n: ismétlések száma"
+SuccessProbability = "p: a siker valószínüsége"
 IntervalDefinition = "[a, b]: intervallum"
-LambdaExponentialDefinition = "λ: Rate paraméter"
-MeanDefinition = "μ: Mean"
+LambdaExponentialDefinition = "λ: paraméter"
+MeanDefinition = "μ: remény vagy atlag"
 DeviationDefinition = "σ: szórás"
-LambdaPoissonDefinition = "λ: Paraméter"
-DegreesOfFreedomDefinition = "k: Szabadságfokok"
-D1FisherDefinition = "d1: A számláló szabadsági foka"
-D2FisherDefinition = "d2: A nevezó szabadsági foka"
+LambdaPoissonDefinition = "λ: paraméter"
+DegreesOfFreedomDefinition = "k: szabadságfokok"
+D1FisherDefinition = "d1: a számláló szabadságfokai"
+D2FisherDefinition = "d2: a nevezó szabadságfokai"
 ComputeProbability = "Számítsa ki a valószínüségeket"

apps/regression/base.hu.i18n

@@ -1,21 +1,20 @@
 RegressionApp = "Regresszió"
 RegressionAppCapital = "REGRESSZIÓ"
 Regression = "Regresszió"
-Reg = "reg"
 MeanDot = "Középérték"
 RegressionCurve = "Regressziós görbe"
-XPrediction = "Jóslás megadva X"
+XPrediction = "Jóslás X megadva"
 YPrediction = "Jóslás Y megadva"
 ValueNotReachedByRegression = "Az ablakban az érték még nem volt elérve"
 NumberOfDots = "Pontok száma"
 Covariance = "Kovariancia"
 Linear = "Lineáris"
-Proportional = "Proportional"
+Proportional = "Általános"
 Quadratic = "Másodfokú"
-Cubic = "Kocka"
+Cubic = "Kockás"
 Quartic = "Kvartikus"
 Logarithmic = "Logaritmikus"
 Power = "Teljesítmény"
 Trigonometrical = "Trigonometrikus"
 Logistic = "Logisztikai"
-DataNotSuitableForRegression = " Az adat nem megfelelö ehhez a regressziós modellhez"
+DataNotSuitableForRegression = "Ezek az adatok nem megfelelö ehhez a regressziós modellhez"

apps/sequence/base.hu.i18n

@@ -1,5 +1,5 @@
 SequenceApp = "Szekvenciák"
-SequenceAppCapital = "Szekvenciák"
+SequenceAppCapital = "SZEKVENCIÁK"
 SequenceTab = "Szekvenciák"
 AddSequence = "Szekvencia hozzáadása"
 ChooseSequenceType = "Válassza ki a sorozat típusát"
@@ -14,9 +14,9 @@ NoSequence = "Nincs sorrend"
 NoActivatedSequence = "Nincs szekvencia bekapcsolva"
 NStart = "N start"
 NEnd = "N vég"
-TermSum = "A feltételek összege"
-SelectFirstTerm = "Elsö ciklus kiválasztása"
-SelectLastTerm = "Utolsó kifejezés kiválasztása"
+TermSum = "A kifejezés összege"
+SelectFirstTerm = "Elsö kifejezés kiválasztása "
+SelectLastTerm = "Utolsó kifejezés kiválasztása "
 ValueNotReachedBySequence = "Az értéket nem érte el a sorozat"
 NColumn = "n oszlop"
 FirstTermIndex = "Elsö kifejezés index"

apps/settings/base.hu.i18n

@@ -12,21 +12,21 @@ ToDeactivateExamMode1 = "a vizsga mód kikapcsoláshoz"
 ToDeactivateExamMode2 = "csatlakoztassa a számológépet a számítógéphez"
 ToDeactivateExamMode3 = "vagy egy konnektorhoz."
 # --------------------- Please do not edit these messages ---------------------
-ExamModeWarning1 = "Vigyázat: ennek betartása"
-ExamModeWarning2 = "nem hivatalos szoftver vizsgálati módja"
-ExamModeWarning3 = "a NumWorks/Omega nem garantálja."
-AboutWarning1 = "Vigyázat: egy"
-AboutWarning2 = "nem hivatalos szoftververzió."
-AboutWarning3 = "A NumWorks nem vállal felelösséget"
-AboutWarning4 = "az esetleges károkért."
+ExamModeWarning1 = "Vigyázat: a használt szoftver nem"
+ExamModeWarning2 = "hivatalos, Numworks nem garantálja"
+ExamModeWarning3 = "a vizsgálati mód megfelelőségét."
+AboutWarning1 = "Vigyázat: a használt szoftver"
+AboutWarning2 = "nem hivatalos. A NumWorks nem"
+AboutWarning3 = "vállal felelösséget az"
+AboutWarning4 = "esetleges károkért."
 # -----------------------------------------------------------------------------
-About = "Egyéb"
+About = "Apropó"
 Degrees = "Fokok "
 Gradians = "Gradiens "
 Radian = "Radián "
 Decimal = "Tizedes "
 Scientific = "Tudományos "
-Engineering = "Mérnöki "
+Engineering = "Mérnökség "
 SignificantFigures = "Tizedes számok "
 Real = "Valódi "
 Cartesian = "Kartéziánus "
@@ -40,31 +40,31 @@ FontSizes = "Python betü méret"
 LargeFont = "Nagy "
 SmallFont = "Kicsi "
 SerialNumber = "Sorozatszám"
-UpdatePopUp = "Elöugró ablak frissítése"
-BetaPopUp = "Béta pop-up"
+UpdatePopUp = "Frissítés figyelmeztetés"
+BetaPopUp = "Béta figyelmeztetés"
 Contributors = "Közremüködök"
-Accessibility = "Hozzáférhetöség"
+Accessibility = "Több vizuális beállitások"
 AccessibilityInvertColors = "Invertált színek"
-AccessibilityMagnify = "Nagyítás"
+AccessibilityMagnify = "Nagyító"
 AccessibilityGamma = "Gamma korrekció"
 AccessibilityGammaRed = "Piros gamma"
 AccessibilityGammaGreen = "Zöld gamma"
 AccessibilityGammaBlue = "Kék gamma"
 MathOptions = "Matematikai beállítások"
 SymbolMultiplication = "Szorzás"
-SymbolMultiplicationCross = "Kereszt"
+SymbolMultiplicationCross = "Kereszt "
 SymbolMultiplicationMiddleDot = "Pont "
 SymbolMultiplicationStar = "Csillag "
-SymbolMultiplicationAutoSymbol = "Automata "
-SymbolFunction = "Kifejezési formátum "
-SymbolDefaultFunction = "alapértelmezett "
+SymbolMultiplicationAutoSymbol = "Automatitus "
+SymbolFunction = "Kifejezés "
+SymbolDefaultFunction = "Alap "
 SymbolArgFunction = "Üres "
 SymbolArgDefaultFunction = "Argumentummal "
 PythonFont = "Python Betütipus"
 MemUse = "Memória"
-DateTime = "Date/time"
-ActivateClock = "Activate clock"
-Date = "Date"
-Time = "Time"
-RTCWarning1 = "Enabling the clock drains the battery faster"
-RTCWarning2 = "when the calculator is powered off."
+DateTime = "Dátum/óra"
+ActivateClock = "Óra bekapcsolása"
+Date = "Datum"
+Time = "Óra"
+RTCWarning1 = "Amikor a számológép alvómódban van, az óra"
+RTCWarning2 = "használása az elemet gyorsabban meríti ki."

apps/settings/main_controller.cpp

@@ -19,12 +19,8 @@ constexpr SettingsMessageTree s_symbolFunctionChildren[3] = {SettingsMessageTree
 constexpr SettingsMessageTree s_modelMathOptionsChildren[6] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren), SettingsMessageTree(I18n::Message::SymbolFunction, s_symbolFunctionChildren), SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren), SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren)};
 constexpr SettingsMessageTree s_modelFontChildren[2] = {SettingsMessageTree(I18n::Message::LargeFont), SettingsMessageTree(I18n::Message::SmallFont)};
 constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)};
-constexpr SettingsMessageTree s_contributorsChildren[20] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::JulieC), SettingsMessageTree(I18n::Message::LelahelHideux), SettingsMessageTree(I18n::Message::Madil), SettingsMessageTree(I18n::Message::HilaireLeRoux)};
-#ifdef OMEGA_USERNAME
+constexpr SettingsMessageTree s_contributorsChildren[23] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::SandraSimmons), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::AntoninLoubiere), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::JulieC), SettingsMessageTree(I18n::Message::LelahelHideux), SettingsMessageTree(I18n::Message::Madil), SettingsMessageTree(I18n::Message::HilaireLeRoux), SettingsMessageTree(I18n::Message::HectorNussbaumer), SettingsMessageTree(I18n::Message::RaphaelDyda), SettingsMessageTree(I18n::Message::ThibautC)};
 constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::OmegaVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)};
-#else
-constexpr SettingsMessageTree s_modelAboutChildren[7] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::OmegaVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)};
-#endif
 
 MainController::MainController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate) :
   ViewController(parentResponder),

apps/settings/main_controller.h

@@ -24,12 +24,8 @@ extern const Shared::SettingsMessageTree s_modelMathOptionsChildren[6];
 extern const Shared::SettingsMessageTree s_modelFontChildren[2];
 extern const Shared::SettingsMessageTree s_modelDateTimeChildren[3];
 extern const Shared::SettingsMessageTree s_accessibilityChildren[6];
-extern const Shared::SettingsMessageTree s_contributorsChildren[20];
-#ifdef OMEGA_USERNAME
+extern const Shared::SettingsMessageTree s_contributorsChildren[23];
 extern const Shared::SettingsMessageTree s_modelAboutChildren[8];
-#else
-extern const Shared::SettingsMessageTree s_modelAboutChildren[7];
-#endif
 extern const Shared::SettingsMessageTree s_model;
 
 class MainController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource {

apps/settings/sub_menu/about_controller.cpp

@@ -29,7 +29,7 @@ AboutController::AboutController(Responder * parentResponder) :
 }
 
 bool AboutController::handleEvent(Ion::Events::Event event) {
-  I18n::Message childLabel = m_messageTreeModel->childAtIndex(selectedRow())->label();
+  I18n::Message childLabel = m_messageTreeModel->childAtIndex(selectedRow()+(!hasUsernameCell()))->label();
   /* We hide here the activation hardware test app: in the menu "about", by
    * clicking on '6' on the last row. */
   if ((event == Ion::Events::Six || event == Ion::Events::LowerT || event == Ion::Events::UpperT) && childLabel == I18n::Message::FccId) {
@@ -39,8 +39,9 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
     if (childLabel == I18n::Message::Contributors) {
       GenericSubController * subController = &m_contributorsController;
-      subController->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()));
+      subController->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()+(!hasUsernameCell())));
       StackViewController * stack = stackController();
+      m_lastSelect = selectedRow();
       stack->push(subController);
       return true;
     }
@@ -96,11 +97,15 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
   return GenericSubController::handleEvent(event);
 }
 
+int AboutController::numberOfRows() const {
+  return m_messageTreeModel->numberOfChildren() - (!hasUsernameCell());
+}
+
 HighlightCell * AboutController::reusableCell(int index, int type) {
   assert(index >= 0);
   if (type == 0) {
-    assert(index < k_totalNumberOfCell-1);
-    return &m_cells[index];
+    assert(index < k_totalNumberOfCell-1-(!hasUsernameCell()));
+    return &m_cells[index+(!hasUsernameCell())];
   }
   assert(index == 0);
   return &m_contributorsCell;
@@ -113,7 +118,7 @@ int AboutController::typeAtLocation(int i, int j) {
 int AboutController::reusableCellCount(int type) {
   switch (type) {
     case 0:
-      return k_totalNumberOfCell-1;
+      return k_totalNumberOfCell-1-(!hasUsernameCell());
     case 1:
       return 1;
     default:
@@ -122,13 +127,18 @@ int AboutController::reusableCellCount(int type) {
   }
 }
 
+bool AboutController::hasUsernameCell() const {
+  return (*Ion::username()) != 0;
+}
+
 void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  GenericSubController::willDisplayCellForIndex(cell, index);
+  int i = index + (!hasUsernameCell());
+  GenericSubController::willDisplayCellForIndex(cell, i);
   assert(index >= 0 && index < k_totalNumberOfCell);
-  if (m_messageTreeModel->childAtIndex(index)->label() == I18n::Message::Contributors) {
+  if (m_messageTreeModel->childAtIndex(i)->label() == I18n::Message::Contributors) {
     MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell;
     myTextCell->setSubtitle(I18n::Message::Default);
-  } else if (m_messageTreeModel->childAtIndex(index)->label() == I18n::Message::MemUse) {
+  } else if (m_messageTreeModel->childAtIndex(i)->label() == I18n::Message::MemUse) {
     char memUseBuffer[15];
     int len = Poincare::Integer((int)((float) (Ion::Storage::k_storageSize - Ion::Storage::sharedStorage()->availableSize()) / 1024.f)).serialize(memUseBuffer, 4);
     memUseBuffer[len] = 'k';
@@ -146,17 +156,16 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
     MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
     static const char * mpVersion = MICROPY_VERSION_STRING;
     static const char * messages[] = {
-#ifdef OMEGA_USERNAME
-      Ion::username(),
-#endif
+      (const char*) Ion::username(),
       Ion::softwareVersion(),
       Ion::omegaVersion(),
       mpVersion,
       "",
       Ion::serialNumber(),
-      Ion::fccId()
+      Ion::fccId(),
+      ""
     };
-    myCell->setAccessoryText(messages[index]);
+    myCell->setAccessoryText(messages[i]);
   }
 }
 

apps/settings/sub_menu/about_controller.h

@@ -20,12 +20,10 @@ public:
   int reusableCellCount(int type) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
   int typeAtLocation(int i, int j) override;
+  int numberOfRows() const override;
 private:
-#ifdef OMEGA_USERNAME
   constexpr static int k_totalNumberOfCell = 8;
-#else
-  constexpr static int k_totalNumberOfCell = 7;
-#endif
+  bool hasUsernameCell() const;
   ContributorsController m_contributorsController;
   MessageTableCellWithChevronAndMessage m_contributorsCell;
   //SelectableViewWithMessages m_view;

apps/settings/sub_menu/contributors_controller.cpp

@@ -28,13 +28,13 @@ int ContributorsController::reusableCellCount(int type) {
   return k_totalNumberOfCell;
 }
 
-constexpr static int s_numberOfDevelopers = 12;
+constexpr static int s_numberOfDevelopers = 13;
 constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = {
   I18n::Message::PQuentinGuidee,
-  I18n::Message::PSandraSimmons,
   I18n::Message::PJoachimLeFournis,
-  I18n::Message::PJeanBaptisteBoric,
   I18n::Message::PMaximeFriess,
+  I18n::Message::PJeanBaptisteBoric,
+  I18n::Message::PSandraSimmons,
   I18n::Message::PDavid,
   I18n::Message::PDamienNicolet,
   I18n::Message::PEvannDreumont,
@@ -42,16 +42,19 @@ constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = {
   I18n::Message::PVenceslasDuet,
   I18n::Message::PCharlotteThomas,
   I18n::Message::PAntoninLoubiere,
+  I18n::Message::PCyprienMejat,
 };
 
-constexpr static int s_numberOfBetaTesters = 6;
+constexpr static int s_numberOfBetaTesters = 8;
 constexpr static I18n::Message s_betaTestersUsernames[s_numberOfBetaTesters] = {
-  I18n::Message::PCyprienMejat,
   I18n::Message::PTimeoArnouts,
   I18n::Message::PJulieC,
   I18n::Message::PLelahelHideux,
   I18n::Message::PMadil,
   I18n::Message::PHilaireLeRoux,
+  I18n::Message::PHectorNussbaumer,
+  I18n::Message::PRaphaelDyda,
+  I18n::Message::PThibautC,
 };
 
 void ContributorsController::willDisplayCellForIndex(HighlightCell * cell, int index) {

apps/settings/sub_menu/generic_sub_controller.h

@@ -23,8 +23,9 @@ public:
   void setMessageTreeModel(const MessageTree * messageTreeModel);
   void viewDidDisappear() override;
 protected:
+  int m_lastSelect = 0;
   StackViewController * stackController() const;
-  virtual int initialSelectedRow() const { return 0; }
+  virtual int initialSelectedRow() const { return m_lastSelect; }
   constexpr static KDCoordinate k_topBottomMargin = 13;
   SelectableTableView m_selectableTableView;
   MessageTree * m_messageTreeModel;

apps/settings/sub_menu/math_options_controller.cpp

@@ -25,6 +25,7 @@ bool MathOptionsController::handleEvent(Ion::Events::Event event) {
       subController = &m_preferencesController;
     subController->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()));
     StackViewController * stack = stackController();
+    m_lastSelect = selectedRow();
     stack->push(subController);
     return true;
   }

apps/shared.de.i18n

@@ -94,3 +94,8 @@ XStart = "X Startwert"
 Zoom = "Zoom"
 Developers = "Entwickler"
 BetaTesters = "Beta-Tester"
+ExamModeMode = "Modus"
+ExamModeModeStandard = "Standard "
+ExamModeModeNoSym = "Kein Symbol "
+ExamModeModeNoSymNoText = "Kein Symbol kein Text "
+ExamModeModeDutch = "Niederländisch "

apps/shared.es.i18n

@@ -94,3 +94,8 @@ XStart = "X inicio"
 Zoom = "Zoom"
 Developers = "Desarrolladores"
 BetaTesters = "Probadores beta"
+ExamModeMode = "Modo"
+ExamModeModeStandard = "Estándar "
+ExamModeModeNoSym = "Sin simbólico "
+ExamModeModeNoSymNoText = "Sin simbólico sin texto "
+ExamModeModeDutch = "Holandés "

apps/shared.hu.i18n

@@ -3,86 +3,99 @@ ActivateExamMode = "A vizsgálati mód aktiválása"
 ActivateDutchExamMode = "A holland vizsga mód aktiválása"
 ActiveExamModeMessage1 = "Az összes adatod"
 ActiveExamModeMessage2 = "törölve lesz ha"
-ActiveExamModeMessage3 = "aktiválod a vizsga módot."
-ActiveDutchExamModeMessage1 = "Az összes adat törlödik, amikor"
-ActiveDutchExamModeMessage2 = "aktiválod a vizsga módot. A Python "
-ActiveDutchExamModeMessage3 = "alkalmazás nem lesz elérhetö."
-Axis = "Tengely"
+ActiveExamModeMessage3 = "a vizsga módot aktiválja."
+ActiveDutchExamModeMessage1 = "Az összes adatod törölve lesz"
+ActiveDutchExamModeMessage2 = "ha a vizsga módot aktiválja. A"
+ActiveDutchExamModeMessage3 = "Python alkalmazás használhatatlan lesz."
+Axis = "Tengelyek"
 Cancel = "Mégse"
 ClearColumn = "Oszlop törlése"
 ColumnOptions = "Oszlop opciók"
-CopyColumnInList = "Az oszlop exportálása egy listába"
-DataNotSuitable = "Az adatok nem megfelelöek"
-DataTab = "Data"
-DefaultSetting = "Alapbeállítások"
+ConfirmDiscard1 = "Minden változtatást elvetünk"
+ConfirmDiscard2 = ""
+CopyColumnInList = "Az oszlopot egy listába másolni"
+Country = "Ország"
+CountryCA = "Kanada "
+CountryDE = "Németország "
+CountryES = "Spanyolország "
+CountryFR = "Franciaország "
+CountryGB = "Egyesült Királyság "
+CountryIT = "Olaszország "
+CountryNL = "Hollandia "
+CountryPT = "Portugália "
+CountryUS = "Egyesült Államok "
+CountryWW = "Nemzetközi "
+CountryWarning1 = "Ez a beállítás meghatározza az"
+CountryWarning2 = "alkalmazott tematikus konvenciókat."
+DataNotSuitable = "Az adatok nem felelnek meg"
+DataTab = "Adatok"
 Deg = "deg"
 Deviation = "Varianca"
 DisplayValues = "Értékek mutatása"
 Empty = "Üres"
 Eng = "eng"
-ExitExamMode1 = "Kilépés a vizsga "
+ExitExamMode1 = "Kilépni a vizsga "
 ExitExamMode2 = "módból?"
 Exponential = "Exponenciális"
 FillWithFormula = "Töltse ki egy képlettel"
 ForbiddenValue = "Tiltott érték"
-FunctionColumn = "0 (0) oszlop"
+FunctionColumn = "0(0) oszlop"
 FunctionOptions = "Funkció opciók"
-Goto = "Menj ide"
+Goto = "Menj ..."
 GraphTab = "Grafikon"
-HardwareTestLaunch1 = "Ön elindítja a hardvert"
-HardwareTestLaunch2 = " tesztet.  A teszt végén neked"
-HardwareTestLaunch3 = "kell vissza állítani az eszközt,és"
-HardwareTestLaunch4 = "az összes adat törlödni fog."
-Initialization = "Elöbeállítás"
+HardwareTestLaunch1 = "A hardverteszt indítása :"
+HardwareTestLaunch2 = "Nyomjon a reset gombra a"
+HardwareTestLaunch3 = "teszt megállításához (ez"
+HardwareTestLaunch4 = "az adatokat törölni fogja)"
 IntervalSet = "Állítsa be az intervallumot"
 Language = "Nyelv"
-LowBattery = "Alacsony töltöttség"
+LowBattery = "Majdnem kimerült az elem"
 Mean = "középérték"
-Move = " Move: "
+Move = " Odébb rakni: "
 NameCannotStartWithNumber = "Egy név nem kezdöthet számmal"
 NameTaken = "Ez a név foglalt"
 NameTooLong = "Ez a név túl hosszú"
+Navigate = "Hajózik"
 Next = "következö"
+NEnd = "N vége"
 NoDataToPlot = "Nincs rajzolható adat"
 NoFunctionToDelete = "Nincs törölhetö függvény"
 NoValueToCompute = "Nincs számítható érték"
-NEnd = "N vége"
 NStart = "N kezdete"
-Ok = "Megerösítés"
+Ok = "Érvényesítés"
 Or = " vagy "
-Orthonormal = "Ortonormál"
-Plot = "Grafikon elkészítése"
+Orthonormal = "Ortonormált"
+Plot = "Grafikon rajzolása"
 PoolMemoryFull1 = "A memória megtelt."
 PoolMemoryFull2 = "Kérem próbálja újra."
-Rad = "rad"
 Rename = "Átnevezés"
-RoundAbscissa = "Egész szám"
 Sci = "sci"
+SortValues = "Rendezés értékek növelésével"
+SortSizes = "Rendezés növekvő frekvenciák szerint"
 SquareSum = "Négyzetek összege"
 StandardDeviation = "Alap eltérés"
-StoreExpressionNotAllowed = "'tárolás' nem engedélyezett"
 StatTab = "Statisztikák"
 Step = "Lépés"
 StorageMemoryFull1 = "A memória megtelt."
-StorageMemoryFull2 = "Adatok törlése és próbálkozzon újra."
+StorageMemoryFull2 = "Törlöljön adatokat és próbálkozzon újra."
+StoreExpressionNotAllowed = "'szore' nem engedélyezett"
 SyntaxError = "Szintaxis hiba"
 Sym = "sym"
 TEnd = "T vég"
 ThetaEnd = "θ vége"
 ThetaStart = "θ kezdete"
 TStart = "T kezdete"
-ToZoom = "Zoom:"
-Trigonometric = "Trigonometrikus"
-UndefinedValue = "Nincs meghatározva érték"
+ToZoom = "Nagyítani : "
+UndefinedValue = "Meghatározatlan adat"
 ValuesTab = "Táblázat"
 Warning = "Figyelem"
 XEnd = "X vége"
 XStart = "X kezdete"
-Zoom = "Zoom"
-Developers = "Fejlesztök"
+Zoom = "Nagyítás"
+Developers = "Kifejlesztök"
 BetaTesters = "Béta tesztelök"
 ExamModeMode = "Üzemmód"
-ExamModeModeStandard = "Normál"
-ExamModeModeNoSym = "Nincs sym"
-ExamModeModeNoSymNoText = "Nincs szimbolikus, nincs szöveg "
+ExamModeModeStandard = "Normál "
+ExamModeModeNoSym = "Szimbólikus nélkül "
+ExamModeModeNoSymNoText = "Szimbólikus és szöveg nélkül "
 ExamModeModeDutch = "Holland "

apps/shared.it.i18n

@@ -94,3 +94,8 @@ XStart = "X iniziale"
 Zoom = "Zoom"
 Developers = "Developers"
 BetaTesters = "Beta testers"
+ExamModeMode = "Modalità"
+ExamModeModeStandard = "Standard "
+ExamModeModeNoSym = "Nessun simbolo "
+ExamModeModeNoSymNoText = "Nessun simbolo nessun testo "
+ExamModeModeDutch = "Olandese "

apps/shared.nl.i18n

@@ -94,3 +94,8 @@ XStart = "X begin"
 Zoom = "Zoom"
 Developers = "Developers"
 BetaTesters = "Beta testers"
+ExamModeMode = "Mode"
+ExamModeModeStandard = "Standaard "
+ExamModeModeNoSym = "Geen sym "
+ExamModeModeNoSymNoText = "Geen sym geen tekst "
+ExamModeModeDutch = "Nederlands "

apps/shared.pt.i18n

@@ -94,3 +94,8 @@ XStart = "X início"
 Zoom = "Zoom"
 Developers = "Desenvolvedores"
 BetaTesters = "Testadores beta"
+ExamModeMode = "Modo"
+ExamModeModeStandard = "Padrão "
+ExamModeModeNoSym = "Sem sym "
+ExamModeModeNoSymNoText = "Sem sym sem texto "
+ExamModeModeDutch = "holandês "

apps/shared.universal.i18n

@@ -134,6 +134,7 @@ GcdCommandWithArg = "gcd(p,q)"
 Gon = "gon"
 ImCommandWithArg = "im(z)"
 IndentityCommandWithArg = "identity(n)"
+Infinity = "infinity"
 IntCommand = "int(\x11,x,\x11,\x11)"
 IntCommandWithArg = "int(f(x),x,a,b)"
 InvBinomialCommandWithArg = "invbinom(a,n,p)"
@@ -342,7 +343,7 @@ CyprienMejat = "Cyprien Méjat"
 PCyprienMejat = "@A2drien"
 TimeoArnouts = "Timéo Arnouts"
 PTimeoArnouts = "@Dogm"
-JulieC = "Julie C"
+JulieC = "Julie C."
 PJulieC = "@windows9x95"
 LelahelHideux = "Lélahel Hideux"
 PLelahelHideux = "@Lelahelry"
@@ -350,6 +351,12 @@ Madil = "Madil"
 PMadil = "@le-grand-mannitout"
 HilaireLeRoux = "Hilaire Le Roux"
 PHilaireLeRoux = "@0Babass2"
+HectorNussbaumer = "Hector Nussbaumer"
+PHectorNussbaumer = "@Sycorax"
+RaphaelDyda = "Raphaël Dyda"
+PRaphaelDyda = "@Trixciel"
+ThibautC = "Thibaut C."
+PThibautC = "@Tibo_C"
 SpeedOfLight = "2.99792458·10^8_m_s^-1"
 YearLight = "9.461·10^15_m"
 Boltzmann = "1.380649·10^-23_J_K^-1"

apps/solver/base.hu.i18n

@@ -1,29 +1,29 @@
 SolverApp = "Egyenletek"
-SolverAppCapital = "Egyenletek"
-AddEquation = "Egyenlet hozzáadása"
-ResolveEquation = "Oldja meg az egyenletet"
-ResolveSystem = "A rendszer megoldása"
+SolverAppCapital = "EGYENLETEK"
+AddEquation = "Egyenlet hozzáadás"
+ResolveEquation = "Egyenletet megoldása"
+ResolveSystem = "Rendszer megoldása"
 UseEquationModel = "Használjon egyenleti sablont"
-RequireEquation = "A bemenetnek egyenletnek kell lennie"
-UnrealEquation = "Unreal egyenlet"
-UndefinedEquation = "Definiálatlan egyenlet"
-TooManyVariables = "Túl sok ismeretlen"
+RequireEquation = "A bemenetnek csak egyenlet lehet"
+UnrealEquation = "Irreális egyenlet"
+UndefinedEquation = "Egy egyenlet meghatározatlan "
+TooManyVariables = "Túl sok ismeretlen van"
 NonLinearSystem = "A rendszer nem lineáris"
 Solution = "Megoldás"
 ApproximateSolution = "Hozzávetöleges megoldás"
 SearchInverval = "Keresési intervallum"
 NoSolutionSystem = "A rendszernek nincs megoldása"
 NoSolutionEquation = "Az egyenletnek nincs megoldása"
-NoSolutionInterval = "Nem találtunk megoldást az intervallumban"
-EnterEquation = "Írja be az egyenletet"
-InfiniteNumberOfSolutions = "Végtelen számú megoldás létezik"
-ApproximateSolutionIntervalInstruction0 = "Adja meg a keresés intervallumát"
-ApproximateSolutionIntervalInstruction1 = "egy hozzávetöleges megoldáshoz"
-OnlyFirstSolutionsDisplayed0 = "Csak az elsö 10 megoldás"
-OnlyFirstSolutionsDisplayed1 = "megjelenik"
+NoSolutionInterval = "Nincs megoldás ebben az intervallumban"
+EnterEquation = "Írjon be egy egyenletet"
+InfiniteNumberOfSolutions = "Végtelen menyi megoldások léteznek"
+ApproximateSolutionIntervalInstruction0 = "Irja be a keresés intervallumot"
+ApproximateSolutionIntervalInstruction1 = "amelyikbe egy hozzávetöleges megoldást keressen"
+OnlyFirstSolutionsDisplayed0 = "Csak a 10 elsö megoldások"
+OnlyFirstSolutionsDisplayed1 = "jelennek meg"
 PolynomeHasNoRealSolution0 = "A polinomnak nincs"
 PolynomeHasNoRealSolution1 = "valódi gyökére"
-PredefinedVariablesUsedLeft = "Használt"
-PredefinedVariablesUsedRight = "elöre definiált változók"
-PredefinedVariablesIgnoredLeft = "mellözött"
-PredefinedVariablesIgnoredRight = "elöre definiált változók"
+PredefinedVariablesUsedLeft = "Alkalmazott elöre-"
+PredefinedVariablesUsedRight = "meghatározott változók"
+PredefinedVariablesIgnoredLeft = "Mellözött"
+PredefinedVariablesIgnoredRight = "elöre-meghatározott változók"

apps/statistics/base.en.i18n

@@ -24,4 +24,4 @@ StandardDeviationSigma = "Standard deviation σ"
 SampleStandardDeviationS = "Sample std deviation s"
 SumValues = "Sum of values"
 SumSquareValues = "Sum of squared values"
-InterquartileRange = "Interquartile range"
+InterquartileRange = "Interquartile range"

apps/statistics/base.hu.i18n

@@ -5,21 +5,23 @@ BoxTab = "Doboz"
 Values1 = "V1 értékek"
 Values2 = "V2 értékek"
 Values3 = "V3 értékek"
-Sizes1 = "N1 méret"
-Sizes2 = "N2 méret"
-Sizes3 = "N3 méret"
+Frequencies1 = "N1 Frekvencia"
+Frequencies2 = "N2 Frekvencia"
+Frequencies3 = "N3 Frekvencia"
 ImportList = "Importálás egy listáról"
 Interval = "Intervallum"
-Size = "Méret"
-Frequency = "Frekvencia"
+Frequency = "Frekvencia:"
+RelativeFrequency = "Relatív:"
 HistogramSet = "Hisztogram beállítások"
 RectangleWidth = "Tálca szélessége"
 BarStart = "X kezdet"
 FirstQuartile = "Elsö kvartilis"
 Median = "Medián"
 ThirdQuartile = "Harmadik kvartilis"
-TotalSize = "Teljes méret"
+TotalFrequency = "Adatpontok száma "
 Range = "Intervallum"
 StandardDeviationSigma = "σ szórás"
-SampleStandardDeviationS = "Minta std eltérés s"
+SampleStandardDeviationS = "Minta std eltérés σ"
+SumValues = "Értékek összege"
+SumSquareValues = "Négyzetértékek összege"
 InterquartileRange = "Interkvartilis tartomány"

apps/toolbox.de.i18n

@@ -21,6 +21,7 @@ UnitDistanceMeterNano = "Nanometer"
 UnitDistanceMeterPico = "Pikometer"
 UnitDistanceAstronomicalUnit = "Astronomische Einheit"
 UnitDistanceLightYear = "Lichtjahr"
+UnitDistanceParsec = "Parsec"
 UnitDistanceMile = "Meile"
 UnitDistanceYard = "Yard"
 UnitDistanceFoot = "Fuß"
@@ -109,6 +110,7 @@ Identity = "Einheitsmatrix der Größe n"
 Lists = "Listen"
 HyperbolicTrigonometry = "Hyperbelfunktionen"
 Fluctuation = "Konfidenzintervall"
+InfinityMessage = "Unendlich"
 DerivateNumber = "Ableitung"
 Integral = "Integral"
 Sum = "Summe"

apps/toolbox.en.i18n

@@ -110,6 +110,7 @@ Identity = "Identity matrix of size n"
 Lists = "List"
 HyperbolicTrigonometry = "Hyperbolic trigonometry"
 Fluctuation = "Prediction Interval"
+InfinityMessage = "Infinity"
 DerivateNumber = "Derivative"
 Integral = "Integral"
 Sum = "Sum"

apps/toolbox.es.i18n

@@ -22,6 +22,8 @@ UnitDistanceMeterPico = "Picometer"
 UnitDistanceImperialMenu = "US Customary"
 UnitDistanceAstronomicalUnit = "Astronomical unit"
 UnitDistanceLightYear = "Light year"
+UnitDistanceParsec = "Parsec"
+UnitMassImperialMenu = "US Customary"
 UnitDistanceMile = "Milla"
 UnitDistanceYard = "Yardas"
 UnitDistanceFoot = "Pie"
@@ -108,6 +110,7 @@ Identity = "Matriz identidad de tamaño n"
 Lists = "Listas"
 HyperbolicTrigonometry = "Trigonometría hiperbólica"
 Fluctuation = "Interval de predicción"
+InfinityMessage = "Infinito"
 DerivateNumber = "Derivada"
 Integral = "Integral"
 Sum = "Suma"

apps/toolbox.fr.i18n

@@ -114,6 +114,7 @@ Identity = "Matrice identité de taille n"
 Lists = "Listes"
 HyperbolicTrigonometry = "Trigonométrie hyperbolique"
 Fluctuation = "Intervalle de fluctuation"
+InfinityMessage = "Infini"
 DerivateNumber = "Nombre derivé de f en a"
 Integral = "Intégrale de f sur [a;b]"
 Sum = "Somme"

apps/toolbox.hu.i18n

@@ -27,6 +27,8 @@ UnitDistanceMile = "Mérföld"
 UnitDistanceAstronomicalUnit = "Csillagászati egység"
 UnitDistanceLightYear = "Fény év"
 UnitDistanceParsec = "Parsec"
+UnitMassShortTon = "Rövid tonna"
+UnitMassLongTon = "Hosszú tonna"
 UnitMassImperialMenu = "Angolszász mértékegységek"
 UnitMassPound = "Font"
 UnitMassOunce = "Uncia"
@@ -42,31 +44,19 @@ UnitCurrentAmpere = "Amper"
 UnitCurrentAmpereMilli = "Milliamper"
 UnitCurrentAmpereMicro = "Mikroamper"
 UnitTemperatureMenu = "Hömérséklet"
-UnitTemperatureKelvin = "Kelvin"
 UnitAmountMenu = "Az anyag mennyisége"
 UnitAmountMole = "Mól"
 UnitAmountMoleMilli = "Millimól"
 UnitAmountMoleMicro = "Mikromól"
 UnitLuminousIntensityMenu = "Fényerö"
-UnitLuminousIntensityCandela = "Candela"
 UnitFrequencyMenu = "Frekvencia"
-UnitFrequencyHertzGiga = "Gigahertz"
 UnitFrequencyHertzMega = "Megahertz"
-UnitFrequencyHertzKilo = "Kilohertz"
-UnitFrequencyHertz = "Hertz"
 UnitForceMenu = "Erö"
-UnitForceNewtonKilo = "Kilonewton"
-UnitForceNewton = "Newton"
 UnitForceNewtonMilli = "Millinewton"
 UnitPressureMenu = "Nyomás"
-UnitPressurePascal = "Pascal"
 UnitPressurePascalHecto = "Hectopascal"
-UnitPressureBar = "Bár"
 UnitPressureAtm = "Légkör"
 UnitEnergyMenu = "Energia"
-UnitEnergyJouleMenu = "Joule"
-UnitEnergyJouleKilo = "Kilojoule"
-UnitEnergyJoule = "Joule"
 UnitEnergyJouleMilli = "Millijoule"
 UnitEnergyEletronVoltMenu = "Electronvolt"
 UnitEnergyElectronVoltMega = "Megaelectronvolt"
@@ -74,40 +64,38 @@ UnitEnergyElectronVoltKilo = "Kiloelectronvolt"
 UnitEnergyElectronVolt = "Electronvolt"
 UnitEnergyElectronVoltMilli = "Millielectronvolt"
 UnitPowerMenu = "Teljesítmény"
-UnitPowerWattGiga = "Gigawatt"
 UnitPowerWattMega = "Megawatt"
-UnitPowerWattKilo = "Kilowatt"
-UnitPowerWatt = "Watt"
 UnitPowerWattMilli = "Milliwatt"
 UnitPowerWattMicro = "Microwatt"
 UnitElectricChargeMenu = "Elektromos töltés"
-UnitChargeCoulomb = "Coulomb"
 UnitPotentialMenu = "Elektromos potenciál"
-UnitPotentialVoltKilo = "Kilovolt"
-UnitPotentialVolt = "Volt"
 UnitPotentialVoltMilli = "Millivolt"
 UnitPotentialVoltMicro = "Microvolt"
 UnitCapacitanceMenu = "Elektromos kapacitás"
-UnitCapacitanceFarad = "Farad"
 UnitCapacitanceFaradMilli = "Millifarad"
 UnitCapacitanceFaradMicro = "Microfarad"
 UnitResistanceMenu = "Elektromos ellenállás"
-UnitResistanceOhmKilo = "Kiloohm"
-UnitResistanceOhm = "Ohm"
 UnitConductanceMenu = "Elektromos vezetöképesség"
-UnitConductanceSiemens = "Siemens"
 UnitConductanceSiemensMilli = "Millisiemens"
 UnitMagneticFieldMenu = "Mágneses mezö"
-UnitMagneticFieldTesla = "Tesla"
 InductanceMenu = "Elektromos induktivitás"
-UnitInductanceHenry = "Henry"
 UnitSurfaceMenu = "Terület"
+UnitSurfaceAcre = "Acre"
 UnitSurfaceHectar = "Hektár"
 UnitVolumeMenu = "Kötet"
 UnitVolumeLiter = "Liter"
 UnitVolumeLiterDeci = "Deciliter"
 UnitVolumeLiterCenti = "Centiliter"
 UnitVolumeLiterMilli = "Milliliter"
+UnitVolumeTeaspoon = "Teáskanál"
+UnitVolumeTablespoon = "evőkanál"
+UnitVolumeFluidOunce = "Folyadék uncia"
+UnitVolumeCup = "Kupa"
+UnitVolumePint = "Pint"
+UnitVolumeQuart = "Quart"
+UnitVolumeGallon = "Gallon"
+UnitMetricMenu = "Metrikus"
+UnitImperialMenu = "Birodalmi"
 Toolbox = "Eszköztár"
 AbsoluteValue = "Abszolút érték"
 NthRoot = "n-gyökér"
@@ -122,6 +110,7 @@ Identity = "n méretü azonosító mátrix"
 Lists = "Lista"
 HyperbolicTrigonometry = "Hiperbolikus trigonometria"
 Fluctuation = "Jósolt intervallum"
+InfinityMessage = "Végtelen"
 DerivateNumber = "Származékos"
 Integral = "Integral"
 Sum = "Összeg"
@@ -142,6 +131,12 @@ Determinant = "determináns"
 Transpose = "Átültetés"
 Trace = "Trace"
 Dimension = "Méret"
+RowEchelonForm = "Sor echelon forma"
+ReducedRowEchelonForm = "Csökkentett sorú echelon forma"
+Vectors = "Vektorok"
+Dot = "Pont termék"
+Cross = "Kereszt termék"
+NormVector = "Norm"
 Sort = "Növekvö sorrend"
 InvSort = "Csökkenö rendezés"
 Maximum = "Maximum"

apps/toolbox.it.i18n

@@ -110,6 +110,7 @@ Identity = "Matrice identità di dimensione n"
 Lists = "Elenchi"
 HyperbolicTrigonometry = "Funzioni iperboliche"
 Fluctuation = "Intervallo di previsione"
+InfinityMessage = "Infinito"
 DerivateNumber = "Derivata"
 Integral = "Integrale"
 Sum = "Somma"

apps/toolbox.nl.i18n

@@ -110,6 +110,7 @@ Identity = "Eenheidsmatrix van formaat n"
 Lists = "Lijst"
 HyperbolicTrigonometry = "Hyperbolische functies"
 Fluctuation = "Statistische intervallen"
+InfinityMessage = "Eindeloos"
 DerivateNumber = "Afgeleide"
 Integral = "Integraal"
 Sum = "Som"

apps/toolbox.pt.i18n

@@ -110,6 +110,7 @@ Identity = "Matriz identidade de ordem n"
 Lists = "Listas"
 HyperbolicTrigonometry = "Funções hiperbólicas"
 Fluctuation = "Intervalo de confiança"
+InfinityMessage = "Infinito"
 DerivateNumber = "Derivada"
 Integral = "Integral"
 Sum = "Somatório"

apps/usb/base.hu.i18n

@@ -1,7 +1,7 @@
 USBConnected = "A SZÁMOLÓGÉP CSATLAKOZTATVA VAN"
-ConnectedMessage1 = "Az adatok átviteléhez keresse meg az"
-ConnectedMessage2 = "oldalunkat a számítógépröl"
-ConnectedMessage3 = "workshop.numworks.com"
-ConnectedMessage4 = "Nyomja meg a készülék BACK gombját"
-ConnectedMessage5 = "vagy húzza ki hogy"
-ConnectedMessage6 = "lecsatlakozzon"
+ConnectedMessage1 = ""
+ConnectedMessage2 = "Adat másolásához csatlakozzon"
+ConnectedMessage3 = "fel workshop.numworks.com ra."
+ConnectedMessage4 = "Nyomjon majd a VISSZA gombra"
+ConnectedMessage5 = "vagy huzza ki a kábelt azért"
+ConnectedMessage6 = "hogy a másolás véget érjen."

apps/variables.hu.i18n

@@ -1,10 +1,13 @@
 Variables = "Változók"
 Expressions = "Kifejezések"
-Functions = "Függvények"
-EmptyExpressionBox0 = "Nem határozott meg egyetlen változót sem."
-EmptyFunctionBox0 = "Nem határozott meg egyetlen függvényt sem."
+Functions = "Funciók"
+Sequences = "Szekvenciák"
+EmptyExpressionBox0 = "Nincs meghatározott változó."
+EmptyFunctionBox0 = "Nincs meghatározott funkció."
+EmptySequenceBox0 = "Még nem definiált szekvenciákat."
 EmptyExpressionBox1 = "A változó meghatározásához írja be:"
-EmptyFunctionBox1 = "Függvény meghatározásához írja be:"
-EmptyExpressionBox2 = "A változó neve tartalmazhatja:"
-EmptyFunctionBox2 = "A függvény neve tartalmazhatja:"
+EmptyFunctionBox1 = "Funkció meghatározásához írja be:"
+EmptySequenceBox1 = ""
+EmptyExpressionBox2 = "A változó neve tartalmazhat:"
+EmptyFunctionBox2 = "A funkció neve tartalmazhat:"
 EnableCharacters = "A..Z, a..z, 0..9 és _"

build/config.mak

@@ -5,11 +5,12 @@ DEBUG ?= 0
 
 HOME_DISPLAY_EXTERNALS ?= 1
 EPSILON_VERSION ?= 15.3.1
-OMEGA_VERSION ?= 1.21.0
+OMEGA_VERSION ?= 1.22.1
 # OMEGA_USERNAME ?= N/A
-OMEGA_STATE ?= dev
-EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external
-EPSILON_I18N ?= en fr
+OMEGA_STATE ?= public
+EPSILON_APPS ?= calculation rpn graph code statistics probability solver atomic sequence regression settings external
+SUBMODULES_APPS = atomic rpn
+EPSILON_I18N ?= en fr nl pt it de es hu
 EPSILON_COUNTRIES ?= WW CA DE ES FR GB IT NL PT US
 EPSILON_GETOPT ?= 0
 EPSILON_TELEMETRY ?= 0

build/device/dfu.py

@@ -4,6 +4,8 @@
 # This work is licensed under the MIT license, see the file LICENSE for
 # details.
 
+# This script has been modified by NumWorks contributors
+
 """This module implements enough functionality to program the STM32F4xx over
 DFU, without requiring dfu-util.
 See app note AN3156 for a description of the DFU protocol.

build/device/usb/__init__.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 r"""PyUSB - Easy USB access in Python
 
@@ -33,8 +48,19 @@ import os
 __author__ = 'Wander Lairson Costa'
 
 # Use Semantic Versioning, http://semver.org/
-version_info = (1, 0, 2)
-__version__ = '%d.%d.%d' % version_info
+try:
+    from usb._version import version as __version__
+except ImportError:
+    __version__ = '0.0.0'
+
+def _get_extended_version_info(version):
+    import re
+    m = re.match(r'(\d+)\.(\d+)\.(\d+)[.-]?(.*)', version)
+    major, minor, patch, suffix = m.groups()
+    return int(major), int(minor), int(patch), suffix
+
+extended_version_info = _get_extended_version_info(__version__)
+version_info = extended_version_info[:3]
 
 __all__ = ['legacy', 'control', 'core', 'backend', 'util', 'libloader']
 

build/device/usb/_debug.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 __author__ = 'Wander Lairson Costa'
 

build/device/usb/_interop.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # All the hacks necessary to assure compatibility across all
 # supported versions come here.
@@ -81,5 +96,5 @@ def as_array(data=None):
         # When you pass a unicode string or a character sequence,
         # you get a TypeError if the first parameter does not match
         a = array.array('B')
-        a.fromstring(data) # deprecated since 3.2
+        a.frombytes(data.encode('utf-8'))
         return a

build/device/usb/_lookup.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 r"""usb._lookups - Lookup tables for USB
 """

build/device/usb/_objfinalizer.py

@@ -1,19 +1,34 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import sys
 

build/device/usb/backend/__init__.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 r"""usb.backend - Backend interface.
 
@@ -62,7 +77,7 @@ import usb._objfinalizer as _objfinalizer
 
 __author__ = 'Wander Lairson Costa'
 
-__all__ = ['IBackend', 'libusb01', 'libusb10', 'openusb']
+__all__ = ['IBackend', 'libusb0', 'libusb1', 'openusb']
 
 def _not_implemented(func):
     raise NotImplementedError(func.__name__)
@@ -196,7 +211,7 @@ class IBackend(_objfinalizer.AutoFinalizedObject):
 
         This method should only be called when the interface has more than
         one alternate setting. The dev_handle is the value returned by the
-        open_device() method. intf and altsetting are respectivelly the
+        open_device() method. intf and altsetting are respectively the
         bInterfaceNumber and bAlternateSetting fields of the related interface.
         """
         _not_implemented(self.set_interface_altsetting)
@@ -268,7 +283,7 @@ class IBackend(_objfinalizer.AutoFinalizedObject):
         _not_implemented(self.intr_write)
 
     def intr_read(self, dev_handle, ep, intf, size, timeout):
-        r"""Perform an interrut read.
+        r"""Perform an interrupt read.
 
         dev_handle is the value returned by the open_device() method.
         The ep parameter is the bEndpointAddress field whose endpoint

build/device/usb/backend/libusb0.py

@@ -1,24 +1,40 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from ctypes import *
+import errno
 import os
 import usb.backend
 import usb.util
 import sys
-from usb.core import USBError
+from usb.core import USBError, USBTimeoutError
 from usb._debug import methodtrace
 import usb._interop as _interop
 import logging
@@ -30,6 +46,8 @@ __all__ = ['get_backend']
 
 _logger = logging.getLogger('usb.backend.libusb0')
 
+_USBFS_MAXDRIVERNAME = 255
+
 # usb.h
 
 if sys.platform.find('bsd') != -1 or sys.platform.find('mac') != -1 or \
@@ -350,6 +368,14 @@ def _setup_prototypes(lib):
 
     # linux only
 
+    # int usb_get_driver_np(usb_dev_handle *dev,
+    #                       int interface,
+    #                       char *name,
+    #                       unsigned int namelen);
+    if hasattr(lib, 'usb_get_driver_np'):
+        lib.usb_get_driver_np.argtypes = \
+            [_usb_dev_handle, c_int, c_char_p, c_uint]
+
     # int usb_detach_kernel_driver_np(usb_dev_handle *dev, int interface);
     if hasattr(lib, 'usb_detach_kernel_driver_np'):
         lib.usb_detach_kernel_driver_np.argtypes = [_usb_dev_handle, c_int]
@@ -415,6 +441,9 @@ def _check(ret):
                 errmsg = os.strerror(-ret)
         else:
             return ret
+
+    if ret is not None and -ret == errno.ETIMEDOUT:
+        raise USBTimeoutError(errmsg, ret, -ret)
     raise USBError(errmsg, ret)
 
 def _has_iso_transfer():
@@ -588,8 +617,35 @@ class _LibUSB(usb.backend.IBackend):
     def reset_device(self, dev_handle):
         _check(_lib.usb_reset(dev_handle))
 
+    @methodtrace(_logger)
+    def is_kernel_driver_active(self, dev_handle, intf):
+        if not hasattr(_lib, 'usb_get_driver_np'):
+            raise NotImplementedError(self.is_kernel_driver_active.__name__)
+        from errno import ENODATA
+        buf = usb.util.create_buffer(_USBFS_MAXDRIVERNAME + 1)
+        name, length = buf.buffer_info()
+        length *= buf.itemsize
+        # based on the implementation of libusb_kernel_driver_active
+        # (see libusb/os/linux_usbfs.c @@ op_kernel_driver_active):
+        # usb_get_driver_np fails with ENODATA when no kernel driver is bound,
+        # and if 'usbfs' is bound that means that a userspace program is
+        # controlling the device (e.g. using this very library)
+        try:
+            _check(_lib.usb_get_driver_np(
+                        dev_handle,
+                        intf,
+                        cast(name, c_char_p),
+                        length))
+            return cast(name, c_char_p).value != b'usbfs'
+        except USBError as err:
+            if err.backend_error_code == -ENODATA:
+                return False
+            raise err
+
     @methodtrace(_logger)
     def detach_kernel_driver(self, dev_handle, intf):
+        if not hasattr(_lib, 'usb_detach_kernel_driver_np'):
+            raise NotImplementedError(self.detach_kernel_driver.__name__)
         _check(_lib.usb_detach_kernel_driver_np(dev_handle, intf))
 
     def __write(self, fn, dev_handle, ep, intf, data, timeout):

build/device/usb/backend/libusb1.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from ctypes import *
 import usb.util
@@ -22,14 +37,14 @@ import usb._interop as _interop
 import usb._objfinalizer as _objfinalizer
 import errno
 import math
-from usb.core import USBError
+from usb.core import USBError, USBTimeoutError
 import usb.libloader
 
 __author__ = 'Wander Lairson Costa'
 
 __all__ = [
             'get_backend',
-            'LIBUSB_SUCESS',
+            'LIBUSB_SUCCESS',
             'LIBUSB_ERROR_IO',
             'LIBUSB_ERROR_INVALID_PARAM',
             'LIBUSB_ERROR_ACCESS',
@@ -42,14 +57,14 @@ __all__ = [
             'LIBUSB_ERROR_INTERRUPTED',
             'LIBUSB_ERROR_NO_MEM',
             'LIBUSB_ERROR_NOT_SUPPORTED',
-            'LIBUSB_ERROR_OTHER'
+            'LIBUSB_ERROR_OTHER',
             'LIBUSB_TRANSFER_COMPLETED',
             'LIBUSB_TRANSFER_ERROR',
             'LIBUSB_TRANSFER_TIMED_OUT',
             'LIBUSB_TRANSFER_CANCELLED',
             'LIBUSB_TRANSFER_STALL',
             'LIBUSB_TRANSFER_NO_DEVICE',
-            'LIBUSB_TRANSFER_OVERFLOW'
+            'LIBUSB_TRANSFER_OVERFLOW',
         ]
 
 _logger = logging.getLogger('usb.backend.libusb1')
@@ -256,6 +271,7 @@ def _get_iso_packet_list(transfer):
     return list_type.from_address(addressof(transfer.iso_packet_desc))
 
 _lib = None
+_lib_object = None
 
 def _load_library(find_library=None):
     # Windows backend uses stdcall calling convention
@@ -582,6 +598,8 @@ def _check(ret):
     if ret < 0:
         if ret == LIBUSB_ERROR_NOT_SUPPORTED:
             raise NotImplementedError(_strerror(ret))
+        elif ret == LIBUSB_ERROR_TIMEOUT:
+            raise USBTimeoutError(_strerror(ret), ret, _libusb_errno[ret])
         else:
             raise USBError(_strerror(ret), ret, _libusb_errno[ret])
 
@@ -700,7 +718,8 @@ class _LibUSB(usb.backend.IBackend):
 
     @methodtrace(_logger)
     def _finalize_object(self):
-        self.lib.libusb_exit(self.ctx)
+        if self.ctx:
+            self.lib.libusb_exit(self.ctx)
 
 
     @methodtrace(_logger)
@@ -936,12 +955,13 @@ class _LibUSB(usb.backend.IBackend):
         return transferred.value
 
 def get_backend(find_library=None):
-    global _lib
+    global _lib, _lib_object
     try:
-        if _lib is None:
+        if _lib_object is None:
             _lib = _load_library(find_library=find_library)
             _setup_prototypes(_lib)
-        return _LibUSB(_lib)
+            _lib_object = _LibUSB(_lib)
+        return _lib_object
     except usb.libloader.LibraryException:
         # exception already logged (if any)
         _logger.error('Error loading libusb 1.0 backend', exc_info=False)

build/device/usb/backend/openusb.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from ctypes import *
 import ctypes.util
@@ -24,7 +39,7 @@ import usb._interop as _interop
 import usb._objfinalizer as _objfinalizer
 import usb.util as util
 import usb.libloader
-from usb.core import USBError
+from usb.core import USBError, USBTimeoutError
 
 __author__ = 'Wander Lairson Costa'
 
@@ -458,7 +473,7 @@ def _setup_prototypes(lib):
                 POINTER(_openusb_intr_request)
             ]
 
-    lib.openusb_bulk_xfer.restype = c_int32
+    lib.openusb_intr_xfer.restype = c_int32
 
     # int32_t openusb_bulk_xfer(openusb_dev_handle_t dev,
     #                           uint8_t ifc,
@@ -491,7 +506,11 @@ def _check(ret):
         ret = ret.value
 
     if ret != 0:
-        raise USBError(_lib.openusb_strerror(ret), ret, _openusb_errno[ret])
+        if ret == OPENUSB_IO_TIMEOUT:
+            raise USBTimeoutError(_lib.openusb_strerror(ret), ret, _openusb_errno[ret])
+        else:
+            raise USBError(_lib.openusb_strerror(ret), ret, _openusb_errno[ret])
+
     return ret
 
 class _Context(_objfinalizer.AutoFinalizedObject):
@@ -726,6 +745,7 @@ def get_backend(find_library=None):
             _lib = _load_library(find_library)
             _setup_prototypes(_lib)
             _ctx = _Context()
+        _logger.warning('OpenUSB backend deprecated (https://github.com/pyusb/pyusb/issues/284)')
         return _OpenUSB()
     except usb.libloader.LibraryException:
         # exception already logged (if any)

build/device/usb/control.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 r"""usb.control - USB standard control requests
 
@@ -152,13 +167,18 @@ def get_descriptor(dev, desc_size, desc_type, desc_index, wIndex = 0):
                         util.CTRL_TYPE_STANDARD,
                         util.CTRL_RECIPIENT_DEVICE)
 
-    return dev.ctrl_transfer(
+    desc = dev.ctrl_transfer(
             bmRequestType = bmRequestType,
             bRequest = 0x06,
             wValue = wValue,
             wIndex = wIndex,
             data_or_wLength = desc_size)
 
+    if len(desc) < 2:
+        raise USBError('Invalid descriptor')
+
+    return desc
+
 def set_descriptor(dev, desc, desc_type, desc_index, wIndex = None):
     r"""Update an existing descriptor or add a new one.
 

build/device/usb/core.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 r"""usb.core - Core USB features.
 
@@ -27,8 +42,8 @@ show_devices() - a function to show the devices present.
 
 __author__ = 'Wander Lairson Costa'
 
-__all__ = [ 'Device', 'Configuration', 'Interface', 'Endpoint', 'find',
-            'show_devices' ]
+__all__ = [ 'Device', 'Configuration', 'Interface', 'Endpoint', 'USBError',
+            'USBTimeoutError', 'NoBackendError', 'find', 'show_devices' ]
 
 import usb.util as util
 import copy
@@ -45,10 +60,19 @@ _logger = logging.getLogger('usb.core')
 
 _DEFAULT_TIMEOUT = 1000
 
+_sentinel = object()
+
 def _set_attr(input, output, fields):
     for f in fields:
        setattr(output, f, getattr(input, f))
 
+def _try_getattr(object, name):
+    try:
+        attr = getattr(object, name)
+    except :
+        attr = _sentinel
+    return attr
+
 def _try_get_string(dev, index, langid = None, default_str_i0 = "",
         default_access_error = "Error Accessing String"):
     """ try to get a string, but return a string no matter what
@@ -182,6 +206,8 @@ class _ResourceManager(object):
                 i = util.find_descriptor(cfg, bInterfaceNumber=intf, bAlternateSetting=alt)
             else:
                 i = util.find_descriptor(cfg, bInterfaceNumber=intf)
+            if i is None:
+                raise ValueError('No matching interface (' + str(intf) + ',' + str(alt) + ')')
 
         self.managed_claim_interface(device, i)
 
@@ -270,6 +296,14 @@ class USBError(IOError):
         IOError.__init__(self, errno, strerror)
         self.backend_error_code = error_code
 
+class USBTimeoutError(USBError):
+    r"""Exception class for connection timeout errors.
+
+    Backends must raise this exception when a call on a USB connection returns
+    a timeout error code.
+    """
+    pass
+
 class NoBackendError(ValueError):
     r"Exception class when a valid backend is not found."
     pass
@@ -1247,7 +1281,7 @@ def find(find_all=False, backend = None, custom_match = None, **args):
     def device_iter(**kwargs):
         for dev in backend.enumerate_devices():
             d = Device(dev, backend)
-            tests = (val == getattr(d, key) for key, val in kwargs.items())
+            tests = (val == _try_getattr(d, key) for key, val in kwargs.items())
             if _interop._all(tests) and (custom_match is None or custom_match(d)):
                 yield d
 

build/device/usb/legacy.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import usb.core as core
 import usb.util as util

build/device/usb/libloader.py

@@ -1,19 +1,34 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import ctypes
 import ctypes.util

build/device/usb/util.py

@@ -1,17 +1,32 @@
-# Copyright (C) 2009-2017 Wander Lairson Costa
-# Copyright (C) 2017-2018 Robert Wlodarczyk
+# Copyright 2009-2017 Wander Lairson Costa
+# Copyright 2009-2021 PyUSB contributors
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 r"""usb.util - Utility functions.
 
@@ -286,32 +301,28 @@ def get_string(dev, index, langid = None):
 
     The return value is the unicode string present in the descriptor, or None
     if the requested index was zero.
-
-    It is a ValueError to request a real string (index not zero), if: the
-    device's langid tuple is empty, or with an explicit langid the device does
-    not support.
     """
     if 0 == index:
         return None
 
     from usb.control import get_descriptor
-    langids = dev.langids
 
-    if 0 == len(langids):
-        raise ValueError("The device has no langid")
     if langid is None:
+        langids = dev.langids
+        if 0 == len(langids):
+            raise ValueError("The device has no langid"
+                             " (permission issue, no string descriptors supported or device error)")
         langid = langids[0]
-    elif langid not in langids:
-        raise ValueError("The device does not support the specified langid")
 
     buf = get_descriptor(
                 dev,
-                255, # Maximum descriptor size
+                254, # maximum even length
                 DESC_TYPE_STRING,
                 index,
                 langid
             )
+    blen = buf[0] & 0xfe # should be even, ignore any trailing byte (see #154)
     if hexversion >= 0x03020000:
-        return buf[2:buf[0]].tobytes().decode('utf-16-le')
+        return buf[2:blen].tobytes().decode('utf-16-le')
     else:
-        return buf[2:buf[0]].tostring().decode('utf-16-le')
+        return buf[2:blen].tostring().decode('utf-16-le')

build/platform.simulator.3ds.mak

@@ -1,5 +1,5 @@
 TOOLCHAIN = devkitarm
 EXE = elf
 
-HANDY_TARGETS_EXTENSIONS = 3dsx
+HANDY_TARGETS_EXTENSIONS = 3dsx cia
 

build/targets.device.n0110.mak

@@ -13,7 +13,7 @@ $(BUILD_DIR)/test.external_flash.write.$(EXE): $(BUILD_DIR)/quiz/src/test_ion_ex
 	@echo "        button on the back of your device."
 	$(Q) until $(PYTHON) build/device/dfu.py -l | grep -E "0483:a291|0483:df11" > /dev/null 2>&1; do sleep 2;done
 	$(eval DFU_SLAVE := $(shell $(PYTHON) build/device/dfu.py -l | grep -E "0483:a291|0483:df11"))
-	$(Q) if [[ "$(DFU_SLAVE)" == *"0483:df11"* ]]; \
+	$(Q) if expr "$(DFU_SLAVE)" : ".*0483:df11.*" > /dev/null; \
 	  then \
 	    $(PYTHON) build/device/dfu.py -u $(word 2,$^); \
 	    sleep 2; \

build/targets.simulator.3ds.mak

@@ -1,9 +1,23 @@
 
 %.smdh: ion/src/simulator/3ds/assets/logo.png
 	$(Q) echo "SMDH    $(notdir $@)"
-	$(Q) smdhtool --create "Epsilon" "A Numworks in your 3DS!" "Numworks" ion/src/simulator/3ds/assets/logo.png $@
+	$(Q) smdhtool --create "Epsilon" "A Numworks in your 3DS!" "Numworks" $< $@
 
 $(BUILD_DIR)/%.3dsx: $(BUILD_DIR)/%.elf $(BUILD_DIR)/%.smdh
 	$(Q) echo "3DSX    $(notdir $@)"
 	$(Q) 3dsxtool $< $@ --smdh=$(word 2,$^)
 
+cia_version_tuple := $(subst ., ,$(OMEGA_VERSION))
+
+cia_version_major := $(word 1,$(cia_version_tuple))
+cia_version_minor := $(word 2,$(cia_version_tuple))
+cia_version_micro := $(word 3,$(cia_version_tuple))
+
+
+$(BUILD_DIR)/%.cxi: $(BUILD_DIR)/%.elf ion/src/simulator/3ds/assets/app.rsf ion/src/simulator/3ds/assets/banner.bnr ion/src/simulator/3ds/assets/icon.icn
+	$(Q) echo "CXI     $(notdir $@)"
+	$(Q) makerom -o $@ -rsf ion/src/simulator/3ds/assets/app.rsf -target t -elf $< -icon ion/src/simulator/3ds/assets/icon.icn -banner ion/src/simulator/3ds/assets/banner.bnr -desc app:4
+
+$(BUILD_DIR)/%.cia: $(BUILD_DIR)/%.cxi
+	$(Q) echo "CIA     $(notdir $@)"
+	$(Q) makerom -f cia -o $@ -target t -i $<:0:0

build/targets.simulator.windows.mak

@@ -1,4 +1,4 @@
 PHONY: %_run
-t %_run: $(BUILD_DIR)/%.$(EXE)
+%_run: $(BUILD_DIR)/%.$(EXE)
 	$(call rule_label,EXE)
 	$(Q) ./$^

escher/image/inliner.c

@@ -104,6 +104,12 @@ int main(int argc, char * argv[]) {
   FILE * implementation = fopen(implementationPath, "w");
   generateImplementationFromImage(implementation, lowerSnakeCaseName, camelCaseName, width, height, colorType, rowPointers);
   fclose(implementation);
+  
+  for (int i=0; i<height; i++) {
+    free(rowPointers[i]);
+  }
+  free(rowPointers);
+  png_destroy_read_struct(&png, &info, NULL);
 
   fclose(inputFile);
 }