From 2d8d1ad8da503c52fe73ac984005b58e9417b146 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Fri, 29 May 2020 23:12:31 +1000 Subject: [PATCH] Move I2C --- .../{Drivers/FRToSI2C.cpp => BSP/Miniware/I2C_Wrapper.cpp} | 2 +- workspace/TS100/Core/BSP/Miniware/preRTOS.cpp | 2 +- .../TS100/Core/Drivers/{FRToSI2C.hpp => I2C_Wrapper.hpp} | 0 workspace/TS100/Core/Src/main.cpp | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) rename workspace/TS100/Core/{Drivers/FRToSI2C.cpp => BSP/Miniware/I2C_Wrapper.cpp} (95%) rename workspace/TS100/Core/Drivers/{FRToSI2C.hpp => I2C_Wrapper.hpp} (100%) diff --git a/workspace/TS100/Core/Drivers/FRToSI2C.cpp b/workspace/TS100/Core/BSP/Miniware/I2C_Wrapper.cpp similarity index 95% rename from workspace/TS100/Core/Drivers/FRToSI2C.cpp rename to workspace/TS100/Core/BSP/Miniware/I2C_Wrapper.cpp index a562e6fa..f0f1ecdc 100644 --- a/workspace/TS100/Core/Drivers/FRToSI2C.cpp +++ b/workspace/TS100/Core/BSP/Miniware/I2C_Wrapper.cpp @@ -4,8 +4,8 @@ * Created on: 14Apr.,2018 * Author: Ralim */ +#include #include "BSP.h" -#include "FRToSI2C.hpp" #define I2CUSESDMA I2C_HandleTypeDef *FRToSI2C::i2c; SemaphoreHandle_t FRToSI2C::I2CSemaphore; diff --git a/workspace/TS100/Core/BSP/Miniware/preRTOS.cpp b/workspace/TS100/Core/BSP/Miniware/preRTOS.cpp index 107eb6a5..a27078ad 100644 --- a/workspace/TS100/Core/BSP/Miniware/preRTOS.cpp +++ b/workspace/TS100/Core/BSP/Miniware/preRTOS.cpp @@ -5,10 +5,10 @@ * Author: Ralim */ +#include #include "BSP.h" #include "Setup.h" #include "Pins.h" -#include "FRTosI2C.hpp" void preRToSInit() { /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ diff --git a/workspace/TS100/Core/Drivers/FRToSI2C.hpp b/workspace/TS100/Core/Drivers/I2C_Wrapper.hpp similarity index 100% rename from workspace/TS100/Core/Drivers/FRToSI2C.hpp rename to workspace/TS100/Core/Drivers/I2C_Wrapper.hpp diff --git a/workspace/TS100/Core/Src/main.cpp b/workspace/TS100/Core/Src/main.cpp index 539f4a61..eb8b9597 100644 --- a/workspace/TS100/Core/Src/main.cpp +++ b/workspace/TS100/Core/Src/main.cpp @@ -1,5 +1,9 @@ // By Ben V. Brown - V2.0 of the TS100 firmware +/* + * Main.cpp bootstraps the device and then hands over to FreeRTOS and the threads + */ + #include "BSP.h" #include