Quentin Guidée ab8f731515 Fixed some conflicts

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

..

app.cpp

Merge branch 'master' into f7

2019-08-06 17:40:14 +02:00

app.h

Merge branch 'master' into f7

2019-08-06 17:40:14 +02:00

arrow_view.cpp

Remove statically-allocated buffers

2020-01-04 10:31:00 +01:00

arrow_view.h

[escher][apps] Make View using blendRectWithMask without background

2018-05-15 17:24:27 +02:00

battery_test_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

battery_test_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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

code_128b_view.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

code_128b_view.h

[escher/view] setFrame and layoutSubviews can be forced

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

colors_lcd_test_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

colors_lcd_test_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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

dead_pixels_test_controller.cpp

[apps/hardware_test] Centered screen test done at serial number view

2019-07-03 10:30:40 +02:00

dead_pixels_test_controller.h

[apps/hardware_test] Centered screen test done at serial number view

2019-07-03 10:30:40 +02:00

keyboard_model.cpp

[hardware_test] Keyboard test: check only a subset of keys

2019-12-04 11:19:23 +01:00

keyboard_model.h

[hardware_test] Keyboard test: check only a subset of keys

2019-12-04 11:19:23 +01:00

keyboard_test_controller.cpp

[hardware_test] Keyboard test: check only a subset of keys

2019-12-04 11:19:23 +01:00

keyboard_test_controller.h

[hardware test] Use a BankViewController

2018-05-04 17:04:24 +02:00

keyboard_view.cpp

[hardware_test] Keyboard test: check only a subset of keys

2019-12-04 11:19:23 +01:00

keyboard_view.h

[hardware_test] Keyboard test: check only a subset of keys

2019-12-04 11:19:23 +01:00

lcd_data_test_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

lcd_data_test_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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

lcd_timing_test_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

lcd_timing_test_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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

led_test_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

led_test_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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

Makefile

[hardware_test] Keyboard test: check only a subset of keys

2019-12-04 11:19:23 +01:00

pop_up_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

pop_up_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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

serial_number_controller.cpp

[ion] Encode the serial number in Base64

2018-05-04 17:31:41 +02:00

serial_number_controller.h

[hardware test] Use a BankViewController

2018-05-04 17:04:24 +02:00

vblank_test_controller.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

vblank_test_controller.h

[escher/view] setFrame and layoutSubviews can be forced

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