ziggi/pa50contr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Олег Бородин
2024-08-21 10:44:56 +02:00
parent 47aa56cfa7
commit 2ccb2b6da2
6 changed files with 32 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
contr.c
View File

@@ -11,13 +11,15 @@
#include <avr/interrupt.h>
#include <util/delay.h>
#include <tool.h>
#include <eeprom.h>
#include <disp.h>
#include <tool.h>
#include <uart.h>
#include <temp.h>
#include <relay.h>
#include <timer.h>
#include <adc.h>
#include <contr.h>
@@ -87,12 +89,6 @@ void contr_init(void) {
void contr_setup(void) {
contr_read_band();
contr_key_init();
adc_init();
timer0_init();
}
@@ -251,22 +247,10 @@ void contr_main(void) {
}
void contr_vcc_measure(void) {
REG_SETUP_BIT(ADMUX, MUX0);
REG_SETUP_BIT(ADMUX, MUX1);
REG_SETDOWN_BIT(ADMUX, MUX2);
REG_SETDOWN_BIT(ADMUX, MUX3);
REG_SETUP_BIT(ADCSRA, ADSC);
while (ADCSRA & BIT(ADSC));
uint16_t lval = (uint16_t)ADCL;
uint16_t hval = (uint16_t)ADCH;
hval = (hval << 8) & 0xFF00;
lval = lval & 0x00FF;
if (++contr.vcc_pos > VCC_SIZE) {
contr.vcc_pos = 0;
}
contr.vcc[contr.vcc_pos] = (hval | lval);
contr.vcc[contr.vcc_pos] = adc_read(ACD_CHANELL3);
}
#define CONTR_VCC_SCALE 2673.0F
@@ -289,22 +273,10 @@ float contr_vcc_calc(void) {
}
void contr_fwd_measure(void) {
REG_SETUP_BIT(ADMUX, MUX0);
REG_SETDOWN_BIT(ADMUX, MUX1);
REG_SETDOWN_BIT(ADMUX, MUX2);
REG_SETDOWN_BIT(ADMUX, MUX3);
REG_SETUP_BIT(ADCSRA, ADSC);
while (ADCSRA & BIT(ADSC));
uint16_t lval = (uint16_t)ADCL;
uint16_t hval = (uint16_t)ADCH;
hval = (hval << 8) & 0xFF00;
lval = lval & 0x00FF;
if (++contr.fwd_pos > FWD_SIZE) {
contr.fwd_pos = 0;
}
contr.fwd[contr.fwd_pos] = (hval | lval);
contr.fwd[contr.fwd_pos] = adc_read(ACD_CHANELL1);
}
float contr_fwd_calc(void) {
@@ -319,22 +291,10 @@ float contr_fwd_calc(void) {
}
void contr_rev_measure(void) {
REG_SETDOWN_BIT(ADMUX, MUX0);
REG_SETDOWN_BIT(ADMUX, MUX1);
REG_SETDOWN_BIT(ADMUX, MUX2);
REG_SETDOWN_BIT(ADMUX, MUX3);
REG_SETUP_BIT(ADCSRA, ADSC);
while (ADCSRA & BIT(ADSC));
uint16_t lval = (uint16_t)ADCL;
uint16_t hval = (uint16_t)ADCH;
hval = (hval << 8) & 0xFF00;
lval = lval & 0x00FF;
if (++contr.rev_pos > REV_SIZE) {
contr.rev_pos = 0;
}
contr.rev[contr.rev_pos] = (hval | lval);
contr.rev[contr.rev_pos] = adc_read(ACD_CHANELL0);;
}
float contr_rev_calc(void) {
@@ -356,18 +316,6 @@ void contr_read_band(void) {
eeprom_read_bytes(0x00, &contr.band, sizeof(contr.band));
}
void contr_key_init(void) {
/* D3 PD3: Set key input */
REG_SETDOWN_BIT(DDRD, PD3);
REG_SETUP_BIT(PORTD, PD3);
}
bool contr_key_is_pressed(void) {
if (REG_BIT_VALUE(PIND, PD3)) {
return true;
}
return false;
}
#define CONTR_KEY_CNTINPRESS 100
#define CONTR_KEY_CNTRELEASE 100
@@ -377,7 +325,7 @@ bool contr_key_is_pressed(void) {
void contr_key_handle(void) {
if (!contr.key_was_pressed) {
if (contr_key_is_pressed()) {
if (button_is_pressed()) {
contr.key_time_counter++;
contr.key_time_untap++;
}
@@ -386,7 +334,7 @@ void contr_key_handle(void) {
contr.key_was_pressed = true;
}
} else {
if (!contr_key_is_pressed()) {
if (!button_is_pressed()) {
contr.key_time_counter++;
}
if (contr.key_time_counter > CONTR_KEY_CNTRELEASE) {