small fixes after previous merge

stevstrong · Feb 28, 2024 · 04fd971 · 04fd971
1 parent caee306
commit 04fd971
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/STM32F1/cores/maple/libmaple/series/rcc.h b/STM32F1/cores/maple/libmaple/series/rcc.h
@@ -439,6 +439,7 @@ typedef enum rcc_clk_id {
     RCC_TIMER12,
     RCC_TIMER13,
     RCC_TIMER14,
+    RCC_CAN,
 } rcc_clk_id;
 
 /**

diff --git a/STM32F1/variants/generic_stm32f103c/board/board.h b/STM32F1/variants/generic_stm32f103c/board/board.h
@@ -63,7 +63,6 @@
 #define BOARD_SPI2_MISO_PIN       PB14
 #define BOARD_SPI2_SCK_PIN        PB13
 
-#define BOARD_NR_GPIO_PINS        35
 #define BOARD_NR_PWM_PINS         16
 #define BOARD_NR_ADC_PINS          9
 #define BOARD_NR_USED_PINS         4

diff --git a/STM32F1/variants/generic_stm32f103c/wirish/boards.cpp b/STM32F1/variants/generic_stm32f103c/wirish/boards.cpp
@@ -218,5 +218,3 @@ void timer_default_config(timer_dev *dev)
     timer_generate_update(dev);
     timer_resume(dev);
 }
-
-#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,5 +218,3 @@ void timer_default_config(timer_dev *dev) @@
         timer_generate_update(dev);
         timer_resume(dev);
     }
-    #endif