Revert "Fetch upstream dev changes"

This reverts commit 6e88e33171, reversing
changes made to 580fe77fb7.

lib/one_wire/ibutton/ibutton_key.c

@@ -4,6 +4,7 @@
 
 struct iButtonKey {
     uint8_t data[IBUTTON_KEY_DATA_SIZE];
+    char name[IBUTTON_KEY_NAME_SIZE];
     iButtonKeyType type;
 };
 
@@ -41,6 +42,14 @@ uint8_t ibutton_key_get_data_size(iButtonKey* key) {
     return ibutton_key_get_size_by_type(key->type);
 }
 
+void ibutton_key_set_name(iButtonKey* key, const char* name) {
+    strlcpy(key->name, name, IBUTTON_KEY_NAME_SIZE);
+}
+
+const char* ibutton_key_get_name_p(iButtonKey* key) {
+    return key->name;
+}
+
 void ibutton_key_set_type(iButtonKey* key, iButtonKeyType key_type) {
     key->type = key_type;
 }

lib/one_wire/ibutton/ibutton_key.h

@@ -68,6 +68,20 @@ const uint8_t* ibutton_key_get_data_p(iButtonKey* key);
  */
 uint8_t ibutton_key_get_data_size(iButtonKey* key);
 
+/**
+ * Set key name
+ * @param key 
+ * @param name 
+ */
+void ibutton_key_set_name(iButtonKey* key, const char* name);
+
+/**
+ * Get pointer to key name
+ * @param key 
+ * @return const char* 
+ */
+const char* ibutton_key_get_name_p(iButtonKey* key);
+
 /**
  * Set key type
  * @param key 

lib/toolbox/path.c

@@ -19,20 +19,6 @@ void path_extract_filename_no_ext(const char* path, string_t filename) {
     string_mid(filename, start_position, end_position - start_position);
 }
 
-void path_extract_filename(string_t path, string_t name, bool trim_ext) {
-    size_t filename_start = string_search_rchar(path, '/');
-    if(filename_start > 0) {
-        filename_start++;
-        string_set_n(name, path, filename_start, string_size(path) - filename_start);
-    }
-    if(trim_ext) {
-        size_t dot = string_search_rchar(name, '.');
-        if(dot > 0) {
-            string_left(name, dot);
-        }
-    }
-}
-
 static inline void path_cleanup(string_t path) {
     string_strim(path);
     while(string_end_with_str_p(path, "/")) {

lib/toolbox/path.h

@@ -14,15 +14,6 @@ extern "C" {
  */
 void path_extract_filename_no_ext(const char* path, string_t filename);
 
-/**
- * @brief Extract filename string from path.
- * 
- * @param path path string
- * @param filename output filename string. Must be initialized before.
- * @param trim_ext true - get filename without extension
- */
-void path_extract_filename(string_t path, string_t filename, bool trim_ext);
-
 /**
  * @brief Extract last path component
  *