Compare commits

..

No commits in common. "d25ed85c3e8cab8dd0c2dc02a3aa849a8c549e65" and "f82a0cc732918087b0618c3ddedda6fcbe1c7a56" have entirely different histories.

4 changed files with 11 additions and 17 deletions

1
.gitignore vendored
View File

@ -3,4 +3,3 @@
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch
.vs/

View File

@ -49,6 +49,12 @@ const int PWM_CYCLE_VALUES[PWM_CYCLE_VALUES_COUNT] = {50, 125, 255};
char PWM_SET_STATE_TOPIC[70];
char PWM_SET_VALUE_TOPIC[70];
// Infrared Transciever
#define IR_RECIEVE_PIN 35
#define IR_SEND_PIN 17
#define MARK_EXCESS_MICROS 20
#define RAW_BUFFER_LENGTH 750
// LCD
int lcd_current_page = 1;
int lcd_pwmAdj_id = 0;
@ -63,6 +69,8 @@ Fan Speed 0: Auto, 1: High, 2: Mid, 3: Low
uint8_t ac_mode = 0;
uint8_t ac_fan_speed = 0;
uint8_t ac_temperature = 25;
#define AC_MAX_TEMPERATURE 30
#define AC_MIN_TEMPERATURE 18
char AC_SET_MODE_TOPIC[75];
char AC_SET_FAN_TOPIC[75];
char AC_SET_TEMPERATURE_TOPIC[75];
@ -958,11 +966,6 @@ void trigger13()
ESP.restart();
}
void trigger14() {
Serial.print("page dashboard");
lcd_send_stop_bit();
}
void eeprom_pwm_update()
{
if (memcmp(pwm_states, pwm_states_eeprom, 16))

View File

@ -77,7 +77,6 @@ void trigger10();
void trigger11();
void trigger12();
void trigger13();
void trigger14();
void eeprom_retrieve_init();
void eeprom_pwm_update();

View File

@ -1,13 +1,6 @@
#pragma once
#include <ESPMegaPRO.h>
// Infrared Transciever
#define IR_RECIEVE_PIN 35
#define IR_SEND_PIN 17
#define MARK_EXCESS_MICROS 20
#define RAW_BUFFER_LENGTH 750
#define AC_MAX_TEMPERATURE 30
#define AC_MIN_TEMPERATURE 15
extern const uint8_t ir_code_cool[3][16][750] = {
extern const uint16_t ir_code_cool[3][13][750] = {
// Fan Speed High
{
{0}, // 18C
@ -58,9 +51,9 @@ extern const uint8_t ir_code_cool[3][16][750] = {
{0} // 30C
}};
extern const uint8_t ir_code_fan[3][750] = {
extern const uint16_t ir_code_fan[3][750] = {
{0}, // LOW
{0}, // MED
{0} // HIGH
};
extern const uint8_t ir_code_off[750] = {0};
extern const uint16_t ir_code_off[750] = {0};