From 6bd4db268138424e474664092f0fef4f0eaca774 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 17 Jun 2021 07:05:59 -0700 Subject: [PATCH] Functional SHR16 --- src/hal/avr/shr16.cpp | 8 ++++++-- src/main.cpp | 4 +++- src/pins.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/hal/avr/shr16.cpp b/src/hal/avr/shr16.cpp index 5ac52a3..0237d60 100644 --- a/src/hal/avr/shr16.cpp +++ b/src/hal/avr/shr16.cpp @@ -2,6 +2,10 @@ #include "../gpio.h" #include "../../pins.h" +#define SHR16_LED_MSK 0xffc0 +#define SHR16_DIR_MSK 0x0015 +#define SHR16_ENA_MSK 0x002A + namespace hal { namespace shr16 { @@ -29,8 +33,8 @@ void SHR16::Write(uint16_t v) { } void SHR16::SetLED(uint16_t led) { - // led = ((led & 0x00ff) << 8) | ((led & 0x0300) >> 2); - // Write((shr16_v & ~SHR16_LED_MSK) | led); + led = ((led & 0x00ff) << 8) | ((led & 0x0300) >> 2); + Write((shr16_v & ~SHR16_LED_MSK) | led); } void SHR16::SetTMCEnabled(uint8_t index, bool ena) { diff --git a/src/main.cpp b/src/main.cpp index b97b673..5c826b1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,7 @@ #include "pins.h" #include +#include #include "modules/buttons.h" #include "modules/finda.h" @@ -267,13 +268,14 @@ void loop() { ProcessRequestMsg(protocol.GetRequestMsg()); } mb::buttons.Step(hal::adc::ReadADC(0)); - ml::leds.Step(0); + ml::leds.Step(10); mf::finda.Step(0); mfs::fsensor.Step(0); mi::idler.Step(); ms::selector.Step(); currentCommand->Step(); // add a watchdog reset + _delay_ms(10) } int main() { diff --git a/src/pins.h b/src/pins.h index be9853a..468cad1 100644 --- a/src/pins.h +++ b/src/pins.h @@ -10,4 +10,4 @@ #define SHR16_DATA GPIOB, 5 ///DS #define SHR16_LATCH GPIOB, 6 ///STCP -#define SHR16_CLOCK GPIOB, 7 ///SHCP +#define SHR16_CLOCK GPIOC, 7 ///SHCP