commit	6a53fa7c509fe81e63c42c1fb138a3c967ca09d9	[log] [tgz]
author	Jonathon Reinhart <jrreinhart@pigweed.infra.roller.google.com>	Wed Aug 30 20:52:32 2023 +0000
committer	CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>	Wed Aug 30 20:52:32 2023 +0000
tree	5aaddaef0eeb76893f1d1f1cdcb5a249b41abcd3
parent	28d55409f9f9a3d41fae824e596a2fcf7d110ecb [diff]

[roll third_party/pigweed] pw_protobuf: Expose max_size, max_count in generated header file

For fields with max_size or max_count set in the codegen options,
generate a constant (static constexpr size_t) named k{FieldName}MaxSize
which is set to that size.

The constant is defined in the message namespace.

Use this constant in the Message struct field definitions
and in the calculation of kMaxEncodedSizeBytes.

For example, see this diff of the generated file
out/protocol_buffer/gen/pw_i2c/protos.proto_library/pwpb/pw_i2c/i2c.pwpb.h:

   namespace I2cWriteRequest {
   // ...
  +static constexpr size_t kRegisterAddressMaxSize = 4;
  +static constexpr size_t kValueMaxSize = 32;
   // ...
   }

   // ...

   struct I2cWriteRequest::Message {
     uint32_t bus_index;
     uint32_t target_address;
  -  ::pw::Vector<std::byte, 4> register_address;
  -  ::pw::Vector<std::byte, 32> value;
  +  ::pw::Vector<std::byte, kRegisterAddressMaxSize> register_address;
  +  ::pw::Vector<std::byte, kValueMaxSize> value;
     // ...
   };

   namespace I2cWriteRequest {
   inline constexpr size_t kMaxEncodedSizeBytes =
     ::pw::protobuf::SizeOfFieldUint32(static_cast<uint32_t>(Fields::kBusIndex)) +
     ::pw::protobuf::SizeOfFieldUint32(static_cast<uint32_t>(Fields::kTargetAddress)) +
  -  ::pw::protobuf::SizeOfDelimitedFieldWithoutValue(static_cast<uint32_t>(Fields::kRegisterAddress)) + 4 +
  -  ::pw::protobuf::SizeOfDelimitedFieldWithoutValue(static_cast<uint32_t>(Fields::kValue)) + 32;
  +  ::pw::protobuf::SizeOfDelimitedFieldWithoutValue(static_cast<uint32_t>(Fields::kRegisterAddress)) + kRegisterAddressMaxSize +
  +  ::pw::protobuf::SizeOfDelimitedFieldWithoutValue(static_cast<uint32_t>(Fields::kValue)) + kValueMaxSize;

   inline constexpr size_t kScratchBufferSizeBytes = 0;
   }  // namespace I2cWriteRequest

Test: ninja -C out
Original-Bug: 297364973
Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/168973

https://pigweed.googlesource.com/pigweed/pigweed
third_party/pigweed Rolled-Commits: 3011a52d1c50c87..fb5f2ca113295de
Roller-URL: https://ci.chromium.org/b/8771305769164196689
GitWatcher: ignore
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: Ib084b52789ce3cbda042a935a9d51b052c406a8c
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/169117
Bot-Commit: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>

third_party/pigweed[diff]

1 file changed

tree: 5aaddaef0eeb76893f1d1f1cdcb5a249b41abcd3

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:

//applications/terminal_display

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:

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:

Build a NXP SDK
Download SDK
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