paulM_projects/motorized_fader
2
0
Fork 0
generated from TDD-Templates/cmake_cpputest_template_avr
Code Issues 1 Pull requests Projects Releases 3 Packages Wiki Activity

removed uneeded lines

Browse source
This commit is contained in:
Jake Goodwin 2025-02-12 11:09:55 -08:00
parent ce3e50a3cb
commit 079305033a
1 changed files with 201 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
src/main.c
View file

@ -7,17 +7,16 @@
#endif #endif
#include "main.h" #include "main.h"
#include <avr/interrupt.h>
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include <avr/interrupt.h>
#include <util/delay.h> #include <util/delay.h>
// #############################
//############################# // Globals
//Globals // #############################
//#############################
/* This line isn't really quite right.*/ /* This line isn't really quite right.*/
//uint8_t saved_position EEMEM; // EEPROM storage for fader position // uint8_t saved_position EEMEM; // EEPROM storage for fader position
btn_state btn1; btn_state btn1;
@ -28,16 +27,9 @@ volatile uint8_t idx;
volatile uint16_t tick_count; volatile uint16_t tick_count;
//############################# // #############################
//Prototypes // Prototypes
//############################# // #############################
void led_blink(void);
uint16_t readADC(void);
void motorCoast(void);
void motorMove(int direction);
uint8_t readButton(void);
static void InitBtn(btn_state *b, uint8_t input_pin, uint8_t output_pin); static void InitBtn(btn_state *b, uint8_t input_pin, uint8_t output_pin);
@ -48,21 +40,16 @@ static void CheckButtonLongpress(btn_state *b);
static void UpdateButtonInput(btn_state *b); static void UpdateButtonInput(btn_state *b);
static void UpdateButtonOutput(btn_state *b); static void UpdateButtonOutput(btn_state *b);
// #############################
// MAIN
// #############################
int main(int argc, char **argv) {
//#############################
//MAIN
//#############################
int main(int argc, char **argv)
{
InitProg(); InitProg();
uint16_t fader_pos = ReadADC() >> 2; // Scale 10-bit ADC to 8-bit (0-255) uint16_t fader_pos = ReadADC() >> 2; // Scale 10-bit ADC to 8-bit (0-255)
while(1) while (1) {
{
fader_pos = ReadADC() >> 2; fader_pos = ReadADC() >> 2;
/* /*
@ -71,7 +58,6 @@ int main(int argc, char **argv)
*/ */
} }
/* /*
while(1) { while(1) {
uint16_t fader_pos = readADC() >> 2; // Scale 10-bit ADC to 8-bit (0-255) uint16_t fader_pos = readADC() >> 2; // Scale 10-bit ADC to 8-bit (0-255)
@ -98,14 +84,11 @@ int main(int argc, char **argv)
return 0; return 0;
} }
// #############################
// FUNCTIONS
// #############################
//############################# void InitProg(void) {
//FUNCTIONS
//#############################
void InitProg(void)
{
/*Set the debounced state to all high*/ /*Set the debounced state to all high*/
debounced_state = 0xFF; debounced_state = 0xFF;
@ -115,25 +98,24 @@ void InitProg(void)
_delay_ms(5); _delay_ms(5);
/*check if the eeprom has info. */ /*check if the eeprom has info. */
while(! eeprom_is_ready()) {} //Blocks until eeprom is ready. while (!eeprom_is_ready()) {
} // Blocks until eeprom is ready.
//Checks against a bit pattern we defined to represent the start of data. // Checks against a bit pattern we defined to represent the start of data.
if(eeprom_read_byte((uint8_t *)ROM_SP_ADR) == START_PATTERN) { if (eeprom_read_byte((uint8_t *)ROM_SP_ADR) == START_PATTERN) {
//Reads the two bytes representing the two states. // Reads the two bytes representing the two states.
btn1.is_active = eeprom_read_byte((uint8_t *)ROM_SS1_ADR); btn1.is_active = eeprom_read_byte((uint8_t *)ROM_SS1_ADR);
} } else {
else { // otherwise we write the init values for the start pattern and states.
//otherwise we write the init values for the start pattern and states.
eeprom_write_byte((uint8_t *)ROM_SP_ADR, START_PATTERN); eeprom_write_byte((uint8_t *)ROM_SP_ADR, START_PATTERN);
eeprom_write_byte((uint8_t *)ROM_SS1_ADR, 0x0); eeprom_write_byte((uint8_t *)ROM_SS1_ADR, 0x0);
} }
btn1.is_pressed = ((PINB & (1<<btn1.input_pin)) == 0); btn1.is_pressed = ((PINB & (1 << btn1.input_pin)) == 0);
InitTimer0(); InitTimer0();
} }
uint16_t ReadADC(void); uint16_t ReadADC(void);
{ {
// Initialize ADC // Initialize ADC
@ -141,23 +123,21 @@ uint16_t ReadADC(void);
ADCSRA = (1 << ADEN) | (1 << ADPS1) | (1 << ADPS0); // Enable ADC, prescaler 8 ADCSRA = (1 << ADEN) | (1 << ADPS1) | (1 << ADPS0); // Enable ADC, prescaler 8
ADCSRA |= (1 << ADSC); // Start conversion ADCSRA |= (1 << ADSC); // Start conversion
while (ADCSRA & (1 << ADSC)); // Wait for conversion to finish while (ADCSRA & (1 << ADSC))
; // Wait for conversion to finish
return ADC; return ADC;
} }
/* /*
* ############################ * ############################
* Motor methods * Motor methods
* ############################ * ############################
*/ */
void MotorCoast(void) void MotorCoast(void) {
{
PORTB &= ~((1 << PWM_PIN1) | (1 << PWM_PIN2)); // Disable motor drive PORTB &= ~((1 << PWM_PIN1) | (1 << PWM_PIN2)); // Disable motor drive
} }
/* /*
* ############################ * ############################
* BUTTON methods * BUTTON methods
@ -165,8 +145,7 @@ void MotorCoast(void)
*/ */
/*This is kinda like our button constructor*/ /*This is kinda like our button constructor*/
static void InitBtn(btn_state *b, uint8_t input_pin, uint8_t output_pin) static void InitBtn(btn_state *b, uint8_t input_pin, uint8_t output_pin) {
{
b->is_long_pressed = 0; b->is_long_pressed = 0;
b->is_pressed = 0; b->is_pressed = 0;
b->is_bypassed = 0; b->is_bypassed = 0;
@ -176,68 +155,61 @@ static void InitBtn(btn_state *b, uint8_t input_pin, uint8_t output_pin)
b->output_pin = output_pin; b->output_pin = output_pin;
/*Configure the buttons inputs and outputs*/ /*Configure the buttons inputs and outputs*/
DDRB &= ~(1<<b->input_pin); DDRB &= ~(1 << b->input_pin);
PORTB |= (1<<b->input_pin); PORTB |= (1 << b->input_pin);
DDRB |= (1<<b->output_pin); DDRB |= (1 << b->output_pin);
PORTB &= ~(1<<b->output_pin); PORTB &= ~(1 << b->output_pin);
} }
/*This is the fancy function to toggle output pins*/ /*This is the fancy function to toggle output pins*/
static void ToggleOutput(btn_state *b) static void ToggleOutput(btn_state *b) {
{ if (!b->is_bypassed) {
if(!b->is_bypassed){
b->is_bypassed = 1; b->is_bypassed = 1;
PORTB |= (1<<b->output_pin); PORTB |= (1 << b->output_pin);
} } else {
else{
b->is_bypassed = 0; b->is_bypassed = 0;
PORTB &= ~(1<<b->output_pin); PORTB &= ~(1 << b->output_pin);
} }
} }
static void ClearButtonTimer(btn_state *b) static void ClearButtonTimer(btn_state *b) {
{
b->timer_enabled = 0; b->timer_enabled = 0;
b->is_long_pressed = 0; b->is_long_pressed = 0;
b->pressed_ticks = 0; b->pressed_ticks = 0;
} }
static void StartButtonTimer(btn_state *b) static void StartButtonTimer(btn_state *b) {
{
ClearButtonTimer(b); ClearButtonTimer(b);
b->timer_enabled = 1; b->timer_enabled = 1;
} }
static void CheckButtonLongpress(btn_state *b) static void CheckButtonLongpress(btn_state *b) {
{ if (b->pressed_ticks >= LONG_PRESS_TICKS) {
if(b->pressed_ticks >= LONG_PRESS_TICKS) {
b->is_long_pressed = 1; b->is_long_pressed = 1;
b->timer_enabled = 0; b->timer_enabled = 0;
} }
} }
static void UpdateButtonInput(btn_state *b) static void UpdateButtonInput(btn_state *b) {
{
/*Check from the global debounced port input*/ /*Check from the global debounced port input*/
/*check for pin HIGH*/ /*check for pin HIGH*/
if(debounced_state & (1<<b->input_pin)) { if (debounced_state & (1 << b->input_pin)) {
b->is_pressed = 0; b->is_pressed = 0;
} }
/*otherwise assume pin LOW*/ /*otherwise assume pin LOW*/
else{ else {
b->is_pressed = 1; b->is_pressed = 1;
} }
} }
static void UpdateButtonOutput(btn_state *b) static void UpdateButtonOutput(btn_state *b) {
{
/*If the button is actually pressed.*/ /*If the button is actually pressed.*/
if(b->is_pressed){ if (b->is_pressed) {
/*If this is a new event.*/ /*If this is a new event.*/
if(!b->is_long_pressed && !b->timer_enabled){ if (!b->is_long_pressed && !b->timer_enabled) {
/*Then start the timer and update the output*/ /*Then start the timer and update the output*/
ToggleOutput(b); ToggleOutput(b);
StartButtonTimer(b); StartButtonTimer(b);
@ -245,28 +217,27 @@ static void UpdateButtonOutput(btn_state *b)
} }
/*If the timer is already going.*/ /*If the timer is already going.*/
else if(b->timer_enabled){ else if (b->timer_enabled) {
/*Then just check if it's hit the threshold.*/ /*Then just check if it's hit the threshold.*/
CheckButtonLongpress(b); CheckButtonLongpress(b);
return; return;
} }
else{ else {
return; return;
} }
} }
/*Else the button was realeased*/ /*Else the button was realeased*/
else if(!b->is_pressed){ else if (!b->is_pressed) {
/*If the button was released on a long press.*/ /*If the button was released on a long press.*/
if(b->is_long_pressed){ if (b->is_long_pressed) {
ToggleOutput(b); ToggleOutput(b);
} }
ClearButtonTimer(b); ClearButtonTimer(b);
} }
} }
/* /*
* ############################ * ############################
* DEBOUNCING CODE * DEBOUNCING CODE
@ -279,54 +250,47 @@ static void UpdateButtonOutput(btn_state *b)
* DESCRIPTION: Updates the global debounced state. This function * DESCRIPTION: Updates the global debounced state. This function
* should be called in a ISR a set rate using the hardware timer. * should be called in a ISR a set rate using the hardware timer.
*/ */
static inline void DebounceSwitch() static inline void DebounceSwitch() {
{
uint8_t i, j; uint8_t i, j;
db_state[idx] = PINB & 0xFF; db_state[idx] = PINB & 0xFF;
idx+=1; idx += 1;
j = 0xff; j = 0xff;
/*Loop through a number of checks*/ /*Loop through a number of checks*/
for(i = 0; i < MAX_CHECKS; i++) { for (i = 0; i < MAX_CHECKS; i++) {
j = j & db_state[i]; j = j & db_state[i];
} }
debounced_state = j; debounced_state = j;
if(idx >= MAX_CHECKS) { if (idx >= MAX_CHECKS) {
idx = 0; idx = 0;
} }
} }
/*Setup the timer0 on the AVR*/ /*Setup the timer0 on the AVR*/
static inline void InitTimer0() static inline void InitTimer0() {
{
/*Zero out the tick_count var*/ /*Zero out the tick_count var*/
tick_count = 0; tick_count = 0;
/*config to normal mode.*/ /*config to normal mode.*/
TCCR0A = 0x00; //stop timer TCCR0A = 0x00; // stop timer
TCCR0B = 0x00; //zero timer TCCR0B = 0x00; // zero timer
/*set prescaler*/ /*set prescaler*/
//Set to div64 // Set to div64
TCCR0B |= (1<<CS01)|(1<<CS00); TCCR0B |= (1 << CS01) | (1 << CS00);
/*Enable global interrupts*/ /*Enable global interrupts*/
sei(); sei();
/*Enabling timer0 interrupt*/ /*Enabling timer0 interrupt*/
TCNT0 = 0; TCNT0 = 0;
TIMSK0 |= (1<<TOIE0); TIMSK0 |= (1 << TOIE0);
} }
// ISR(TIMER0_OVF_vect)
//ISR(TIMER0_OVF_vect)
/*The interrupt service routine for the timer0*/ /*The interrupt service routine for the timer0*/
ISR(TIM0_OVF_vect) ISR(TIM0_OVF_vect) {
{
/*Disable global interrupts*/ /*Disable global interrupts*/
cli(); cli();
@ -334,7 +298,7 @@ ISR(TIM0_OVF_vect)
DebounceSwitch(); DebounceSwitch();
/*Update the tick_count*/ /*Update the tick_count*/
if(btn1.timer_enabled && btn1.pressed_ticks <= UINT8_MAX){ if (btn1.timer_enabled && btn1.pressed_ticks <= UINT8_MAX) {
btn1.pressed_ticks += 1; btn1.pressed_ticks += 1;
} }