client_code_fg004
/
thermostat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Wrote code to pass new tests for hysteresis

This commit is contained in:
jakeg00dwin 2024-10-18 22:15:45 -07:00
parent 8d7af1d678
commit 4ba6863eae
1 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/load/load.c
View File

@ -40,7 +40,29 @@ static bool is_valid_load(uint16_t val)
static bool is_below_target(uint16_t val) static bool is_below_target(uint16_t val)
{ {
if(val < HYSTERESIS){ if(val < HYSTERESIS_HI){
return true;
}
return false;
}
static bool is_high_valid(uint16_t val, bool output_level)
{
if(val < HYSTERESIS_LO){
return true;
}
else if(val <= HYSTERESIS_HI && output_level) {
return true;
}
return false;
}
static bool is_low_valid(uint16_t val, bool output_level)
{
if(val > HYSTERESIS_HI) {
return true;
}
else if(val >= HYSTERESIS_HI && output_level) {
return true; return true;
} }
return false; return false;
@ -60,6 +82,8 @@ static uint16_t sample_adc(uint8_t adc_pin)
void Load_HandleLoadPortA(uint8_t adc_pin, uint8_t out_pin) void Load_HandleLoadPortA(uint8_t adc_pin, uint8_t out_pin)
{ {
uint16_t val = sample_adc(adc_pin); uint16_t val = sample_adc(adc_pin);
bool out_state = RegEdit_IsBitSet((void *) &PORTA.OUT, out_pin);
if(porta_disabled[adc_pin]) { if(porta_disabled[adc_pin]) {
RegEdit_ClearBit((void *) &PORTA.OUT, out_pin); RegEdit_ClearBit((void *) &PORTA.OUT, out_pin);
} }
@ -67,10 +91,13 @@ void Load_HandleLoadPortA(uint8_t adc_pin, uint8_t out_pin)
RegEdit_ClearBit((void *) &PORTA.OUT, out_pin); RegEdit_ClearBit((void *) &PORTA.OUT, out_pin);
porta_disabled[adc_pin] = true; porta_disabled[adc_pin] = true;
} }
else if(is_below_target(val)){ else if(is_high_valid(val, out_state)) {
RegEdit_SetBit((void *) &PORTA.DIR, out_pin); RegEdit_SetBit((void *) &PORTA.DIR, out_pin);
RegEdit_SetBit((void *) &PORTA.OUT, out_pin); RegEdit_SetBit((void *) &PORTA.OUT, out_pin);
} }
else if(is_low_valid(val, out_pin)) {
RegEdit_ClearBit((void *) &PORTA.OUT, out_pin);
}
else { else {
RegEdit_ClearBit((void *) &PORTA.OUT, out_pin); RegEdit_ClearBit((void *) &PORTA.OUT, out_pin);
} }
@ -79,6 +106,8 @@ void Load_HandleLoadPortA(uint8_t adc_pin, uint8_t out_pin)
void Load_HandleLoadPortB(uint8_t adc_pin, uint8_t out_pin) void Load_HandleLoadPortB(uint8_t adc_pin, uint8_t out_pin)
{ {
uint16_t val = sample_adc(adc_pin); uint16_t val = sample_adc(adc_pin);
bool out_state = RegEdit_IsBitSet((void *) &PORTB.OUT, out_pin);
if(portb_disabled[adc_pin]) { if(portb_disabled[adc_pin]) {
RegEdit_ClearBit((void *) &PORTB.OUT, out_pin); RegEdit_ClearBit((void *) &PORTB.OUT, out_pin);
} }
@ -86,10 +115,13 @@ void Load_HandleLoadPortB(uint8_t adc_pin, uint8_t out_pin)
RegEdit_ClearBit((void *) &PORTB.OUT, out_pin); RegEdit_ClearBit((void *) &PORTB.OUT, out_pin);
portb_disabled[adc_pin] = true; portb_disabled[adc_pin] = true;
} }
else if(is_below_target(val)) { else if(is_high_valid(val, out_state)) {
RegEdit_SetBit((void *) &PORTB.DIR, out_pin); RegEdit_SetBit((void *) &PORTB.DIR, out_pin);
RegEdit_SetBit((void *) &PORTB.OUT, out_pin); RegEdit_SetBit((void *) &PORTB.OUT, out_pin);
} }
else if(is_low_valid(val, out_pin)) {
RegEdit_ClearBit((void *) &PORTB.OUT, out_pin);
}
else { else {
RegEdit_ClearBit((void *) &PORTB.OUT, out_pin); RegEdit_ClearBit((void *) &PORTB.OUT, out_pin);
} }