From 1db2c08d12c5a31318c909a0e7ceac34391bbe92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=B8rch?= Date: Thu, 10 Dec 2015 21:26:08 +0100 Subject: [PATCH 1/2] added initializers for variables needed on AVR platform --- .../MySensors/drivers/ATSHA204/ATSHA204.cpp | 26 ++++++++++++++----- .../MySensors/drivers/ATSHA204/ATSHA204.h | 4 ++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/libraries/MySensors/drivers/ATSHA204/ATSHA204.cpp b/libraries/MySensors/drivers/ATSHA204/ATSHA204.cpp index 3e16cc3..16b82c3 100644 --- a/libraries/MySensors/drivers/ATSHA204/ATSHA204.cpp +++ b/libraries/MySensors/drivers/ATSHA204/ATSHA204.cpp @@ -7,7 +7,19 @@ // As well as the bit value for each of those registers ATSHA204Class::ATSHA204Class(uint8_t pin) { - device_pin = pin; // Find the bit value of the pin +#if defined(ARDUINO_ARCH_AVR) + device_pin = digitalPinToBitMask(pin); // Find the bit value of the pin + uint8_t port = digitalPinToPort(pin); // temoporarily used to get the next three registers + + // Point to data direction register port of pin + device_port_DDR = portModeRegister(port); + // Point to output register of pin + device_port_OUT = portOutputRegister(port); + // Point to input register of pin + device_port_IN = portInputRegister(port); +#else + device_pin = pin; +#endif } void ATSHA204Class::getSerialNumber(uint8_t * response) @@ -71,21 +83,21 @@ uint8_t ATSHA204Class::swi_send_bytes(uint8_t count, uint8_t *buffer) { if (bit_mask & buffer[i]) { - SHA204_POUT_LOW() //*device_port_OUT &= ~device_pin; + SHA204_POUT_LOW(); //*device_port_OUT &= ~device_pin; delayMicroseconds(BIT_DELAY); //BIT_DELAY_1; - SHA204_POUT_HIGH() //*device_port_OUT |= device_pin; + SHA204_POUT_HIGH(); //*device_port_OUT |= device_pin; delayMicroseconds(7*BIT_DELAY); //BIT_DELAY_7; } else { // Send a zero bit. - SHA204_POUT_LOW() //*device_port_OUT &= ~device_pin; + SHA204_POUT_LOW(); //*device_port_OUT &= ~device_pin; delayMicroseconds(BIT_DELAY); //BIT_DELAY_1; - SHA204_POUT_HIGH() //*device_port_OUT |= device_pin; + SHA204_POUT_HIGH(); //*device_port_OUT |= device_pin; delayMicroseconds(BIT_DELAY); //BIT_DELAY_1; - SHA204_POUT_LOW() //*device_port_OUT &= ~device_pin; + SHA204_POUT_LOW(); //*device_port_OUT &= ~device_pin; delayMicroseconds(BIT_DELAY); //BIT_DELAY_1; - SHA204_POUT_HIGH() //*device_port_OUT |= device_pin; + SHA204_POUT_HIGH(); //*device_port_OUT |= device_pin; delayMicroseconds(5*BIT_DELAY); //BIT_DELAY_5; } } diff --git a/libraries/MySensors/drivers/ATSHA204/ATSHA204.h b/libraries/MySensors/drivers/ATSHA204/ATSHA204.h index 7569e21..8fcf163 100644 --- a/libraries/MySensors/drivers/ATSHA204/ATSHA204.h +++ b/libraries/MySensors/drivers/ATSHA204/ATSHA204.h @@ -240,7 +240,9 @@ class ATSHA204Class { private: uint8_t device_pin; -// volatile uint8_t *device_port_DDR, *device_port_OUT, *device_port_IN; + #ifdef ARDUINO_ARCH_AVR + volatile uint8_t *device_port_DDR, *device_port_OUT, *device_port_IN; + #endif void sha204c_calculate_crc(uint8_t length, uint8_t *data, uint8_t *crc); uint8_t sha204c_check_crc(uint8_t *response); void swi_set_signal_pin(uint8_t is_high); From e7b6e636babea1d39452e98c33b5afc2beb83dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=B8rch?= Date: Thu, 10 Dec 2015 22:08:20 +0100 Subject: [PATCH 2/2] Corrected sleep functions after @tekka changed definitions in MyHw.h --- libraries/MySensors/core/MyHwSAMD.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/MySensors/core/MyHwSAMD.cpp b/libraries/MySensors/core/MyHwSAMD.cpp index 1c282b9..c358419 100644 --- a/libraries/MySensors/core/MyHwSAMD.cpp +++ b/libraries/MySensors/core/MyHwSAMD.cpp @@ -116,7 +116,7 @@ void hwSleep(unsigned long ms) { ms = ms + 1; } -bool hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) { +int8_t hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) { // TODO: Not supported! interrupt = interrupt; mode = mode; @@ -124,7 +124,7 @@ bool hwSleep(uint8_t interrupt, uint8_t mode, unsigned long ms) { return false; } -uint8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) { +int8_t hwSleep(uint8_t interrupt1, uint8_t mode1, uint8_t interrupt2, uint8_t mode2, unsigned long ms) { // TODO: Not supported! interrupt1 = interrupt1; mode1 = mode1;