judsonupchurch/nanoMODBUS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes to rp2040 example

Browse Source
This commit is contained in:
Valerio De Benedetto 2024-09-20 15:43:16 +02:00
parent 7e4ef3e97e
commit af44ba067a
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
examples/rp2040/rtu-client.c
View File

@ -1,9 +1,9 @@
#include <stdio.h>
#include "pico/stdlib.h"
#include "hardware/uart.h"
#include "hardware/gpio.h" #include "hardware/gpio.h"
#include "hardware/timer.h" #include "hardware/timer.h"
#include "hardware/uart.h"
#include "nanomodbus.h" #include "nanomodbus.h"
#include "pico/stdlib.h"
#include <stdio.h>
// Define UART pins and settings // Define UART pins and settings
#define UART_ID uart0 #define UART_ID uart0
@ -25,17 +25,15 @@
// Function prototypes // Function prototypes
void onError(); void onError();
int32_t read_serial(uint8_t *buf, uint16_t count, int32_t byte_timeout_ms, void *arg); int32_t read_serial(uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg);
int32_t write_serial(const uint8_t *buf, uint16_t count, int32_t byte_timeout_ms, void *arg); int32_t write_serial(const uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg);
void onError() void onError() {
{
// Make the LED blink on error // Make the LED blink on error
const uint LED_PIN = PICO_LED_PIN; const uint LED_PIN = PICO_LED_PIN;
gpio_init(LED_PIN); gpio_init(LED_PIN);
gpio_set_dir(LED_PIN, GPIO_OUT); gpio_set_dir(LED_PIN, GPIO_OUT);
while (true) while (true) {
{
gpio_put(LED_PIN, 1); gpio_put(LED_PIN, 1);
sleep_ms(1000); sleep_ms(1000);
gpio_put(LED_PIN, 0); gpio_put(LED_PIN, 0);
@ -43,16 +41,13 @@ void onError()
} }
} }
int32_t read_serial(uint8_t *buf, uint16_t count, int32_t byte_timeout_ms, void *arg) int32_t read_serial(uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg) {
{
uint64_t start_time = time_us_64(); uint64_t start_time = time_us_64();
int32_t bytes_read = 0; int32_t bytes_read = 0;
uint64_t timeout_us = (uint64_t)byte_timeout_ms * 1000; uint64_t timeout_us = (uint64_t) byte_timeout_ms * 1000;
while (time_us_64() - start_time < timeout_us && bytes_read < count) while (time_us_64() - start_time < timeout_us && bytes_read < count) {
{ if (uart_is_readable(UART_ID)) {
if (uart_is_readable(UART_ID))
{
buf[bytes_read++] = uart_getc(UART_ID); buf[bytes_read++] = uart_getc(UART_ID);
start_time = time_us_64(); // Reset start time after a successful read start_time = time_us_64(); // Reset start time after a successful read
} }
@ -61,14 +56,12 @@ int32_t read_serial(uint8_t *buf, uint16_t count, int32_t byte_timeout_ms, void
return bytes_read; return bytes_read;
} }
int32_t write_serial(const uint8_t *buf, uint16_t count, int32_t byte_timeout_ms, void *arg) int32_t write_serial(const uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg) {
{
uart_write_blocking(UART_ID, buf, count); uart_write_blocking(UART_ID, buf, count);
return count; return count;
} }
void pico_setup() void pico_setup() {
{
printf("Initializing UART...\n"); printf("Initializing UART...\n");
// Initialize the UART // Initialize the UART
uart_init(UART_ID, BAUD_RATE); uart_init(UART_ID, BAUD_RATE);
@ -95,8 +88,7 @@ void pico_setup()
gpio_put(LED_PIN, 0); gpio_put(LED_PIN, 0);
} }
int main() int main() {
{
stdio_init_all(); stdio_init_all();
sleep_ms(5000); // Initial pause to catch prints sleep_ms(5000); // Initial pause to catch prints
@ -105,6 +97,7 @@ int main()
printf("Setting up Modbus platform configuration...\n"); printf("Setting up Modbus platform configuration...\n");
nmbs_platform_conf platform_conf; nmbs_platform_conf platform_conf;
nmbs_platform_conf_create(&platform_conf);
platform_conf.transport = NMBS_TRANSPORT_RTU; platform_conf.transport = NMBS_TRANSPORT_RTU;
platform_conf.read = read_serial; platform_conf.read = read_serial;
platform_conf.write = write_serial; platform_conf.write = write_serial;
@ -112,8 +105,7 @@ int main()
printf("Creating Modbus client...\n"); printf("Creating Modbus client...\n");
nmbs_t nmbs; nmbs_t nmbs;
nmbs_error err = nmbs_client_create(&nmbs, &platform_conf); nmbs_error err = nmbs_client_create(&nmbs, &platform_conf);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE) {
{
printf("Error creating Modbus client: %d\n", err); printf("Error creating Modbus client: %d\n", err);
onError(); onError();
} }
@ -130,8 +122,7 @@ int main()
nmbs_bitfield_write(coils, 0, 1); nmbs_bitfield_write(coils, 0, 1);
nmbs_bitfield_write(coils, 1, 1); nmbs_bitfield_write(coils, 1, 1);
err = nmbs_write_multiple_coils(&nmbs, 64, 2, coils); err = nmbs_write_multiple_coils(&nmbs, 64, 2, coils);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE) {
{
printf("Error writing multiple coils: %d\n", err); printf("Error writing multiple coils: %d\n", err);
onError(); onError();
} }
@ -139,8 +130,7 @@ int main()
printf("Reading 3 coils from address 64...\n"); printf("Reading 3 coils from address 64...\n");
nmbs_bitfield_reset(coils); // Reset whole bitfield to zero nmbs_bitfield_reset(coils); // Reset whole bitfield to zero
err = nmbs_read_coils(&nmbs, 64, 3, coils); err = nmbs_read_coils(&nmbs, 64, 3, coils);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE) {
{
printf("Error reading coils: %d\n", err); printf("Error reading coils: %d\n", err);
onError(); onError();
} }
@ -148,8 +138,7 @@ int main()
printf("Writing 2 holding registers at address 26...\n"); printf("Writing 2 holding registers at address 26...\n");
uint16_t w_regs[2] = {123, 124}; uint16_t w_regs[2] = {123, 124};
err = nmbs_write_multiple_registers(&nmbs, 26, 2, w_regs); err = nmbs_write_multiple_registers(&nmbs, 26, 2, w_regs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE) {
{
printf("Error writing multiple registers: %d\n", err); printf("Error writing multiple registers: %d\n", err);
onError(); onError();
} }
@ -157,8 +146,7 @@ int main()
printf("Reading 2 holding registers from address 26...\n"); printf("Reading 2 holding registers from address 26...\n");
uint16_t r_regs[2]; uint16_t r_regs[2];
err = nmbs_read_holding_registers(&nmbs, 26, 2, r_regs); err = nmbs_read_holding_registers(&nmbs, 26, 2, r_regs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE) {
{
printf("Error reading holding registers: %d\n", err); printf("Error reading holding registers: %d\n", err);
onError(); onError();
} }