Upgrading to RP Pico 2W WatchDog issue

[djaus2]

Upgrading my Softata software for Pico 2W from RPi Pico W.

(1) Have added defined(TARGET_RP2350) in

#if defined(TARGET_RP2040) || defined(TARGET_RASPBERRY_PI_PICO) || defined(TARGET_RP2350)

Compiles past that now but ..

(2) Now getting:
c:\Folders\Documents\Arduino\libraries\SoftataDevices-main\rpiwatchdog.c: In function 'watchdog_start_tick':
c:\Folders\Documents\Arduino\libraries\SoftataDevices-main\rpiwatchdog.c:14:16: error: 'watchdog_hw_t' has no member named 'tick'
14 | watchdog_hw->tick = cycles | WATCHDOG_TICK_ENABLE_BITS;
| ^~
c:\Folders\Documents\Arduino\libraries\SoftataDevices-main\rpiwatchdog.c:14:34: error: 'WATCHDOG_TICK_ENABLE_BITS' undeclared (first use in this function); did you mean 'WATCHDOG_CTRL_ENABLE_BITS'?
14 | watchdog_hw->tick = cycles | WATCHDOG_TICK_ENABLE_BITS;
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| WATCHDOG_CTRL_ENABLE_BITS

============
My watchdog file rpiwatchdog.c and rpiwatchdog,h are located here:
https://github.com/djaus2/SoftataDevices

============
Nb: Is there a guide to any other changes for the Pico 2W from Pico W?, thx

[earlephilhower]

You're using the raw HW registers through the SDK so there will be issues like this. The RP2350 M33 with it's Secure Enclave (or whatever ARM uses for the name) is very different at the lowest levels from the RP2040's M0+. I'd imagine the Pico2 WDT is nothing like the one on the Pico.

I suggest dropping to the SDK wrappers for this, they should work on either core. See R.Pi's docs https://www.raspberrypi.com/documentation/pico-sdk/hardware.html#group_hardware_watchdog

[djaus2]

Thanks for the prompt reply, yet again Earle.
In essence commented out out my WatchDog code, that I had previously copied in some time ago and just referenced

#include <stdio.h>
#include "pico/stdlib.h"
#include "hardware/watchdog.h

I did note in my ReadMe for my SoftataDevice library:

This code should work with other Arduino devices except the inclusion of the Watchdog timer mechanism.
Pico 2W wil be tested in the near future.

So that is done now!
Thx 😄