Merge remote-tracking branch 'ohwr/orson_sw_mcattin_rebased' into mcattin_sw_dev
Conflicts: sw/common/gfx/gfx.c sw/common/gfx/gfx.h
Showing
sw/bitmaps/battery.h
deleted
100644 → 0
sw/bitmaps/bitmaps.c
0 → 100644
sw/bitmaps/bitmaps.h
0 → 100644
sw/bitmaps/example_icon.bmp
0 → 100644
842 Bytes
sw/common/drivers/buzzer.c
0 → 100644
sw/common/drivers/buzzer.h
0 → 100644
sw/common/drivers/dmactrl.c
0 → 100644
sw/common/drivers/lcd_dma.c
0 → 100644
sw/common/drivers/lcd_dma.h
0 → 100644
sw/common/drivers/vibra.c
0 → 100644
sw/common/udelay.c
deleted
100644 → 0
sw/freertos/src/state.c
0 → 100644
sw/freertos/src/state.h
0 → 100644