Got build working

Author: jmailloux

CanHacker.cpp

@@ -16,56 +16,6 @@ const char hex_asc_upper[] = "0123456789ABCDEF";
 #define hex_asc_upper_lo(x)    hex_asc_upper[((x) & 0x0F)]
 #define hex_asc_upper_hi(x)    hex_asc_upper[((x) & 0xF0) >> 4]
 
-#ifdef STM_DRIVER
-/**
-* @brief System Clock Configuration (Generated from Cube MX.  Project stored in can_multi_tool_board.ioc)
-* @retval None
-*
-* External clock is 8MHz. Core runs at 96MHz.  CAN peripheral at 48MHz.
-*/
-extern "C" void SystemClock_Config(void)
-{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
-
-  /** Configure the main internal regulator output voltage
-  */
-  __HAL_RCC_PWR_CLK_ENABLE();
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
-
-  /** Initializes the RCC Oscillators according to the specified parameters
-  * in the RCC_OscInitTypeDef structure.
-  */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
-  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
-  RCC_OscInitStruct.PLL.PLLM = 4;
-  RCC_OscInitStruct.PLL.PLLN = 96;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
-  RCC_OscInitStruct.PLL.PLLQ = 4;
-  RCC_OscInitStruct.PLL.PLLR = 2;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Initializes the CPU, AHB and APB buses clocks
-  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3) != HAL_OK)
-  {
-    Error_Handler();
-  }
-}
-#endif
-
 static inline void put_hex_byte(char *buf, __u8 byte)
 {
     buf[0] = hex_asc_upper_hi(byte);
@@ -103,7 +53,7 @@ CanHacker::CanHacker(Stream *stream, Stream *debugStream, uint8_t cs, const uint
     #endif /* STM_DRIVER */
 
 
-    can_instance->begin(); 
+    can_instance->begin();
 
 }
 
@@ -124,7 +74,7 @@ void CanHacker::setClock(BASE_CAN::CAN_CLOCK clock){
 }
 
 CanHacker::ERROR CanHacker::connectCan() {
-    can_instance->connectCan(); 
+    can_instance->connectCan();
 
     ERROR error = (ERROR)can_instance->getError();
 

can_driver_config.h

@@ -1,11 +1,11 @@
 #ifndef CAN_DRIVER_CONFIG_H
 #define CAN_DRIVER_CONFIG_H
 
-// Comment out the driver that is not being used 
+// Comment out the driver that is not being used
 
 #if !defined(MCP_DRIVER) || !defined(STM_DRIVER)
-#define MCP_DRIVER 1
-//#define STM_DRIVER 1
+//#define MCP_DRIVER 1
+#define STM_DRIVER 1
 #endif // MCP_DRIVER) || STM_DRIVER
 
 #endif /* CAN_DRIVER_CONFIG_H */