mirror of
				https://github.com/esphome/esphome.git
				synced 2025-11-04 09:01:49 +00:00 
			
		
		
		
	Compare commits
	
		
			9 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					59c192becc | ||
| 
						 | 
					a800816750 | ||
| 
						 | 
					99d9ab4e40 | ||
| 
						 | 
					f310ca1b74 | ||
| 
						 | 
					f763daa577 | ||
| 
						 | 
					970563e07b | ||
| 
						 | 
					e006045f59 | ||
| 
						 | 
					fff3645901 | ||
| 
						 | 
					a5383fd208 | 
@@ -394,7 +394,7 @@ def command_update_all(args):
 | 
			
		||||
    import click
 | 
			
		||||
 | 
			
		||||
    success = {}
 | 
			
		||||
    files = list_yaml_files(args.configuration)
 | 
			
		||||
    files = list_yaml_files(args.configuration[0])
 | 
			
		||||
    twidth = 60
 | 
			
		||||
 | 
			
		||||
    def print_bar(middle_text):
 | 
			
		||||
@@ -408,7 +408,7 @@ def command_update_all(args):
 | 
			
		||||
        print("-" * twidth)
 | 
			
		||||
        print()
 | 
			
		||||
        rc = run_external_process(
 | 
			
		||||
            "esphome", "--dashboard", "run", f, "--no-logs", "--device", "OTA"
 | 
			
		||||
            "esphome", "--dashboard", "run", "--no-logs", "--device", "OTA", f
 | 
			
		||||
        )
 | 
			
		||||
        if rc == 0:
 | 
			
		||||
            print_bar("[{}] {}".format(color(Fore.BOLD_GREEN, "SUCCESS"), f))
 | 
			
		||||
 
 | 
			
		||||
@@ -91,7 +91,16 @@ bool ESP32BLE::ble_setup_() {
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  err = esp_ble_gap_set_device_name(App.get_name().c_str());
 | 
			
		||||
  std::string name = App.get_name();
 | 
			
		||||
  if (name.length() > 20) {
 | 
			
		||||
    if (App.is_name_add_mac_suffix_enabled()) {
 | 
			
		||||
      name.erase(name.begin() + 13, name.end() - 7);  // Remove characters between 13 and the mac address
 | 
			
		||||
    } else {
 | 
			
		||||
      name = name.substr(0, 20);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  err = esp_ble_gap_set_device_name(name.c_str());
 | 
			
		||||
  if (err != ESP_OK) {
 | 
			
		||||
    ESP_LOGE(TAG, "esp_ble_gap_set_device_name failed: %d", err);
 | 
			
		||||
    return false;
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 | 
			
		||||
MAJOR_VERSION = 1
 | 
			
		||||
MINOR_VERSION = 19
 | 
			
		||||
PATCH_VERSION = "0b5"
 | 
			
		||||
PATCH_VERSION = "0"
 | 
			
		||||
__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 | 
			
		||||
__version__ = f"{__short_version__}.{PATCH_VERSION}"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -38,6 +38,7 @@ namespace esphome {
 | 
			
		||||
class Application {
 | 
			
		||||
 public:
 | 
			
		||||
  void pre_setup(const std::string &name, const char *compilation_time, bool name_add_mac_suffix) {
 | 
			
		||||
    this->name_add_mac_suffix_ = name_add_mac_suffix;
 | 
			
		||||
    if (name_add_mac_suffix) {
 | 
			
		||||
      this->name_ = name + "-" + get_mac_address().substr(6);
 | 
			
		||||
    } else {
 | 
			
		||||
@@ -97,6 +98,8 @@ class Application {
 | 
			
		||||
  /// Get the name of this Application set by set_name().
 | 
			
		||||
  const std::string &get_name() const { return this->name_; }
 | 
			
		||||
 | 
			
		||||
  bool is_name_add_mac_suffix_enabled() const { return this->name_add_mac_suffix_; }
 | 
			
		||||
 | 
			
		||||
  const std::string &get_compilation_time() const { return this->compilation_time_; }
 | 
			
		||||
 | 
			
		||||
  /** Set the target interval with which to run the loop() calls.
 | 
			
		||||
@@ -245,6 +248,7 @@ class Application {
 | 
			
		||||
 | 
			
		||||
  std::string name_;
 | 
			
		||||
  std::string compilation_time_;
 | 
			
		||||
  bool name_add_mac_suffix_;
 | 
			
		||||
  uint32_t last_loop_{0};
 | 
			
		||||
  uint32_t loop_interval_{16};
 | 
			
		||||
  int dump_config_at_{-1};
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user