Commit Graph

4289 Commits

Author SHA1 Message Date
Quentin Guidée
fd02d153db O1.18 Merge 2019-12-28 14:45:48 +01:00
Quentin Guidée
083862dc2a Fix conflicts 2019-12-27 23:36:07 +01:00
Quentin Guidée
4da34b7d81 Fix conflicts 2019-12-27 23:30:25 +01:00
Quentin Guidée
c87c5b63e3 Fix conflicts 2019-12-27 23:22:23 +01:00
M4x1m3
b8ae0f625d [settings/math] Changed from "Multiply symbol" to "Multiply", fixed #109. 2019-12-27 20:54:50 +01:00
M4x1m3
76a6678a29 [settings/about] MicroPython -> µPython, fixes offset of the version. 2019-12-27 20:36:59 +01:00
M4x1m3
3a4ffa9fb9 [settings/about] MicroPython version from mpconfig.h 2019-12-27 20:31:41 +01:00
M4x1m3
765e648d2b Added missing names, added usernames, closes #89 2019-12-27 19:44:48 +01:00
M4x1m3
9a9ae068ef Reworked exam mode, fixed #106 2019-12-27 16:48:45 +01:00
Quentin Guidée
160adf6bab Fix compilation errors on n0110 2019-12-25 14:40:57 +01:00
Quentin Guidée
57f2b41c3f Fix: OMEGA not displayed on the home screen 2019-12-25 14:37:08 +01:00
Quentin Guidée
be8085eaf8 Updated submodules 2019-12-24 17:23:55 +01:00
Quentin Guidée
d030e5959e Merge branch 'pr/104' into omega-dev 2019-12-24 17:00:06 +01:00
M4x1m3
dd16c9336c Merge branch 'omega-dev' of https://github.com/Omega-Numworks/Omega into omega-dev 2019-12-24 13:47:21 +01:00
Damien Nicolet
26dcc7c546 Disable "External" in Dutch exam mode 2019-12-24 13:28:13 +01:00
Quentin Guidée
004551d6b7 [EXPERIMENTAL] Upstream merged with Omega 2019-12-24 01:20:28 +01:00
Quentin Guidée
a159d80b1c Resolved conflicts 2019-12-24 01:07:22 +01:00
M4x1m3
53c7dfee8a [build] added print-*, made it work 2019-12-22 17:13:28 +01:00
Émilie Feral
053fb935e3 [apps] Change color of LED in power on self test: blue is too easily
confused with white
2019-12-20 14:04:56 +01:00
Damien Nicolet
fe11d6e354 Block external files in exam mode 2019-12-19 20:17:16 +01:00
Émilie Feral
e13425d231 [apps] Add comment about LED color in Dutch exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
902cc64d32 [apps] GlobalPreferences: add an assertion to ensure the the fetched
exam mode can be casted in GlobalPreferences::ExamMode
2019-12-19 15:52:45 +01:00
Émilie Feral
425f0cb459 [apps] GlobalPreferences: remove useless assertion 2019-12-19 15:52:45 +01:00
Émilie Feral
96c63bd4a5 [apps][ion] Yellow LED is equivalent to Dutch exam mode, do not update
the LED color (with plugging/charging events) if the displayed color was Red or Yellow
2019-12-19 15:52:45 +01:00
Émilie Feral
01ab6b5aeb [build] Fix test.elf build 2019-12-19 15:52:45 +01:00
Émilie Feral
2ccdc2d0dc [apps] Fix messages regarding Dutch exam mode in non-English languages 2019-12-19 15:52:45 +01:00
Émilie Feral
f5e7c016e8 [apps] GlobalPreferences: avoid multiple calls to examMode() 2019-12-19 15:52:45 +01:00
Émilie Feral
7fc730597c [apps] Fix exam mode messages 2019-12-19 15:52:45 +01:00
Émilie Feral
8c6a2836de [settings] Fix row initialization in sub menus 2019-12-19 15:52:45 +01:00
Émilie Feral
a3774fb510 [settings] Exam mode: reactivate the current exam mode (stick to Dutch
exam mode if it is already on)
2019-12-19 15:52:45 +01:00
Émilie Feral
de34c0b8db [apps] Change pop-up message for Dutch exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
6ecfe9c5db [apps] Two exam modes in settings: Standard & Dutch 2019-12-19 15:52:45 +01:00
Émilie Feral
6cd98a3a48 [apps] AppsContainer::activateExamMode can make the LED blink in orange
or red according to the chosen exam mode
2019-12-19 15:52:45 +01:00
Émilie Feral
49d2a248da [settings] Fix messages for Dutch exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
5491dee5ce [calculation][solver] Do not display exact solutions in Dutch exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
da735b93a4 [apps] GlobalPreferences: change exam mode API 2019-12-19 15:52:45 +01:00
Émilie Feral
82fb00689e [apps/settings] Message: add messages to activate Dutch exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
510151c7db [apps/home] Prevent from entering Python application in exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
6a7ca32630 [apps/home] Add messages: ForbidenAppInExamMode 2019-12-19 15:52:45 +01:00
Damien Nicolet
8583ddafca External application, API v2 2019-12-19 00:31:23 +01:00
Quentin Guidée
6a55305d52 Merge remote-tracking branch 'upstream/master' into omega-dev 2019-12-15 14:18:36 +01:00
Quentin Guidée
9e6029e52f Merge branch 'omega-extapp' of https://github.com/zardam/epsilon into zardam-omega-extapp 2019-12-15 13:19:08 +01:00
M4x1m3
e347dd5616 [preferences/exam] Allowed reactivation of exam mode
Settings are not modifiable when reactiving exam mode.
Decided to do it like that for consistency with the TI-Nspire CAS models.
Should be ok with exam mode specs (at least for france).
2019-12-15 10:32:43 +01:00
M4x1m3
ef8cd53cec [apps/title bar] Added indicator for symbolic calculation in exam mode. 2019-12-15 09:26:07 +01:00
M4x1m3
6499d77283 Merge branch 'omega-dev' of https://github.com/M4xi1m3/Omega into omega-dev 2019-12-15 08:58:18 +01:00
M4x1m3
3b038617db Merge branch 'omega-dev' of https://github.com/Omega-Numworks/Omega into omega-dev 2019-12-15 08:57:49 +01:00
M4x1m3
5ae425f104 [apps/settings] Fixed compilation error
Co-Authored-By: Quentin <quentin.guidee@gmail.com>
2019-12-14 15:51:12 +01:00
Damien Nicolet
472929c028 External API for KhiCAS 2019-12-13 01:02:14 +01:00
Damien Nicolet
2700098c08 External application launcher app 2019-12-13 01:02:14 +01:00
Damien Nicolet
f763563834 Memory optimisation 2019-12-13 01:02:14 +01:00