From ea7661ff8adf45f2896a34d06b9f2ed08480546a Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Wed, 9 Sep 2020 22:44:16 +0200
Subject: [PATCH] fix(spi): adapt to new SDK 0.2.1-12
---
epicardium/modules/hardware.c | 11 +++++------
lib/card10/card10.c | 9 +++++----
lib/gfx/GUI_DEV/DEV_Config.c | 9 +++++----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/epicardium/modules/hardware.c b/epicardium/modules/hardware.c
index cda6a09a2..10b85356e 100644
--- a/epicardium/modules/hardware.c
+++ b/epicardium/modules/hardware.c
@@ -96,12 +96,11 @@ int hardware_early_init(void)
/*
* SPI for ECG
*/
- const sys_cfg_spi_t spi17y_master_cfg = {
- .map = MAP_A,
- .ss0 = Enable,
- .ss1 = Disable,
- .ss2 = Disable,
- };
+ const sys_cfg_spi_t spi17y_master_cfg = { .map = MAP_A,
+ .ss0 = Enable,
+ .ss1 = Disable,
+ .ss2 = Disable,
+ .num_io = 2 };
if (SPI_Init(SPI0, 0, SPI_SPEED, spi17y_master_cfg) != 0) {
LOG_ERR("init", "Error configuring SPI");
diff --git a/lib/card10/card10.c b/lib/card10/card10.c
index 5eeb26005..e3d647693 100644
--- a/lib/card10/card10.c
+++ b/lib/card10/card10.c
@@ -75,10 +75,11 @@ void card10_init(void)
// Enable SPI
sys_cfg_spi_t spi17y_master_cfg;
- spi17y_master_cfg.map = MAP_A;
- spi17y_master_cfg.ss0 = Enable;
- spi17y_master_cfg.ss1 = Disable;
- spi17y_master_cfg.ss2 = Disable;
+ spi17y_master_cfg.map = MAP_A;
+ spi17y_master_cfg.ss0 = Enable;
+ spi17y_master_cfg.ss1 = Disable;
+ spi17y_master_cfg.ss2 = Disable;
+ spi17y_master_cfg.num_io = 2;
if (SPI_Init(SPI0, 0, SPI_SPEED, spi17y_master_cfg) != 0) {
printf("Error configuring SPI\n");
while (1)
diff --git a/lib/gfx/GUI_DEV/DEV_Config.c b/lib/gfx/GUI_DEV/DEV_Config.c
index bd2475e49..67c73a142 100644
--- a/lib/gfx/GUI_DEV/DEV_Config.c
+++ b/lib/gfx/GUI_DEV/DEV_Config.c
@@ -51,10 +51,11 @@ void lcd_write(uint8_t *data, int size)
{
sys_cfg_spi_t spi17y_master_cfg;
- spi17y_master_cfg.map = MAP_A;
- spi17y_master_cfg.ss0 = Enable;
- spi17y_master_cfg.ss1 = Disable;
- spi17y_master_cfg.ss2 = Disable;
+ spi17y_master_cfg.map = MAP_A;
+ spi17y_master_cfg.ss0 = Enable;
+ spi17y_master_cfg.ss1 = Disable;
+ spi17y_master_cfg.ss2 = Disable;
+ spi17y_master_cfg.num_io = 2;
if (SPI_Init(SPI2, 0, SPI_SPEED, spi17y_master_cfg) != 0) {
printf("Error configuring SPI\n");
while (1)
--
GitLab