Google Git
Sign in
pigweed / pigweed / experimental / c426600eac8422e40060ba0880ccb24d7c3337f6
commitc426600eac8422e40060ba0880ccb24d7c3337f6[log] [tgz]
authorTom Craig <tommycraig@pigweed.infra.roller.gmail.com>Tue Jan 17 19:16:40 2023 +0000
committerCQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>Tue Jan 17 19:16:40 2023 +0000
treee521c0617a599aa7452984f3b031e5a9a6832891
parent6f36ad3385980cc314d3a875444e56cb180aaecf [diff]
[roll third_party/pigweed] pw_env_setup: Fix 'pw package' regression

A recent 'pw package' change related to Upstream Only packages caused
a regression in my downstream project which, just like pigweed
upstream, can't use submodules.

While the change added a "force" mode escape hatch to enable using
affected packages downstream, it missed a use case: pw_env_setup.

This CL changes pw_env_setup to install packages in the force mode
so that they are still usable downstream.

Intentionally kept out of scope: Modifying the env_setup.json format
and parser to allow specifying force mode on a per-package basis.

Regression caused by:
https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/117834

Original-Bug: b/249829950
Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/126524

https://pigweed.googlesource.com/pigweed/pigweed
third_party/pigweed Rolled-Commits: 96665e80f341cbe..4e802589eebe5a6
Roller-URL: https://ci.chromium.org/b/8791695702240648177
GitWatcher: ignore
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: I5d979544d39f7bfd33373e2cc182163f404fa97e
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/126436
Commit-Queue: Pigweed Integration Roller <pigweed-integration-roller@pigweed.google.com.iam.gserviceaccount.com>
Bot-Commit: Pigweed Integration Roller <pigweed-integration-roller@pigweed.google.com.iam.gserviceaccount.com>
1 file changed
tree: e521c0617a599aa7452984f3b031e5a9a6832891
  1. applications/
  2. build_overrides/
  3. infra/
  4. pw_board_led/
  5. pw_board_led_arduino/
  6. pw_board_led_host/
  7. pw_board_led_mimxrt595_evk/
  8. pw_board_led_pico/
  9. pw_board_led_stm32cube/
  10. pw_board_led_stm32f429i_disc1/
  11. pw_digital_io_arduino/
  12. pw_digital_io_null/
  13. pw_digital_io_pico/
  14. pw_digital_io_stm32cube/
  15. pw_display_driver/
  16. pw_display_driver_ili9341/
  17. pw_display_driver_imgui/
  18. pw_display_driver_mipi/
  19. pw_display_driver_null/
  20. pw_display_driver_st7735/
  21. pw_display_driver_st7789/
  22. pw_graphics/
  23. pw_mipi_dsi/
  24. pw_mipi_dsi_mcuxpresso/
  25. pw_spi_arduino/
  26. pw_spi_pico/
  27. pw_spi_stm32cube/
  28. pw_spin_delay/
  29. pw_spin_delay_arduino/
  30. pw_spin_delay_host/
  31. pw_spin_delay_mcuxpresso/
  32. pw_spin_delay_pico/
  33. pw_spin_delay_stm32cube/
  34. pw_spin_delay_stm32f429i_disc1/
  35. targets/
  36. third_party/
  37. tools/
  38. .clang-format ⇨ third_party/pigweed/.clang-format
  39. activate.sh ⇨ bootstrap.sh
  40. .gitattributes
  41. .gitignore
  42. .gitmodules
  43. .gn
  44. activate.bat
  45. banner.txt
  46. bootstrap.bat
  47. bootstrap.sh
  48. BUILD.gn
  49. BUILDCONFIG.gn
  50. env_setup.json
  51. navbar.md
  52. OWNERS
  53. PW_PLUGINS
  54. README.md
README.md

Pigweed Experimental

This repository contains experimental pigweed modules.

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"

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:

Compile:

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

Flash:

  • Using a uf2 file:

    ./out/host_debug/obj/targets/rp2040/bin/elf2uf2 ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.uf2

    Copy ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.uf2 to your Pi Pico.

  • 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'

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