Merge branch 'develop' into main

ziteh · Nov 13, 2021 · 7c79dd4 · 7c79dd4
2 parents e1cf26a + ec6f073
commit 7c79dd4
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 16 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "libopencm3"]
-	path = libopencm3
+	path = lib/libopencm3
 	url = https://github.com/libopencm3/libopencm3.git
diff --git a/src/main.cc → examples/blink.cc b/src/main.cc → examples/blink.cc
diff --git a/lib/stm32_oop_lib/stm32_oop_lib_gpio.h → include/stm32_oop_lib_gpio.h b/lib/stm32_oop_lib/stm32_oop_lib_gpio.h → include/stm32_oop_lib_gpio.h
diff --git a/...tm32_oop_lib/stm32_oop_lib_gpio_mapping.h → include/stm32_oop_lib_gpio_mapping.h b/...tm32_oop_lib/stm32_oop_lib_gpio_mapping.h → include/stm32_oop_lib_gpio_mapping.h
diff --git a/lib/f103rb_lib.hpp b/lib/f103rb_lib.hpp
diff --git a/libopencm3 → lib/libopencm3 b/libopencm3 → lib/libopencm3
diff --git a/library.json b/library.json
@@ -0,0 +1,17 @@
+{
+  "name": "stm32_oop_lib",
+  "version": "0.2.1",
+  "description": "The basic OOP library of STM32.",
+  "keywords": "STM32, STM32F1xx",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ziteh/stm32-oop-lib"
+  },
+  "authors": {
+    "name": "ZiTe",
+    "email": "[email protected]"
+  },
+  "license": "LGPL-2.1-or-later",
+  "frameworks": "libopencm3",
+  "platforms": "ststm32"
+}
diff --git a/lib/f103rb_adc.cpp → src/f103rb_adc.cpp b/lib/f103rb_adc.cpp → src/f103rb_adc.cpp
diff --git a/lib/f103rb_adc.hpp → src/f103rb_adc.hpp b/lib/f103rb_adc.hpp → src/f103rb_adc.hpp
diff --git a/lib/f103rb_pwm.cpp → src/f103rb_pwm.cpp b/lib/f103rb_pwm.cpp → src/f103rb_pwm.cpp
diff --git a/lib/f103rb_pwm.hpp → src/f103rb_pwm.hpp b/lib/f103rb_pwm.hpp → src/f103rb_pwm.hpp
diff --git a/lib/f103rb_usart.cpp → src/f103rb_usart.cpp b/lib/f103rb_usart.cpp → src/f103rb_usart.cpp
diff --git a/lib/f103rb_usart.hpp → src/f103rb_usart.hpp b/lib/f103rb_usart.hpp → src/f103rb_usart.hpp
diff --git a/lib/stm32_oop_lib/stm32_oop_lib_gpio.cc → src/stm32_oop_lib_gpio.cc b/lib/stm32_oop_lib/stm32_oop_lib_gpio.cc → src/stm32_oop_lib_gpio.cc