pw_spi: rename pw_spi_stm32f429i_disc1_stm32cube
//pw_spi_stm32f429i_disc1_stm32cube is not board specific
nor coupled to any STM32 CPU. It uses only HAL API calls
so renaming to pw_spi_stm32cube.
Change-Id: I7bf6277602bbc32a0a44cf8a507de707b4cf2c85
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/125831
Commit-Queue: Chris Mumford <cmumford@google.com>
Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
diff --git a/applications/app_common_impl/BUILD.gn b/applications/app_common_impl/BUILD.gn
index bc93b41..83015f3 100644
--- a/applications/app_common_impl/BUILD.gn
+++ b/applications/app_common_impl/BUILD.gn
@@ -92,7 +92,7 @@
"$dir_pw_digital_io_stm32cube",
"$dir_pw_display",
"$dir_pw_display_driver_ili9341",
- "$dir_pw_spi_stm32f429i_disc1_stm32cube",
+ "$dir_pw_spi_stm32cube",
"$dir_pw_sync:borrow",
"$dir_pw_sync:mutex",
"//applications/app_common:app_common.facade",
diff --git a/applications/app_common_impl/common_stm32cube.cc b/applications/app_common_impl/common_stm32cube.cc
index 5ef7e96..873ecee 100644
--- a/applications/app_common_impl/common_stm32cube.cc
+++ b/applications/app_common_impl/common_stm32cube.cc
@@ -16,8 +16,8 @@
#include "app_common/common.h"
#include "pw_digital_io_stm32cube/digital_io.h"
#include "pw_display_driver_ili9341/display_driver.h"
-#include "pw_spi_stm32f429i_disc1_stm32cube/chip_selector.h"
-#include "pw_spi_stm32f429i_disc1_stm32cube/initiator.h"
+#include "pw_spi_stm32cube/chip_selector.h"
+#include "pw_spi_stm32cube/initiator.h"
#include "pw_sync/borrow.h"
#include "pw_sync/mutex.h"
diff --git a/build_overrides/pigweed.gni b/build_overrides/pigweed.gni
index a3fb12e..3a5900c 100644
--- a/build_overrides/pigweed.gni
+++ b/build_overrides/pigweed.gni
@@ -85,10 +85,8 @@
get_path_info("$dir_pigweed_experimental/pw_spi_arduino", "abspath")
dir_pw_spi_pico =
get_path_info("$dir_pigweed_experimental/pw_spi_pico", "abspath")
- dir_pw_spi_stm32f429i_disc1_stm32cube =
- get_path_info(
- "$dir_pigweed_experimental/pw_spi_stm32f429i_disc1_stm32cube",
- "abspath")
+ dir_pw_spi_stm32cube =
+ get_path_info("$dir_pigweed_experimental/pw_spi_stm32cube", "abspath")
dir_pw_spin_delay =
get_path_info("$dir_pigweed_experimental/pw_spin_delay", "abspath")
dir_pw_spin_delay_arduino =
diff --git a/pw_spi_stm32f429i_disc1_stm32cube/BUILD.gn b/pw_spi_stm32cube/BUILD.gn
similarity index 86%
rename from pw_spi_stm32f429i_disc1_stm32cube/BUILD.gn
rename to pw_spi_stm32cube/BUILD.gn
index 0994580..5b489d6 100644
--- a/pw_spi_stm32f429i_disc1_stm32cube/BUILD.gn
+++ b/pw_spi_stm32cube/BUILD.gn
@@ -21,11 +21,11 @@
include_dirs = [ "public" ]
}
-pw_source_set("pw_spi_stm32f429i_disc1_stm32cube") {
+pw_source_set("pw_spi_stm32cube") {
public_configs = [ ":default_config" ]
public = [
- "public/pw_spi_stm32f429i_disc1_stm32cube/chip_selector.h",
- "public/pw_spi_stm32f429i_disc1_stm32cube/initiator.h",
+ "public/pw_spi_stm32cube/chip_selector.h",
+ "public/pw_spi_stm32cube/initiator.h",
]
public_deps = [ "$dir_pw_status" ]
deps = [
diff --git a/pw_spi_stm32f429i_disc1_stm32cube/chip_selector.cc b/pw_spi_stm32cube/chip_selector.cc
similarity index 90%
rename from pw_spi_stm32f429i_disc1_stm32cube/chip_selector.cc
rename to pw_spi_stm32cube/chip_selector.cc
index e3075b6..a59ff1f 100644
--- a/pw_spi_stm32f429i_disc1_stm32cube/chip_selector.cc
+++ b/pw_spi_stm32cube/chip_selector.cc
@@ -12,9 +12,7 @@
// License for the specific language governing permissions and limitations under
// the License.
-#include "pw_spi_stm32f429i_disc1_stm32cube/chip_selector.h"
-
-#include "stm32f4xx_hal.h"
+#include "pw_spi_stm32cube/chip_selector.h"
using pw::digital_io::State;
@@ -27,4 +25,4 @@
return cs_pin_.SetState(active ? State::kInactive : State::kActive);
}
-} // namespace pw::spi
\ No newline at end of file
+} // namespace pw::spi
diff --git a/pw_spi_stm32f429i_disc1_stm32cube/initiator.cc b/pw_spi_stm32cube/initiator.cc
similarity index 98%
rename from pw_spi_stm32f429i_disc1_stm32cube/initiator.cc
rename to pw_spi_stm32cube/initiator.cc
index db72f25..892b232 100644
--- a/pw_spi_stm32f429i_disc1_stm32cube/initiator.cc
+++ b/pw_spi_stm32cube/initiator.cc
@@ -12,7 +12,7 @@
// License for the specific language governing permissions and limitations under
// the License.
-#include "pw_spi_stm32f429i_disc1_stm32cube/initiator.h"
+#include "pw_spi_stm32cube/initiator.h"
#include <algorithm>
diff --git a/pw_spi_stm32f429i_disc1_stm32cube/public/pw_spi_stm32f429i_disc1_stm32cube/chip_selector.h b/pw_spi_stm32cube/public/pw_spi_stm32cube/chip_selector.h
similarity index 100%
rename from pw_spi_stm32f429i_disc1_stm32cube/public/pw_spi_stm32f429i_disc1_stm32cube/chip_selector.h
rename to pw_spi_stm32cube/public/pw_spi_stm32cube/chip_selector.h
diff --git a/pw_spi_stm32f429i_disc1_stm32cube/public/pw_spi_stm32f429i_disc1_stm32cube/initiator.h b/pw_spi_stm32cube/public/pw_spi_stm32cube/initiator.h
similarity index 95%
rename from pw_spi_stm32f429i_disc1_stm32cube/public/pw_spi_stm32f429i_disc1_stm32cube/initiator.h
rename to pw_spi_stm32cube/public/pw_spi_stm32cube/initiator.h
index a729853..f456e9a 100644
--- a/pw_spi_stm32f429i_disc1_stm32cube/public/pw_spi_stm32f429i_disc1_stm32cube/initiator.h
+++ b/pw_spi_stm32cube/public/pw_spi_stm32cube/initiator.h
@@ -16,8 +16,7 @@
#include "pw_spi/initiator.h"
#include "pw_status/status.h"
-#include "stm32f4xx_hal.h"
-#include "stm32f4xx_hal_spi.h"
+#include STM32CUBE_HEADER
namespace pw::spi {
