odie
/
ubitxv6
mirror of https://codeberg.org/mclemens/ubitxv6.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update includes and pin names

This commit is contained in:
Reed Nightingale 2020-04-21 21:13:55 -07:00
parent e593e0a060
commit 6face82c36
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
encoder.cpp
View File

@ -2,7 +2,7 @@
#include <stdint.h>
#include "encoder.h"
#include "ubitx.h"//Pin definitions
#include "pin_definitions.h"
//Normal encoder state
uint8_t prev_enc = 0;
@ -16,7 +16,7 @@ static const uint8_t MOMENTUM_MULTIPLIER = 1;
uint8_t enc_state (void)
{
return (digitalRead(ENC_A)?1:0 + digitalRead(ENC_B)?2:0);
return (digitalRead(PIN_ENC_A)?1:0 + digitalRead(PIN_ENC_B)?2:0);
}
/*
@ -71,13 +71,13 @@ void enc_setup(void)
{
enc_count = 0;
// This is already done in setup() ?
//pinMode(ENC_A, INPUT);
//pinMode(ENC_B, INPUT);
//pinMode(PIN_ENC_A, INPUT);
//pinMode(PIN_ENC_B, INPUT);
prev_enc = enc_state();
// Setup Pin Change Interrupts for the encoder inputs
pci_setup(ENC_A);
pci_setup(ENC_B);
pci_setup(PIN_ENC_A);
pci_setup(PIN_ENC_B);
//Set up timer interrupt for momentum
TCCR1A = 0;//"normal" mode