From 1394bcf7f30993f0eecc439be97400446440bc61 Mon Sep 17 00:00:00 2001 From: Jan-Henrik Bruhn Date: Sat, 7 Sep 2019 21:47:43 +0200 Subject: [PATCH] Add U8G2 to midi2cv. Start port to stm32f373 --- midi2cv/bootloader/bootloader.cc | 2 +- midi2cv/drivers/display.cc | 4 ++-- midi2cv/drivers/display.h | 2 +- midi2cv/drivers/gpio.cc | 2 +- midi2cv/drivers/gpio.h | 2 +- midi2cv/makefile | 10 ++++------ midi2cv/midi2cv.cc | 2 +- stmlib | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/midi2cv/bootloader/bootloader.cc b/midi2cv/bootloader/bootloader.cc index 50e4d62..c560bb3 100644 --- a/midi2cv/bootloader/bootloader.cc +++ b/midi2cv/bootloader/bootloader.cc @@ -1,4 +1,4 @@ -#include +#include #include "stmlib/system/bootloader_utils.h" diff --git a/midi2cv/drivers/display.cc b/midi2cv/drivers/display.cc index 96d319f..a719b7b 100644 --- a/midi2cv/drivers/display.cc +++ b/midi2cv/drivers/display.cc @@ -1,7 +1,7 @@ #include "display.h" #include "gpio.h" -#include - +#include +#include // SH1106 command definitions #define SH1106_CMD_SETMUX (uint8_t)0xA8 // Set multiplex ratio (N, number of lines active on display) #define SH1106_CMD_SETOFFS (uint8_t)0xD3 // Set display offset diff --git a/midi2cv/drivers/display.h b/midi2cv/drivers/display.h index a622cb3..717e389 100644 --- a/midi2cv/drivers/display.h +++ b/midi2cv/drivers/display.h @@ -1,7 +1,7 @@ #ifndef MIDI2CV_DRIVERS_DISPLAY_H #define MIDI2CV_DRIVERS_DISPLAY_H -#include +#include #include "stmlib/stmlib.h" #define DISPLAY_WIDTH 128 diff --git a/midi2cv/drivers/gpio.cc b/midi2cv/drivers/gpio.cc index 4f868b1..37505bf 100644 --- a/midi2cv/drivers/gpio.cc +++ b/midi2cv/drivers/gpio.cc @@ -1,6 +1,6 @@ #include "gpio.h" -#include +#include void GPIO::Init() { diff --git a/midi2cv/drivers/gpio.h b/midi2cv/drivers/gpio.h index 8931e27..a890880 100644 --- a/midi2cv/drivers/gpio.h +++ b/midi2cv/drivers/gpio.h @@ -3,7 +3,7 @@ #include "stmlib/stmlib.h" -#include +#include #define PORT_RST_OLED GPIOB #define PIN_RST_OLED GPIO_Pin_0 diff --git a/midi2cv/makefile b/midi2cv/makefile index 6cd197f..40ab8da 100644 --- a/midi2cv/makefile +++ b/midi2cv/makefile @@ -27,12 +27,10 @@ F_CRYSTAL = 8000000L F_CPU = 72000000L SYSCLOCK = SYSCLK_FREQ_72MHz -FAMILY = f10x -DENSITY = md -MEMORY_MODE = flash +FAMILY = f37x # USB = enabled - -APPLICATION_SMALL = TRUE +U8G2 = enabled +APPLICATION_LARGE = TRUE BOOTLOADER = midi2cv_bootloader # Preferred upload command @@ -43,7 +41,7 @@ TARGET = midi2cv PACKAGES = midi2cv \ midi2cv/drivers \ stmlib/utils \ - stmlib/system + stmlib/system RESOURCES = midi2cv/resources TOOLCHAIN_PATH ?= /usr/local/arm-4.8.3/ diff --git a/midi2cv/midi2cv.cc b/midi2cv/midi2cv.cc index 86adcbc..1265a20 100644 --- a/midi2cv/midi2cv.cc +++ b/midi2cv/midi2cv.cc @@ -1,4 +1,4 @@ -#include +#include #include "drivers/display.h" #include "drivers/gpio.h" diff --git a/stmlib b/stmlib index 448babb..5a5264d 160000 --- a/stmlib +++ b/stmlib @@ -1 +1 @@ -Subproject commit 448babb082dfe7b0a1ffbf0b349eefde64691b49 +Subproject commit 5a5264d54062915a60a4ed83e67c329e187e8e0c