Google Git
Sign in
pigweed / pigweed / experimental / 103e74590bf492c83ed153c57fca66e2b3543d6d
commit103e74590bf492c83ed153c57fca66e2b3543d6d[log] [tgz]
authorFaraaz Sareshwala <fsareshwala@pigweed.infra.roller.google.com>Wed Nov 29 21:29:32 2023 +0000
committerCQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>Wed Nov 29 21:29:32 2023 +0000
tree4605272d3b0319edb3948e903a6bce27a6fad375
parente9f8e7409a70356280ec9f32f9487caade1d0fa5 [diff]
[roll third_party/pigweed] pw_bluetooth_sapphire: Revert commits to get to a known working state

There are various moving parts at the moment with relation to Fuchsia's
deletion of the bt-host Sapphire code. While we have been waiting on
that, Sapphire development has continued within Pigweed. Various changes
have been made and Fuchsia can no longer pull in the latest Pigweed (to
obtain Sapphire) and successfully build with it. This change reverts a
series of commits, listed below, to return to a known working state so
that we can pull in Pigweed properly into Fuchsia. We will then delete
the Sapphire core bt-host code and then revert this change to redo the
work contained within it.

Reapply "pw_bluetooth_sapphire: Refactor method and variable names"

This reverts commit 8c730a90041c5d96d9ae7a71680fc106b181c697.

Reapply "pw_bluetooth_sapphire: Use size calculation for reports_size in Emboss"

This reverts commit 7e380e8b3813bd1c5e561ac91326dabb9ff4b6ca.

Revert "pw_bluetooth_sapphire: Use size calculation for reports_size in Emboss"

This reverts commit 4bab5d3991938c000c73014b50de3af7eada58db.

Revert "pw_bluetooth_sapphire: Use Write instead of UncheckedWrite"

This reverts commit b9a51a377278508527176406804fbe253bc8bc10.

Revert "pw_bluetooth_sapphire: Remove now unnecessary use of std::optional"

This reverts commit 6279dcff3ab3c1d9d2f4085f4306e9f82804d5a6.

Revert "pw_bluetooth_sapphire: Move LegacyLowEnergyScanner impl to base class"

This reverts commit afd316169759dd64c89f17472df0cfae369e35c6.

Revert "pw_bluetooth_sapphire: Create new LowEnergyScanner polymorphic methods"

This reverts commit d18befe5952f6fc3ea713c385c68348c3cc36a6a.

Revert "pw_bluetooth_sapphire: Extended scanning support, Fake(Controller|Peer)"

This reverts commit a8eb8a3d5f2ebf60d9e763d99bbbc3cb66dd98b4.

Revert "Reapply "pw_bluetooth_sapphire: Refactor method and variable names""

This reverts commit 5764b9ef9e84c1cd3dcee908696bc2d35e658f49.

Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/183014

https://pigweed.googlesource.com/pigweed/pigweed
third_party/pigweed Rolled-Commits: 7dde8e8f4926d8d..770c57d44c0ae84
Roller-URL: https://ci.chromium.org/b/8763059231433763601
GitWatcher: ignore
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: Ibb83fd1b1e4d4c944c89d5b59ef3776c373aa8cb
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/183071
Commit-Queue: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
Bot-Commit: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
1 file changed
tree: 4605272d3b0319edb3948e903a6bce27a6fad375
  1. applications/
  2. build_overrides/
  3. infra/
  4. pw_async_bench/
  5. pw_board_led/
  6. pw_board_led_arduino/
  7. pw_board_led_host/
  8. pw_board_led_mimxrt595_evk/
  9. pw_board_led_pico/
  10. pw_board_led_stm32cube/
  11. pw_board_led_stm32f429i_disc1/
  12. pw_board_led_stm32f769i_disc0/
  13. pw_data_link/
  14. pw_digital_io_arduino/
  15. pw_digital_io_null/
  16. pw_digital_io_stm32cube/
  17. pw_display_driver/
  18. pw_display_driver_ili9341/
  19. pw_display_driver_imgui/
  20. pw_display_driver_mipi/
  21. pw_display_driver_null/
  22. pw_display_driver_st7735/
  23. pw_display_driver_st7789/
  24. pw_graphics/
  25. pw_i2c_rp2040/
  26. pw_mipi_dsi/
  27. pw_mipi_dsi_mcuxpresso/
  28. pw_pixel_pusher/
  29. pw_pixel_pusher_rp2040_pio/
  30. pw_spi_arduino/
  31. pw_spi_rp2040/
  32. pw_spi_stm32cube/
  33. pw_spin_delay/
  34. pw_spin_delay_arduino/
  35. pw_spin_delay_host/
  36. pw_spin_delay_mcuxpresso/
  37. pw_spin_delay_rp2040/
  38. pw_spin_delay_stm32cube/
  39. pw_spin_delay_stm32f429i_disc1/
  40. pw_spin_delay_stm32f769i_disc0/
  41. pw_sys_io_baremetal_stm32f769/
  42. pw_toolchain_extra/
  43. targets/
  44. third_party/
  45. tools/
  46. .clang-format ⇨ third_party/pigweed/.clang-format
  47. activate.sh ⇨ bootstrap.sh
  48. .bazelignore
  49. .bazelrc
  50. .gitattributes
  51. .gitignore
  52. .gitmodules
  53. .gn
  54. activate.bat
  55. banner.txt
  56. bootstrap.bat
  57. bootstrap.sh
  58. BUILD.bazel
  59. BUILD.gn
  60. BUILDCONFIG.gn
  61. modules.gni
  62. navbar.md
  63. OWNERS
  64. pigweed.json
  65. README.md
  66. WORKSPACE
README.md

Pigweed Experimental

This repository contains a variety experiments to help inform various Pigweed policies, designs, and implementation behaviors.

Code in this repository is not reviewed to the standard of the main Pigweed repository, and generally speaking is untested and maintained on a best-effort basis. This is not a repository of “early access” Pigweed modules, but more so a sandbox for Pigweed contributors to collaborate on investigations. For more information, see the contribution guidelines for the experimental repository and where to land code.

DO NOT DEPEND ON THIS REPOSITORY IN ANY PRODUCTION PROJECT!

Repository setup

Clone this repo with --recursive to get all required submodules.

git clone --recursive https://pigweed.googlesource.com/pigweed/experimental

This will pull the Pigweed source repository into third_party/pigweed. If you already cloned but forgot to --recursive run git submodule update --init to pull all submodules.

pw_graphics

The //pw_graphics folder contains some libraries for drawing to an RGB565 framebuffer and displaying it on various platforms.

The demo applications that make use of these libraries are:

Build instructions

First time setup:

git clone --recursive https://pigweed.googlesource.com/pigweed/experimental
cd experimental
. ./bootstrap.sh
pw package install imgui
pw package install glfw
pw package install stm32cube_f4
pw package install pico_sdk

STM32F429-DISC1

Compile:

gn gen out --export-compile-commands --args="
  dir_pw_third_party_stm32cube_f4=\"$PW_PROJECT_ROOT/environment/packages/stm32cube_f4\"
"
ninja -C out

Flash:

openocd -f third_party/pigweed/targets/stm32f429i_disc1/py/stm32f429i_disc1_utils/openocd_stm32f4xx.cfg -c "program out/stm32f429i_disc1_stm32cube_debug/obj/applications/terminal_display/bin/terminal_demo.elf verify reset exit"

STM32F769-DISC0

First time setup:

pw package install stm32cube_f7

Compile:

gn gen out --export-compile-commands --args="
  dir_pw_third_party_stm32cube_f7=\"//environment/packages/stm32cube_f7\"
"
ninja -C out

Flash:

openocd -f targets/stm32f769i_disc0/py/stm32f769i_disc0_utils/openocd_stm32f7xx.cfg \
  -c "program out/stm32f769i_disc0_debug/obj/applications/blinky/bin/blinky.elf verify reset exit"

Linux, Windows or Mac

Compile:

gn gen out --export-compile-commands --args="
  dir_pw_third_party_imgui=\"$PW_PROJECT_ROOT/environment/packages/imgui\"
  dir_pw_third_party_glfw=\"$PW_PROJECT_ROOT/environment/packages/glfw\"
"
ninja -C out

Run:

out/host_debug/obj/applications/terminal_display/bin/terminal_demo

Raspberry Pi Pico Connected to an external SPI display

Working displays:

First time setup:

pw package install pico_sdk

Compile:

gn gen out --export-compile-commands --args='
  PICO_SRC_DIR="//environment/packages/pico_sdk"
'
ninja -C out

Flash:

  • Using a uf2 file:

    1. Reboot pico into BOOTSEL mode by holding the bootsel button on startup.
    2. Copy ./out/rp2040/obj/applications/terminal_display/terminal_demo.uf2 to your Pi Pico.

  • Using picotool:

    1. Reboot pico into BOOTSEL mode by holding the bootsel button on startup. Or try forcing a reboot with picotool:
    picotool reboot -f -u
    1. Flash the elf or uf2 file and reboot.
    picotool load ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf
picotool reboot

  • Using a Pico Probe and openocd:

    This requires installing the Raspberry Pi foundation's OpenOCD fork for the Pico probe. More details including how to connect the two Pico boards is available at Raspberry Pi Pico and RP2040 - C/C++ Part 2: Debugging with VS Code

    Install RaspberryPi's OpenOCD Fork:

    git clone https://github.com/raspberrypi/openocd.git \
  --branch picoprobe \
  --depth=1 \
  --no-single-branch \
  openocd-picoprobe

cd openocd-picoprobe

./bootstrap
./configure --enable-picoprobe --prefix=$HOME/apps/openocd --disable-werror
make -j2
make install

    Setup udev rules (Linux only):

    cat <<EOF > 49-picoprobe.rules
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0004", MODE:="0666"
KERNEL=="ttyACM*", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0004", MODE:="0666"
EOF
sudo cp 49-picoprobe.rules /usr/lib/udev/rules.d/49-picoprobe.rules
sudo udevadm control --reload-rules

    Flash the Pico:

    ~/apps/openocd/bin/openocd -f ~/apps/openocd/share/openocd/scripts/interface/picoprobe.cfg -f ~/apps/openocd/share/openocd/scripts/target/rp2040.cfg -c 'program out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf verify reset exit'

    Launching gdb*

    ~/apps/openocd/bin/openocd -f ~/apps/openocd/share/openocd/scripts/interface/picoprobe.cfg -f ~/apps/openocd/share/openocd/scripts/target/rp2040.cfg

    gdb-multiarch -ex "target remote :3333" -ex "set print pretty on" out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf

    arm-none-eabi-gdb can be used in place of gdb-multiarch above.

MIMXRT595-EVK Connected to an external MIPI display

Setup NXP SDK:

  1. Build a NXP SDK
  2. Download SDK
  3. Extract SDK's zip file to //environment/SDK_2_12_1_EVK-MIMXRT595

Compile:

gn gen out --export-compile-commands --args="
  pw_MIMXRT595_EVK_SDK=\"//environment/SDK_2_12_1_EVK-MIMXRT595\"
  pw_target_mimxrt595_evk_MANIFEST=\"//environment/SDK_2_12_1_EVK-MIMXRT595/EVK-MIMXRT595_manifest_v3_10.xml\"
  pw_third_party_mcuxpresso_SDK=\"//targets/mimxrt595_evk:mimxrt595_sdk\"
"

ninja -C out

Flash the MIMXRT595-EVK:

Follow the instructions to flash the MIMXRT595-EVK with the SEGGER J-Link firmware and using arm-none-eabi-gdb at https://pigweed.dev/targets/mimxrt595_evk/target_docs.html#running-and-debugging.

Teensy 4.1

https://www.pjrc.com/teensy/loader_cli.html

brew install teensy_loader_cli

OBJCOPY=/Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/avr-objcopy
INFILE=out/arduino_debug/obj/applications/terminal_display/bin/terminal_demo.elf
OUTFILE=foo.hex
$OBJCOPY -O ihex -R .eeprom -R .fuse -R .lock -R .signature $INFILE $OUTFILE
teensy_loader_cli --mcu=TEENSY41 -w -v $OUTFILE