Quentin Guidée 31cdd5bcc8 Fixed some conflicts

2020-02-12 18:24:13 +01:00

..

keyboard

[escher/text_area] Select up/down

2020-02-12 15:13:17 +01:00

unicode

Fixed some conflicts

2020-02-12 17:42:58 +01:00

backlight.h

Simplified code

2019-12-08 18:18:28 +01:00

battery.h

[ion/battery] Battery level has some hysteresis

2020-02-12 15:13:15 +01:00

console.h

[ion] Fix USART communication: wait for transmission done in writeLine

2019-03-22 17:58:42 +01:00

display.h

[apps/ion] Factorize code and TODO

2019-08-07 11:15:28 +02:00

events.h

Fixed some conflicts

2020-02-12 18:24:13 +01:00

exam_mode.h

[ion] Change exam mode to have 3 states (off, standard, Dutch)

2019-12-19 15:52:45 +01:00

keyboard.h

[ion] Keyboard: change keys name to more explicit ones

2019-04-12 16:56:57 +02:00

led.h

[apps][ion] Handle LED color concurrency between exam mode and charging

2019-04-11 16:10:33 +02:00

power.h

[ion] Power: fix names; Power key actually refers to OnOff key (to avoid

2019-04-12 16:56:57 +02:00

storage.h

[poincare/parser] Identifier is not already function -> symbol

2020-02-12 15:13:21 +01:00

timing.h

[ion/display] Add timeout in waitForVBlank

2019-05-22 16:49:15 +02:00

usb.h

[usb] Clear interrupt on "false" ENUMDNE

2018-04-16 10:48:11 +02:00