From 576bcfc59030e1bf170821edb7ccb270d390416f Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 10 Feb 2023 11:41:39 +0100 Subject: [PATCH] make modem main args generic --- src/modem.rs | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/modem.rs b/src/modem.rs index b09b0e7..788bf39 100644 --- a/src/modem.rs +++ b/src/modem.rs @@ -499,15 +499,23 @@ impl std::io::Read for Modem { } } -pub fn main( - rx: esp_idf_hal::gpio::Gpio26, - tx: esp_idf_hal::gpio::Gpio27, +pub fn main +( + rx: PRx, + tx: PTx, uart: serial::UART1, - pwrkey: esp_idf_hal::gpio::Gpio4, - rst: esp_idf_hal::gpio::Gpio5, - power: esp_idf_hal::gpio::Gpio23, + pwrkey: DPK, + rst: DR, + power: DP, receiver: Receiver, -) -> std::result::Result<(), anyhow::Error> { +) -> std::result::Result<(), anyhow::Error> +where + PRx: esp_idf_hal::gpio::Pin + esp_idf_hal::gpio::InputPin + esp_idf_hal::gpio::OutputPin, + PTx: esp_idf_hal::gpio::Pin + esp_idf_hal::gpio::InputPin + esp_idf_hal::gpio::OutputPin, + DPK: embedded_hal::digital::v2::OutputPin, + DR: embedded_hal::digital::v2::OutputPin, + DP: embedded_hal::digital::v2::OutputPin, +{ let serial_pins = serial::Pins { tx, rx,