Merge remote-tracking branch 'upstream/dev' into sen0501

This commit is contained in:
thetestspecimen 2024-06-12 14:00:19 +03:00
commit cb8ffbd2e7
No known key found for this signature in database
GPG Key ID: C88001C355A25170
13 changed files with 29 additions and 5 deletions

View File

@ -454,7 +454,7 @@ jobs:
matrix:
file: ${{ fromJson(needs.list-components.outputs.components) }}
steps:
- name: Install libsodium
- name: Install dependencies
run: sudo apt-get install libsodium-dev libsdl2-dev
- name: Check out code from GitHub
@ -508,8 +508,8 @@ jobs:
- name: List components
run: echo ${{ matrix.components }}
- name: Install libsodium
run: sudo apt-get install libsodium-dev
- name: Install dependencies
run: sudo apt-get install libsodium-dev libsdl2-dev
- name: Check out code from GitHub
uses: actions/checkout@v4.1.6

View File

@ -488,6 +488,15 @@ def command_run(args, config):
if exit_code != 0:
return exit_code
_LOGGER.info("Successfully compiled program.")
if CORE.is_host:
from esphome.platformio_api import get_idedata
idedata = get_idedata(config)
if idedata is None:
return 1
program_path = idedata.raw["prog_path"]
return run_external_process(program_path)
port = choose_upload_log_host(
default=args.device,
check_default=None,

View File

@ -8,6 +8,7 @@ from esphome.const import (
CONF_INC_PIN,
CONF_UD_PIN,
CONF_INITIAL_VALUE,
CONF_STEP_DELAY,
)
CODEOWNERS = ["@EtienneMD"]
@ -26,6 +27,7 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_INITIAL_VALUE, default=1.0): cv.float_range(
min=0.01, max=1.0
),
cv.Optional(CONF_STEP_DELAY, default=1): cv.int_range(min=1, max=100),
}
)
)
@ -44,3 +46,4 @@ async def to_code(config):
cg.add(var.set_ud_pin(ud_pin))
cg.add(var.set_initial_value(config[CONF_INITIAL_VALUE]))
cg.add(var.set_step_delay(config[CONF_STEP_DELAY]))

View File

@ -22,9 +22,9 @@ void X9cOutput::trim_value(int change_amount) {
for (int i = 0; i < abs(change_amount); i++) { // Move wiper
this->inc_pin_->digital_write(true);
delayMicroseconds(1);
delayMicroseconds(this->step_delay_);
this->inc_pin_->digital_write(false);
delayMicroseconds(1);
delayMicroseconds(this->step_delay_);
}
delayMicroseconds(100); // Let value settle
@ -69,6 +69,7 @@ void X9cOutput::dump_config() {
LOG_PIN(" Increment Pin: ", this->inc_pin_);
LOG_PIN(" Up/Down Pin: ", this->ud_pin_);
ESP_LOGCONFIG(TAG, " Initial Value: %f", this->initial_value_);
ESP_LOGCONFIG(TAG, " Step Delay: %d", this->step_delay_);
LOG_FLOAT_OUTPUT(this);
}

View File

@ -13,6 +13,7 @@ class X9cOutput : public output::FloatOutput, public Component {
void set_inc_pin(InternalGPIOPin *pin) { inc_pin_ = pin; }
void set_ud_pin(InternalGPIOPin *pin) { ud_pin_ = pin; }
void set_initial_value(float initial_value) { initial_value_ = initial_value; }
void set_step_delay(int step_delay) { step_delay_ = step_delay; }
void setup() override;
void dump_config() override;
@ -26,6 +27,7 @@ class X9cOutput : public output::FloatOutput, public Component {
InternalGPIOPin *ud_pin_;
float initial_value_;
float pot_value_;
int step_delay_;
};
} // namespace x9c

View File

@ -784,6 +784,7 @@ CONF_STATIC_IP = "static_ip"
CONF_STATUS = "status"
CONF_STB_PIN = "stb_pin"
CONF_STEP = "step"
CONF_STEP_DELAY = "step_delay"
CONF_STEP_MODE = "step_mode"
CONF_STEP_PIN = "step_pin"
CONF_STOP = "stop"

View File

@ -10,6 +10,7 @@ from homeassistant.components.event import EventDeviceClass
from homeassistant.components.number import NumberDeviceClass
from homeassistant.components.sensor import SensorDeviceClass
from homeassistant.components.switch import SwitchDeviceClass
from homeassistant.components.update import UpdateDeviceClass
from homeassistant.components.valve import ValveDeviceClass
# pylint: enable=import-error
@ -27,6 +28,7 @@ DOMAINS = {
"number": NumberDeviceClass,
"sensor": SensorDeviceClass,
"switch": SwitchDeviceClass,
"update": UpdateDeviceClass,
"valve": ValveDeviceClass,
}

View File

@ -5,3 +5,4 @@ output:
inc_pin: 4
ud_pin: 5
initial_value: 0.5
step_delay: 50

View File

@ -5,3 +5,4 @@ output:
inc_pin: 4
ud_pin: 5
initial_value: 0.5
step_delay: 50

View File

@ -5,3 +5,4 @@ output:
inc_pin: 14
ud_pin: 15
initial_value: 0.5
step_delay: 50

View File

@ -5,3 +5,4 @@ output:
inc_pin: 14
ud_pin: 15
initial_value: 0.5
step_delay: 50

View File

@ -5,3 +5,4 @@ output:
inc_pin: 14
ud_pin: 15
initial_value: 0.5
step_delay: 50

View File

@ -5,3 +5,4 @@ output:
inc_pin: 4
ud_pin: 5
initial_value: 0.5
step_delay: 50