Fixed issue with Taster.c to disable JTAG so Pin 2 on PORTC can be used as GPIO Pin
This commit is contained in:
parent
0eace5b6fe
commit
663d817b11
@ -2,17 +2,17 @@
|
||||
|
||||
void
|
||||
Led_init (void){
|
||||
DDRB = 0xFF; // Set all bits in the B Data-Direction Register to output
|
||||
PORTB = 0x00; // Set all bits in the PORT B Register to low to turn all LEDs off
|
||||
DDRB = 0xFF; /* Set all bits in the B Data-Direction Register to output */
|
||||
PORTB = 0x00; /* Set all bits in the PORT B Register to low to turn all LEDs off */
|
||||
}
|
||||
|
||||
void
|
||||
Led1_On (void){
|
||||
PORTB |= (1<<7); // Set the bit for LED_1 to hight to turn it on
|
||||
PORTB |= (1<<7); /* Set the bit for LED_1 to hight to turn it on */
|
||||
}
|
||||
void
|
||||
Led1_Off (void){
|
||||
PORTB &= ~(1<<7); // Set the bit for LED_1 to low to turn it off
|
||||
PORTB &= ~(1<<7); /* Set the bit for LED_1 to low to turn it off */
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -2,11 +2,20 @@
|
||||
|
||||
void
|
||||
Taster_init (void){
|
||||
DDRD &= ~(0b111<<5); // Set bit 5-7 of Data Direction Register D as input
|
||||
DDRC &= ~(1<<2); // Set bit 2 of Data Direction Register C as input
|
||||
DDRD &= ~(0b111<<5); /* Set bit 5-7 of Data Direction Register D as input */
|
||||
DDRC &= ~(1<<2); /* Set bit 2 of Data Direction Register C as input */
|
||||
|
||||
PORTD |= (0b111<<5); // Initialize bit 5-7 of PORTD as for pull up resistor
|
||||
PORTC |= (1<<2); // Initialize bit 2 of PORTC as for pull up resistor
|
||||
PORTD |= (0b111<<5); /* Initialize bit 5-7 of PORTD as for pull up resistor */
|
||||
PORTC |= (1<<PINC2); /* Initialize bit 2 of PORTC as for pull up resistor */
|
||||
|
||||
/** Disable JTAG so Pin 2 of PORTC can be used as a GPIO
|
||||
* Command needs to be run twice - see MCU Control Register Description (23.8.1)
|
||||
* Bits 7 – JTD: JTAG Interface Disable
|
||||
* [..] The application software must write this bit to the desired value
|
||||
* twice within four cycles to change its value. [...]
|
||||
*/
|
||||
MCUCR |= (1<<JTD);
|
||||
MCUCR |= (1<<JTD);
|
||||
}
|
||||
|
||||
uint8_t
|
||||
|
@ -8,20 +8,20 @@
|
||||
#include "Led.h"
|
||||
#include "Taster.h"
|
||||
#include "Timer.h"
|
||||
#include <util/delay.h>
|
||||
#include <avr/interrupt.h>
|
||||
#ifdef F_CPU
|
||||
#define F_CPU 1000000
|
||||
#endif
|
||||
#include <util/delay.h>
|
||||
|
||||
/* function declarations */
|
||||
void buttonTest (void);
|
||||
void task1 (void);
|
||||
void tast2 (void);
|
||||
void task2 (void);
|
||||
void task3 (void);
|
||||
|
||||
/* global variables */
|
||||
volatile int g_counter = 0;
|
||||
int ledStatus = 0;
|
||||
uint16_t startMS;
|
||||
int g_ledStatus = 0;
|
||||
uint16_t g_startMS;
|
||||
|
||||
/* functions */
|
||||
int
|
||||
@ -33,44 +33,32 @@ main (void)
|
||||
Led_init();
|
||||
Taster_init();
|
||||
Timer_init();
|
||||
|
||||
|
||||
/* Run Task 1
|
||||
g_startMS=Timer_getTick();
|
||||
|
||||
while (1)
|
||||
{
|
||||
task1();
|
||||
}//*/
|
||||
|
||||
|
||||
/* Run Task 2 */
|
||||
startMS=Timer_getTick();
|
||||
while (1)
|
||||
{
|
||||
task2();
|
||||
}//*/
|
||||
buttonTest();
|
||||
//task1();
|
||||
//task2();
|
||||
//task3();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Task 2 (2021-10-28) */
|
||||
void
|
||||
task2 () {
|
||||
if(Timer_getTick()-startMS >= 1000) { /* Wait 1000ms before switching LED1 */
|
||||
startMS=Timer_getTick();
|
||||
|
||||
if(ledStatus % 2 == 0){
|
||||
Led1_On();
|
||||
} else {
|
||||
Led1_Off();
|
||||
}
|
||||
ledStatus++;
|
||||
}
|
||||
void
|
||||
buttonTest (void)
|
||||
{
|
||||
Taster1_get() ? Led1_On() : Led1_Off();
|
||||
Taster2_get() ? Led2_On() : Led2_Off();
|
||||
Taster3_get() ? Led3_On() : Led3_Off();
|
||||
Taster4_get() ? Led4_On() : Led4_Off();
|
||||
}
|
||||
|
||||
|
||||
/* Task 1 (2021-10-21) */
|
||||
void
|
||||
task1 () {
|
||||
_delay_ms(50);
|
||||
task1 (void)
|
||||
{
|
||||
_delay_ms(100);
|
||||
|
||||
/* Programmieren Sie ein Lauflicht. Nutzen Sie dazu die in „Led.h“ deklarierten
|
||||
* Funktionen.
|
||||
@ -101,4 +89,26 @@ task1 () {
|
||||
g_counter >= 6 ? Led6_On() : Led6_Off();
|
||||
g_counter >= 7 ? Led7_On() : Led7_Off();
|
||||
g_counter >= 8 ? Led8_On() : Led8_Off();
|
||||
}
|
||||
|
||||
/* Task 2 (2021-10-28) */
|
||||
void
|
||||
task2 (void)
|
||||
{
|
||||
if(Timer_getTick() - g_startMS >= 1000) { /* Wait 1000ms before switching LED1 */
|
||||
g_startMS=Timer_getTick();
|
||||
|
||||
if(g_ledStatus % 2 == 0){
|
||||
Led1_On();
|
||||
} else {
|
||||
Led1_Off();
|
||||
}
|
||||
g_ledStatus++;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
task3 (void)
|
||||
{
|
||||
// beep boop
|
||||
}
|
Loading…
Reference in New Issue
Block a user