Skip to content

Commit 180ed90

Browse files
committed
Merge branch 'main' into develop
2 parents 508b49d + 8a291cc commit 180ed90

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

docs/en/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# **Welcome to the pixl.js project documentation !**
33

4-
The pixl.jx project is a forked version of the original [Pixl.js](http://www.espruino.com/Pixl.js). This fork have Its main focus to simulate Amiibo.
4+
The pixl.jx project is a forked version of the original [Pixl.js](http://www.espruino.com/Pixl.js). The main focus of this fork is to simulate Amiibo.
55

66
This fork is divided in two main sections, Hardware and Firmware
77

@@ -35,11 +35,11 @@ This fork is divided in two main sections, Hardware and Firmware
3535
- [BLE File Transfer APP](04-Using-Firmware.md/#BLE-File-Transfer)
3636
- [Settings APP](04-Using-Firmware.md/#Settings-1)
3737

38-
# Techinical Documentation
38+
# Technical Documentation
3939

4040
- [Bluetooth BLE File Transfer protocol](05+1-ble_protocol.md)
4141
- [AmiiboLink BLE Protocol](05+2-amiibolink_ble.md)
42-
- [video player](05+4-video_player.md) (Retired on Firmware 2.5.2 due to flash size restrictions.)
42+
- [video player](05+4-video_player.md) (Retired on Firmware 2.5.2 due to flash size restrictions)
4343

4444

4545
# Tutorial
@@ -55,8 +55,8 @@ This fork is divided in two main sections, Hardware and Firmware
5555

5656
# **key_retail.bin**
5757

58-
In order to use some features of the firmware you must to provide the «key_retail.bin» file, should be uploaded to the root directory of the device storage before it can be used. You need to provide a legally adquired one, you can use a tool to extract it from your console (3DS or Switch).
58+
In order to use some features of the firmware you must to provide the «key_retail.bin» file. It should be uploaded to the root directory of the device storage before it can be used. You need to provide a legally acquired one, you can use a tool to extract it from your console (3DS or Switch).
5959

6060
>**key_retail.bin checksums:** <br/>
6161
>MD5: 45fd53569f5765eef9c337bd5172f937 <br/>
62-
>SHA1: bbdbb49a917d14f7a997d327ba40d40c39e606ce<br/>
62+
>SHA1: bbdbb49a917d14f7a997d327ba40d40c39e606ce<br/>

fw/application/src/main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ int main(void) {
277277

278278
NRF_LOG_DEBUG("init done");
279279

280+
if (p_settings->language >= LANGUAGE_COUNT) {
281+
p_settings->language = LANGUAGE_EN_US;
282+
}
280283
setLanguage(p_settings->language);
281284

282285
mui_t *p_mui = mui();

0 commit comments

Comments
 (0)