diff --git a/BOM_ATE0003.000.001.xlsx b/BOM_ATE0003.000.001.xlsx index ed98d18..67d72e4 100644 Binary files a/BOM_ATE0003.000.001.xlsx and b/BOM_ATE0003.000.001.xlsx differ diff --git a/src/ate0003.c b/src/ate0003.c index 08c746b..d989412 100644 --- a/src/ate0003.c +++ b/src/ate0003.c @@ -6,7 +6,7 @@ #include "zh_avr_ac_dimmer.h" #include "ate0003.h" -#define DEBUG +// #define DEBUG #define SYSTEM_SETUP_STACK 170 #define ENCODER_STACK 166 @@ -158,12 +158,13 @@ void system_setup_task(void *pvParameters) zh_avr_encoder_set(&component_encoder_handle, 0); //** AC dimmer init **/ zh_avr_ac_dimmer_init_config_t ac_dimmer_init_config = ZH_AVR_AC_DIMMER_INIT_CONFIG_DEFAULT(); - ac_dimmer_init_config.ac_dimmer_frequency = ZH_60HZ; + ac_dimmer_init_config.ac_dimmer_frequency = ZH_400HZ; ac_dimmer_init_config.zero_cross_port = AVR_PORTD; ac_dimmer_init_config.zero_cross_gpio = PORTD3; ac_dimmer_init_config.triac_port = AVR_PORTD; ac_dimmer_init_config.triac_gpio = PORTD4; zh_avr_ac_dimmer_init(&ac_dimmer_init_config); + zh_avr_ac_dimmer_set(100); is_initialized = true; #ifdef DEBUG printf("System Setup Task Remaining Stack Size %d.\n", uxTaskGetStackHighWaterMark(NULL)); @@ -224,6 +225,9 @@ void zh_avr_pcf8574_event_handler(zh_avr_pcf8574_event_on_isr_t *event) zh_avr_pcf8574_write_gpio(&led1_handle, NUM1_LED_BLUE, LED_OFF); zh_avr_pcf8574_write_gpio(&led1_handle, NUM1_LED_GREEN, LED_ON); zh_avr_pcf8574_write_gpio(&relay_handle, L1_RELAY, RELAY_ON); + zh_avr_pcf8574_write_gpio(&relay_handle, GROUND_RELAY, RELAY_ON); // Temporary. + vTaskDelay(10); // Temporary. + zh_avr_ac_dimmer_start(); // Temporary. } else { @@ -235,7 +239,10 @@ void zh_avr_pcf8574_event_handler(zh_avr_pcf8574_event_on_isr_t *event) } zh_avr_pcf8574_write_gpio(&led1_handle, NUM1_LED_BLUE, LED_ON); zh_avr_pcf8574_write_gpio(&led1_handle, NUM1_LED_GREEN, LED_OFF); + zh_avr_ac_dimmer_stop(); // Temporary. + vTaskDelay(10); // Temporary. zh_avr_pcf8574_write_gpio(&relay_handle, L1_RELAY, RELAY_OFF); + zh_avr_pcf8574_write_gpio(&relay_handle, GROUND_RELAY, RELAY_OFF); // Temporary. is_num1_fixed = false; } break; @@ -254,6 +261,9 @@ void zh_avr_pcf8574_event_handler(zh_avr_pcf8574_event_on_isr_t *event) zh_avr_pcf8574_write_gpio(&led1_handle, NUM2_LED_BLUE, LED_OFF); zh_avr_pcf8574_write_gpio(&led1_handle, NUM2_LED_GREEN, LED_ON); zh_avr_pcf8574_write_gpio(&relay_handle, L2_RELAY, RELAY_ON); + zh_avr_pcf8574_write_gpio(&relay_handle, GROUND_RELAY, RELAY_ON); // Temporary. + vTaskDelay(10); // Temporary. + zh_avr_ac_dimmer_start(); // Temporary. } else { @@ -265,7 +275,10 @@ void zh_avr_pcf8574_event_handler(zh_avr_pcf8574_event_on_isr_t *event) } zh_avr_pcf8574_write_gpio(&led1_handle, NUM2_LED_BLUE, LED_ON); zh_avr_pcf8574_write_gpio(&led1_handle, NUM2_LED_GREEN, LED_OFF); + zh_avr_ac_dimmer_stop(); // Temporary. + vTaskDelay(10); // Temporary. zh_avr_pcf8574_write_gpio(&relay_handle, L2_RELAY, RELAY_OFF); + zh_avr_pcf8574_write_gpio(&relay_handle, GROUND_RELAY, RELAY_OFF); // Temporary. is_num2_fixed = false; } break;