Add U8G2 to midi2cv. Start port to stm32f373

This commit is contained in:
Jan-Henrik 2019-09-07 21:47:43 +02:00
parent 4b4a80d813
commit 1394bcf7f3
8 changed files with 12 additions and 14 deletions

View file

@ -1,4 +1,4 @@
#include <stm32f10x_conf.h> #include <stm32f37x_conf.h>
#include "stmlib/system/bootloader_utils.h" #include "stmlib/system/bootloader_utils.h"

View file

@ -1,7 +1,7 @@
#include "display.h" #include "display.h"
#include "gpio.h" #include "gpio.h"
#include <stm32f10x_conf.h> #include <stm32f37x_conf.h>
#include <u8g2.h>
// SH1106 command definitions // SH1106 command definitions
#define SH1106_CMD_SETMUX (uint8_t)0xA8 // Set multiplex ratio (N, number of lines active on display) #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 #define SH1106_CMD_SETOFFS (uint8_t)0xD3 // Set display offset

View file

@ -1,7 +1,7 @@
#ifndef MIDI2CV_DRIVERS_DISPLAY_H #ifndef MIDI2CV_DRIVERS_DISPLAY_H
#define MIDI2CV_DRIVERS_DISPLAY_H #define MIDI2CV_DRIVERS_DISPLAY_H
#include <stm32f10x_conf.h> #include <stm32f37x_conf.h>
#include "stmlib/stmlib.h" #include "stmlib/stmlib.h"
#define DISPLAY_WIDTH 128 #define DISPLAY_WIDTH 128

View file

@ -1,6 +1,6 @@
#include "gpio.h" #include "gpio.h"
#include <stm32f10x_conf.h> #include <stm32f37x_conf.h>
void GPIO::Init() { void GPIO::Init() {

View file

@ -3,7 +3,7 @@
#include "stmlib/stmlib.h" #include "stmlib/stmlib.h"
#include <stm32f10x_conf.h> #include <stm32f37x_conf.h>
#define PORT_RST_OLED GPIOB #define PORT_RST_OLED GPIOB
#define PIN_RST_OLED GPIO_Pin_0 #define PIN_RST_OLED GPIO_Pin_0

View file

@ -27,12 +27,10 @@
F_CRYSTAL = 8000000L F_CRYSTAL = 8000000L
F_CPU = 72000000L F_CPU = 72000000L
SYSCLOCK = SYSCLK_FREQ_72MHz SYSCLOCK = SYSCLK_FREQ_72MHz
FAMILY = f10x FAMILY = f37x
DENSITY = md
MEMORY_MODE = flash
# USB = enabled # USB = enabled
U8G2 = enabled
APPLICATION_SMALL = TRUE APPLICATION_LARGE = TRUE
BOOTLOADER = midi2cv_bootloader BOOTLOADER = midi2cv_bootloader
# Preferred upload command # Preferred upload command
@ -43,7 +41,7 @@ TARGET = midi2cv
PACKAGES = midi2cv \ PACKAGES = midi2cv \
midi2cv/drivers \ midi2cv/drivers \
stmlib/utils \ stmlib/utils \
stmlib/system stmlib/system
RESOURCES = midi2cv/resources RESOURCES = midi2cv/resources
TOOLCHAIN_PATH ?= /usr/local/arm-4.8.3/ TOOLCHAIN_PATH ?= /usr/local/arm-4.8.3/

View file

@ -1,4 +1,4 @@
#include <stm32f10x_conf.h> #include <stm32f37x_conf.h>
#include "drivers/display.h" #include "drivers/display.h"
#include "drivers/gpio.h" #include "drivers/gpio.h"

2
stmlib

@ -1 +1 @@
Subproject commit 448babb082dfe7b0a1ffbf0b349eefde64691b49 Subproject commit 5a5264d54062915a60a4ed83e67c329e187e8e0c