Merge pull request #105 from defproceng/develop-linux

Allow compilation on Ubuntu
TheThingsIndustries · Jan 28, 2021 · 6b94ba5 · 6b94ba5
2 parents 967d3b2 + abd7d7d
commit 6b94ba5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Software/app/basic/stm32wlxx_it.c b/Software/app/basic/stm32wlxx_it.c
@@ -22,7 +22,7 @@
 /* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "GNSE_BSP.h"
+#include "GNSE_bsp.h"
 #include "stm32wlxx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */

diff --git a/Software/app/basic_bootloader/stm32wlxx_it.c b/Software/app/basic_bootloader/stm32wlxx_it.c
@@ -22,7 +22,7 @@
 /* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "GNSE_BSP.h"
+#include "GNSE_bsp.h"
 #include "stm32wlxx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */

diff --git a/Software/app/basic_freertos/stm32wlxx_it.c b/Software/app/basic_freertos/stm32wlxx_it.c
@@ -19,7 +19,7 @@
   ******************************************************************************
   */
 
-#include "GNSE_BSP.h"
+#include "GNSE_bsp.h"
 #include "stm32wlxx_it.h"
 
 extern TIM_HandleTypeDef htim17;

diff --git a/Software/cross.cmake b/Software/cross.cmake
@@ -14,6 +14,7 @@
 #-----------------------------
 # Important: TOOLCHAIN_PREFIX must be configured as it's system and user dependant
 # MAC OSX and Linux Example -> set(TOOLCHAIN_PREFIX "/Users/USER/opt/gcc-arm-none-eabi-9-2020-q2-update/")
+# Ubuntu install from 'sudo apt install gcc-arm-none-eabi' -> set(TOOLCHAIN_PREFIX "/usr")
 # Windows Example -> set(TOOLCHAIN_PREFIX "C:/Program Files (x86)/GNU Tools ARM Embedded/9 2020-q2-update/")
 # Docker Example -> set(TOOLCHAIN_PREFIX "/toolchain/gcc-arm-none-eabi-9-2020-q2-update/")
 

diff --git a/Software/lib/SHTC3/sensirion_hw_i2c_implementation.c b/Software/lib/SHTC3/sensirion_hw_i2c_implementation.c
@@ -31,7 +31,7 @@
 
 #include "stm32wlxx_hal.h"
 #include "sensirion_i2c.h"
-#include "GNSE_BSP.h"
+#include "GNSE_bsp.h"
 
 /**
  * Initialize all hard- and software components that are needed for the I2C