From 0917494a80da701dd787e2d06aa08b12e1b71099 Mon Sep 17 00:00:00 2001
From: Georgii Surkov <37121527+gsurkov@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:23:17 +0300
Subject: [PATCH] [FL-3168] Add one_wire lib to f18, separate ibutton (#2509)

* Separate ibutton to its own module, add one_wire to f18
* Move onewire cli to a separate app

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
---
 applications/main/application.fam             |  1 +
 applications/main/ibutton/ibutton_cli.c       | 64 +----------------
 applications/main/ibutton/ibutton_i.h         |  4 +-
 applications/main/onewire/application.fam     | 14 ++++
 applications/main/onewire/onewire_cli.c       | 72 +++++++++++++++++++
 firmware/targets/f18/api_symbols.csv          | 31 ++++++++
 firmware/targets/f18/target.json              |  5 +-
 firmware/targets/f7/api_symbols.csv           |  6 +-
 firmware/targets/f7/target.json               |  3 +-
 lib/SConscript                                |  1 +
 lib/ibutton/SConscript                        | 24 +++++++
 lib/{one_wire => }/ibutton/ibutton_key.c      |  0
 lib/{one_wire => }/ibutton/ibutton_key.h      |  0
 lib/{one_wire => }/ibutton/ibutton_key_i.h    |  0
 .../ibutton/ibutton_protocols.c               |  0
 .../ibutton/ibutton_protocols.h               |  0
 lib/{one_wire => }/ibutton/ibutton_worker.c   |  0
 lib/{one_wire => }/ibutton/ibutton_worker.h   |  0
 lib/{one_wire => }/ibutton/ibutton_worker_i.h |  0
 .../ibutton/ibutton_worker_modes.c            |  0
 .../ibutton/protocols/blanks/rw1990.c         |  0
 .../ibutton/protocols/blanks/rw1990.h         |  0
 .../ibutton/protocols/blanks/tm2004.c         |  0
 .../ibutton/protocols/blanks/tm2004.h         |  0
 .../ibutton/protocols/dallas/dallas_common.c  |  0
 .../ibutton/protocols/dallas/dallas_common.h  |  0
 .../protocols/dallas/protocol_dallas_base.h   |  0
 .../protocols/dallas/protocol_ds1971.c        |  0
 .../protocols/dallas/protocol_ds1971.h        |  0
 .../protocols/dallas/protocol_ds1990.c        |  0
 .../protocols/dallas/protocol_ds1990.h        |  0
 .../protocols/dallas/protocol_ds1992.c        |  0
 .../protocols/dallas/protocol_ds1992.h        |  0
 .../protocols/dallas/protocol_ds1996.c        |  0
 .../protocols/dallas/protocol_ds1996.h        |  0
 .../protocols/dallas/protocol_ds_generic.c    |  0
 .../protocols/dallas/protocol_ds_generic.h    |  0
 .../protocols/dallas/protocol_group_dallas.c  |  0
 .../protocols/dallas/protocol_group_dallas.h  |  0
 .../dallas/protocol_group_dallas_defs.c       |  0
 .../dallas/protocol_group_dallas_defs.h       |  0
 .../ibutton/protocols/misc/protocol_cyfral.c  |  0
 .../ibutton/protocols/misc/protocol_cyfral.h  |  0
 .../protocols/misc/protocol_group_misc.c      |  0
 .../protocols/misc/protocol_group_misc.h      |  0
 .../protocols/misc/protocol_group_misc_defs.c |  0
 .../protocols/misc/protocol_group_misc_defs.h |  0
 .../ibutton/protocols/misc/protocol_metakom.c |  0
 .../ibutton/protocols/misc/protocol_metakom.h |  0
 .../ibutton/protocols/protocol_common.h       |  0
 .../ibutton/protocols/protocol_common_i.h     |  0
 .../ibutton/protocols/protocol_group_base.h   |  0
 .../ibutton/protocols/protocol_group_defs.c   |  0
 .../ibutton/protocols/protocol_group_defs.h   |  0
 lib/one_wire/SConscript                       |  3 -
 55 files changed, 156 insertions(+), 72 deletions(-)
 create mode 100644 applications/main/onewire/application.fam
 create mode 100644 applications/main/onewire/onewire_cli.c
 create mode 100644 lib/ibutton/SConscript
 rename lib/{one_wire => }/ibutton/ibutton_key.c (100%)
 rename lib/{one_wire => }/ibutton/ibutton_key.h (100%)
 rename lib/{one_wire => }/ibutton/ibutton_key_i.h (100%)
 rename lib/{one_wire => }/ibutton/ibutton_protocols.c (100%)
 rename lib/{one_wire => }/ibutton/ibutton_protocols.h (100%)
 rename lib/{one_wire => }/ibutton/ibutton_worker.c (100%)
 rename lib/{one_wire => }/ibutton/ibutton_worker.h (100%)
 rename lib/{one_wire => }/ibutton/ibutton_worker_i.h (100%)
 rename lib/{one_wire => }/ibutton/ibutton_worker_modes.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/blanks/rw1990.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/blanks/rw1990.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/blanks/tm2004.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/blanks/tm2004.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/dallas_common.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/dallas_common.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_dallas_base.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1971.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1971.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1990.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1990.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1992.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1992.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1996.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds1996.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds_generic.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_ds_generic.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_group_dallas.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_group_dallas.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_group_dallas_defs.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/dallas/protocol_group_dallas_defs.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_cyfral.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_cyfral.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_group_misc.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_group_misc.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_group_misc_defs.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_group_misc_defs.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_metakom.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/misc/protocol_metakom.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/protocol_common.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/protocol_common_i.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/protocol_group_base.h (100%)
 rename lib/{one_wire => }/ibutton/protocols/protocol_group_defs.c (100%)
 rename lib/{one_wire => }/ibutton/protocols/protocol_group_defs.h (100%)

diff --git a/applications/main/application.fam b/applications/main/application.fam
index 1fc30990..5c2c21d3 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -4,6 +4,7 @@ App(
     apptype=FlipperAppType.METAPACKAGE,
     provides=[
         "gpio",
+        "onewire",
         "ibutton",
         "infrared",
         "lfrfid",
diff --git a/applications/main/ibutton/ibutton_cli.c b/applications/main/ibutton/ibutton_cli.c
index 2b88b200..54bc808b 100644
--- a/applications/main/ibutton/ibutton_cli.c
+++ b/applications/main/ibutton/ibutton_cli.c
@@ -4,25 +4,20 @@
 #include <cli/cli.h>
 #include <toolbox/args.h>
 
-#include <one_wire/one_wire_host.h>
-
-#include <one_wire/ibutton/ibutton_key.h>
-#include <one_wire/ibutton/ibutton_worker.h>
-#include <one_wire/ibutton/ibutton_protocols.h>
+#include <ibutton/ibutton_key.h>
+#include <ibutton/ibutton_worker.h>
+#include <ibutton/ibutton_protocols.h>
 
 static void ibutton_cli(Cli* cli, FuriString* args, void* context);
-static void onewire_cli(Cli* cli, FuriString* args, void* context);
 
 // app cli function
 void ibutton_on_system_start() {
 #ifdef SRV_CLI
     Cli* cli = furi_record_open(RECORD_CLI);
     cli_add_command(cli, "ikey", CliCommandFlagDefault, ibutton_cli, cli);
-    cli_add_command(cli, "onewire", CliCommandFlagDefault, onewire_cli, cli);
     furi_record_close(RECORD_CLI);
 #else
     UNUSED(ibutton_cli);
-    UNUSED(onewire_cli);
 #endif
 }
 
@@ -257,56 +252,3 @@ void ibutton_cli(Cli* cli, FuriString* args, void* context) {
 
     furi_string_free(cmd);
 }
-
-static void onewire_cli_print_usage() {
-    printf("Usage:\r\n");
-    printf("onewire search\r\n");
-};
-
-static void onewire_cli_search(Cli* cli) {
-    UNUSED(cli);
-    OneWireHost* onewire = onewire_host_alloc(&ibutton_gpio);
-    uint8_t address[8];
-    bool done = false;
-
-    printf("Search started\r\n");
-
-    onewire_host_start(onewire);
-    furi_hal_power_enable_otg();
-
-    while(!done) {
-        if(onewire_host_search(onewire, address, OneWireHostSearchModeNormal) != 1) {
-            printf("Search finished\r\n");
-            onewire_host_reset_search(onewire);
-            done = true;
-        } else {
-            printf("Found: ");
-            for(uint8_t i = 0; i < 8; i++) {
-                printf("%02X", address[i]);
-            }
-            printf("\r\n");
-        }
-        furi_delay_ms(100);
-    }
-
-    furi_hal_power_disable_otg();
-    onewire_host_free(onewire);
-}
-
-void onewire_cli(Cli* cli, FuriString* args, void* context) {
-    UNUSED(context);
-    FuriString* cmd;
-    cmd = furi_string_alloc();
-
-    if(!args_read_string_and_trim(args, cmd)) {
-        furi_string_free(cmd);
-        onewire_cli_print_usage();
-        return;
-    }
-
-    if(furi_string_cmp_str(cmd, "search") == 0) {
-        onewire_cli_search(cli);
-    }
-
-    furi_string_free(cmd);
-}
diff --git a/applications/main/ibutton/ibutton_i.h b/applications/main/ibutton/ibutton_i.h
index 8ad0b90e..50927921 100644
--- a/applications/main/ibutton/ibutton_i.h
+++ b/applications/main/ibutton/ibutton_i.h
@@ -7,8 +7,8 @@
 #include <gui/scene_manager.h>
 #include <gui/view_dispatcher.h>
 
-#include <one_wire/ibutton/ibutton_worker.h>
-#include <one_wire/ibutton/ibutton_protocols.h>
+#include <ibutton/ibutton_worker.h>
+#include <ibutton/ibutton_protocols.h>
 
 #include <rpc/rpc_app.h>
 #include <storage/storage.h>
diff --git a/applications/main/onewire/application.fam b/applications/main/onewire/application.fam
new file mode 100644
index 00000000..68d4f671
--- /dev/null
+++ b/applications/main/onewire/application.fam
@@ -0,0 +1,14 @@
+App(
+    appid="onewire",
+    name="1-Wire",
+    apptype=FlipperAppType.METAPACKAGE,
+    provides=["onewire_start"],
+)
+
+App(
+    appid="onewire_start",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="onewire_on_system_start",
+    requires=["onewire"],
+    order=60,
+)
diff --git a/applications/main/onewire/onewire_cli.c b/applications/main/onewire/onewire_cli.c
new file mode 100644
index 00000000..4c16fb38
--- /dev/null
+++ b/applications/main/onewire/onewire_cli.c
@@ -0,0 +1,72 @@
+#include <furi.h>
+#include <furi_hal.h>
+
+#include <cli/cli.h>
+#include <toolbox/args.h>
+
+#include <one_wire/one_wire_host.h>
+
+static void onewire_cli(Cli* cli, FuriString* args, void* context);
+
+void onewire_on_system_start() {
+#ifdef SRV_CLI
+    Cli* cli = furi_record_open(RECORD_CLI);
+    cli_add_command(cli, "onewire", CliCommandFlagDefault, onewire_cli, cli);
+    furi_record_close(RECORD_CLI);
+#else
+    UNUSED(onewire_cli);
+#endif
+}
+
+static void onewire_cli_print_usage() {
+    printf("Usage:\r\n");
+    printf("onewire search\r\n");
+};
+
+static void onewire_cli_search(Cli* cli) {
+    UNUSED(cli);
+    OneWireHost* onewire = onewire_host_alloc(&ibutton_gpio);
+    uint8_t address[8];
+    bool done = false;
+
+    printf("Search started\r\n");
+
+    onewire_host_start(onewire);
+    furi_hal_power_enable_otg();
+
+    while(!done) {
+        if(onewire_host_search(onewire, address, OneWireHostSearchModeNormal) != 1) {
+            printf("Search finished\r\n");
+            onewire_host_reset_search(onewire);
+            done = true;
+        } else {
+            printf("Found: ");
+            for(uint8_t i = 0; i < 8; i++) {
+                printf("%02X", address[i]);
+            }
+            printf("\r\n");
+        }
+        furi_delay_ms(100);
+    }
+
+    furi_hal_power_disable_otg();
+    onewire_host_free(onewire);
+}
+
+void onewire_cli(Cli* cli, FuriString* args, void* context) {
+    UNUSED(context);
+    FuriString* cmd;
+    cmd = furi_string_alloc();
+
+    if(!args_read_string_and_trim(args, cmd)) {
+        furi_string_free(cmd);
+        onewire_cli_print_usage();
+        return;
+    }
+
+    if(furi_string_cmp_str(cmd, "search") == 0) {
+        onewire_cli_search(cli);
+    }
+
+    furi_string_free(cmd);
+}
diff --git a/firmware/targets/f18/api_symbols.csv b/firmware/targets/f18/api_symbols.csv
index 61195aba..7fa269c9 100644
--- a/firmware/targets/f18/api_symbols.csv
+++ b/firmware/targets/f18/api_symbols.csv
@@ -151,6 +151,10 @@ Header,+,lib/mlib/m-list.h,,
 Header,+,lib/mlib/m-rbtree.h,,
 Header,+,lib/mlib/m-tuple.h,,
 Header,+,lib/mlib/m-variant.h,,
+Header,+,lib/one_wire/maxim_crc.h,,
+Header,+,lib/one_wire/one_wire_host.h,,
+Header,+,lib/one_wire/one_wire_host_timing.h,,
+Header,+,lib/one_wire/one_wire_slave.h,,
 Header,+,lib/print/wrappers.h,,
 Header,+,lib/toolbox/args.h,,
 Header,+,lib/toolbox/crc32_calc.h,,
@@ -1394,6 +1398,7 @@ Function,+,manchester_advance,_Bool,"ManchesterState, ManchesterEvent, Mancheste
 Function,+,manchester_encoder_advance,_Bool,"ManchesterEncoderState*, const _Bool, ManchesterEncoderResult*"
 Function,+,manchester_encoder_finish,ManchesterEncoderResult,ManchesterEncoderState*
 Function,+,manchester_encoder_reset,void,ManchesterEncoderState*
+Function,+,maxim_crc8,uint8_t,"const uint8_t*, const uint8_t, const uint8_t"
 Function,-,mbedtls_des3_crypt_cbc,int,"mbedtls_des3_context*, int, size_t, unsigned char[8], const unsigned char*, unsigned char*"
 Function,-,mbedtls_des3_crypt_ecb,int,"mbedtls_des3_context*, const unsigned char[8], unsigned char[8]"
 Function,-,mbedtls_des3_free,void,mbedtls_des3_context*
@@ -1472,6 +1477,32 @@ Function,+,notification_message,void,"NotificationApp*, const NotificationSequen
 Function,+,notification_message_block,void,"NotificationApp*, const NotificationSequence*"
 Function,-,nrand48,long,unsigned short[3]
 Function,-,on_exit,int,"void (*)(int, void*), void*"
+Function,+,onewire_host_alloc,OneWireHost*,const GpioPin*
+Function,+,onewire_host_free,void,OneWireHost*
+Function,+,onewire_host_read,uint8_t,OneWireHost*
+Function,+,onewire_host_read_bit,_Bool,OneWireHost*
+Function,+,onewire_host_read_bytes,void,"OneWireHost*, uint8_t*, uint16_t"
+Function,+,onewire_host_reset,_Bool,OneWireHost*
+Function,+,onewire_host_reset_search,void,OneWireHost*
+Function,+,onewire_host_search,uint8_t,"OneWireHost*, uint8_t*, OneWireHostSearchMode"
+Function,+,onewire_host_skip,void,OneWireHost*
+Function,+,onewire_host_start,void,OneWireHost*
+Function,+,onewire_host_stop,void,OneWireHost*
+Function,+,onewire_host_target_search,void,"OneWireHost*, uint8_t"
+Function,+,onewire_host_write,void,"OneWireHost*, uint8_t"
+Function,+,onewire_host_write_bit,void,"OneWireHost*, _Bool"
+Function,+,onewire_host_write_bytes,void,"OneWireHost*, const uint8_t*, uint16_t"
+Function,+,onewire_slave_alloc,OneWireSlave*,const GpioPin*
+Function,+,onewire_slave_free,void,OneWireSlave*
+Function,+,onewire_slave_receive,_Bool,"OneWireSlave*, uint8_t*, size_t"
+Function,+,onewire_slave_receive_bit,_Bool,OneWireSlave*
+Function,+,onewire_slave_send,_Bool,"OneWireSlave*, const uint8_t*, size_t"
+Function,+,onewire_slave_send_bit,_Bool,"OneWireSlave*, _Bool"
+Function,+,onewire_slave_set_command_callback,void,"OneWireSlave*, OneWireSlaveCommandCallback, void*"
+Function,+,onewire_slave_set_reset_callback,void,"OneWireSlave*, OneWireSlaveResetCallback, void*"
+Function,+,onewire_slave_set_result_callback,void,"OneWireSlave*, OneWireSlaveResultCallback, void*"
+Function,+,onewire_slave_start,void,OneWireSlave*
+Function,+,onewire_slave_stop,void,OneWireSlave*
 Function,-,open_memstream,FILE*,"char**, size_t*"
 Function,+,path_append,void,"FuriString*, const char*"
 Function,+,path_concat,void,"const char*, const char*, FuriString*"
diff --git a/firmware/targets/f18/target.json b/firmware/targets/f18/target.json
index 2c3b27ab..f1963fb0 100644
--- a/firmware/targets/f18/target.json
+++ b/firmware/targets/f18/target.json
@@ -24,6 +24,7 @@
         "usb_stm32",
         "appframe",
         "assets",
+        "one_wire",
         "misc",
         "flipper_application",
         "flipperformat",
@@ -45,11 +46,11 @@
         "furi_hal_subghz_configs.h"
     ],
     "excluded_modules": [
-        "one_wire",
         "nfc",
         "lfrfid",
         "subghz",
+        "ibutton",
         "infrared",
         "st25rfal002"
     ]
-}
\ No newline at end of file
+}
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index e46322f4..c98e5467 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -118,6 +118,9 @@ Header,+,lib/flipper_application/plugins/composite_resolver.h,,
 Header,+,lib/flipper_application/plugins/plugin_manager.h,,
 Header,+,lib/flipper_format/flipper_format.h,,
 Header,+,lib/flipper_format/flipper_format_i.h,,
+Header,+,lib/ibutton/ibutton_key.h,,
+Header,+,lib/ibutton/ibutton_protocols.h,,
+Header,+,lib/ibutton/ibutton_worker.h,,
 Header,+,lib/infrared/encoder_decoder/infrared.h,,
 Header,+,lib/infrared/worker/infrared_transmit.h,,
 Header,+,lib/infrared/worker/infrared_worker.h,,
@@ -167,9 +170,6 @@ Header,+,lib/mlib/m-rbtree.h,,
 Header,+,lib/mlib/m-tuple.h,,
 Header,+,lib/mlib/m-variant.h,,
 Header,+,lib/nfc/nfc_device.h,,
-Header,+,lib/one_wire/ibutton/ibutton_key.h,,
-Header,+,lib/one_wire/ibutton/ibutton_protocols.h,,
-Header,+,lib/one_wire/ibutton/ibutton_worker.h,,
 Header,+,lib/one_wire/maxim_crc.h,,
 Header,+,lib/one_wire/one_wire_host.h,,
 Header,+,lib/one_wire/one_wire_host_timing.h,,
diff --git a/firmware/targets/f7/target.json b/firmware/targets/f7/target.json
index 49aa109b..14bb1cd0 100644
--- a/firmware/targets/f7/target.json
+++ b/firmware/targets/f7/target.json
@@ -35,6 +35,7 @@
         "appframe",
         "assets",
         "one_wire",
+        "ibutton",
         "misc",
         "mbedtls",
         "lfrfid",
@@ -42,4 +43,4 @@
         "flipperformat",
         "toolbox"
     ]
-}
\ No newline at end of file
+}
diff --git a/lib/SConscript b/lib/SConscript
index d1e8e8c7..f5d4689f 100644
--- a/lib/SConscript
+++ b/lib/SConscript
@@ -87,6 +87,7 @@ libs = env.BuildModules(
         "fatfs",
         "flipper_format",
         "one_wire",
+        "ibutton",
         "infrared",
         "littlefs",
         "mbedtls",
diff --git a/lib/ibutton/SConscript b/lib/ibutton/SConscript
new file mode 100644
index 00000000..238d65f7
--- /dev/null
+++ b/lib/ibutton/SConscript
@@ -0,0 +1,24 @@
+Import("env")
+
+env.Append(
+    LINT_SOURCES=[
+        Dir("."),
+    ],
+    CPPPATH=[
+        "#/lib/ibutton",
+    ],
+    SDK_HEADERS=[
+        File("ibutton_key.h"),
+        File("ibutton_worker.h"),
+        File("ibutton_protocols.h"),
+    ],
+)
+
+libenv = env.Clone(FW_LIB_NAME="ibutton")
+libenv.ApplyLibFlags()
+
+sources = libenv.GlobRecursive("*.c*")
+
+lib = libenv.StaticLibrary("${FW_LIB_NAME}", sources)
+libenv.Install("${LIB_DIST_DIR}", lib)
+Return("lib")
diff --git a/lib/one_wire/ibutton/ibutton_key.c b/lib/ibutton/ibutton_key.c
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_key.c
rename to lib/ibutton/ibutton_key.c
diff --git a/lib/one_wire/ibutton/ibutton_key.h b/lib/ibutton/ibutton_key.h
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_key.h
rename to lib/ibutton/ibutton_key.h
diff --git a/lib/one_wire/ibutton/ibutton_key_i.h b/lib/ibutton/ibutton_key_i.h
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_key_i.h
rename to lib/ibutton/ibutton_key_i.h
diff --git a/lib/one_wire/ibutton/ibutton_protocols.c b/lib/ibutton/ibutton_protocols.c
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_protocols.c
rename to lib/ibutton/ibutton_protocols.c
diff --git a/lib/one_wire/ibutton/ibutton_protocols.h b/lib/ibutton/ibutton_protocols.h
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_protocols.h
rename to lib/ibutton/ibutton_protocols.h
diff --git a/lib/one_wire/ibutton/ibutton_worker.c b/lib/ibutton/ibutton_worker.c
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_worker.c
rename to lib/ibutton/ibutton_worker.c
diff --git a/lib/one_wire/ibutton/ibutton_worker.h b/lib/ibutton/ibutton_worker.h
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_worker.h
rename to lib/ibutton/ibutton_worker.h
diff --git a/lib/one_wire/ibutton/ibutton_worker_i.h b/lib/ibutton/ibutton_worker_i.h
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_worker_i.h
rename to lib/ibutton/ibutton_worker_i.h
diff --git a/lib/one_wire/ibutton/ibutton_worker_modes.c b/lib/ibutton/ibutton_worker_modes.c
similarity index 100%
rename from lib/one_wire/ibutton/ibutton_worker_modes.c
rename to lib/ibutton/ibutton_worker_modes.c
diff --git a/lib/one_wire/ibutton/protocols/blanks/rw1990.c b/lib/ibutton/protocols/blanks/rw1990.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/blanks/rw1990.c
rename to lib/ibutton/protocols/blanks/rw1990.c
diff --git a/lib/one_wire/ibutton/protocols/blanks/rw1990.h b/lib/ibutton/protocols/blanks/rw1990.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/blanks/rw1990.h
rename to lib/ibutton/protocols/blanks/rw1990.h
diff --git a/lib/one_wire/ibutton/protocols/blanks/tm2004.c b/lib/ibutton/protocols/blanks/tm2004.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/blanks/tm2004.c
rename to lib/ibutton/protocols/blanks/tm2004.c
diff --git a/lib/one_wire/ibutton/protocols/blanks/tm2004.h b/lib/ibutton/protocols/blanks/tm2004.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/blanks/tm2004.h
rename to lib/ibutton/protocols/blanks/tm2004.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/dallas_common.c b/lib/ibutton/protocols/dallas/dallas_common.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/dallas_common.c
rename to lib/ibutton/protocols/dallas/dallas_common.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/dallas_common.h b/lib/ibutton/protocols/dallas/dallas_common.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/dallas_common.h
rename to lib/ibutton/protocols/dallas/dallas_common.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_dallas_base.h b/lib/ibutton/protocols/dallas/protocol_dallas_base.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_dallas_base.h
rename to lib/ibutton/protocols/dallas/protocol_dallas_base.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1971.c b/lib/ibutton/protocols/dallas/protocol_ds1971.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1971.c
rename to lib/ibutton/protocols/dallas/protocol_ds1971.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1971.h b/lib/ibutton/protocols/dallas/protocol_ds1971.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1971.h
rename to lib/ibutton/protocols/dallas/protocol_ds1971.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1990.c b/lib/ibutton/protocols/dallas/protocol_ds1990.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1990.c
rename to lib/ibutton/protocols/dallas/protocol_ds1990.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1990.h b/lib/ibutton/protocols/dallas/protocol_ds1990.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1990.h
rename to lib/ibutton/protocols/dallas/protocol_ds1990.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1992.c b/lib/ibutton/protocols/dallas/protocol_ds1992.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1992.c
rename to lib/ibutton/protocols/dallas/protocol_ds1992.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1992.h b/lib/ibutton/protocols/dallas/protocol_ds1992.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1992.h
rename to lib/ibutton/protocols/dallas/protocol_ds1992.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1996.c b/lib/ibutton/protocols/dallas/protocol_ds1996.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1996.c
rename to lib/ibutton/protocols/dallas/protocol_ds1996.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds1996.h b/lib/ibutton/protocols/dallas/protocol_ds1996.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds1996.h
rename to lib/ibutton/protocols/dallas/protocol_ds1996.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds_generic.c b/lib/ibutton/protocols/dallas/protocol_ds_generic.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds_generic.c
rename to lib/ibutton/protocols/dallas/protocol_ds_generic.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_ds_generic.h b/lib/ibutton/protocols/dallas/protocol_ds_generic.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_ds_generic.h
rename to lib/ibutton/protocols/dallas/protocol_ds_generic.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas.c b/lib/ibutton/protocols/dallas/protocol_group_dallas.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas.c
rename to lib/ibutton/protocols/dallas/protocol_group_dallas.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas.h b/lib/ibutton/protocols/dallas/protocol_group_dallas.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas.h
rename to lib/ibutton/protocols/dallas/protocol_group_dallas.h
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas_defs.c b/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas_defs.c
rename to lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c
diff --git a/lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas_defs.h b/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/dallas/protocol_group_dallas_defs.h
rename to lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_cyfral.c b/lib/ibutton/protocols/misc/protocol_cyfral.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_cyfral.c
rename to lib/ibutton/protocols/misc/protocol_cyfral.c
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_cyfral.h b/lib/ibutton/protocols/misc/protocol_cyfral.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_cyfral.h
rename to lib/ibutton/protocols/misc/protocol_cyfral.h
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_group_misc.c b/lib/ibutton/protocols/misc/protocol_group_misc.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_group_misc.c
rename to lib/ibutton/protocols/misc/protocol_group_misc.c
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_group_misc.h b/lib/ibutton/protocols/misc/protocol_group_misc.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_group_misc.h
rename to lib/ibutton/protocols/misc/protocol_group_misc.h
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_group_misc_defs.c b/lib/ibutton/protocols/misc/protocol_group_misc_defs.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_group_misc_defs.c
rename to lib/ibutton/protocols/misc/protocol_group_misc_defs.c
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_group_misc_defs.h b/lib/ibutton/protocols/misc/protocol_group_misc_defs.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_group_misc_defs.h
rename to lib/ibutton/protocols/misc/protocol_group_misc_defs.h
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_metakom.c b/lib/ibutton/protocols/misc/protocol_metakom.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_metakom.c
rename to lib/ibutton/protocols/misc/protocol_metakom.c
diff --git a/lib/one_wire/ibutton/protocols/misc/protocol_metakom.h b/lib/ibutton/protocols/misc/protocol_metakom.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/misc/protocol_metakom.h
rename to lib/ibutton/protocols/misc/protocol_metakom.h
diff --git a/lib/one_wire/ibutton/protocols/protocol_common.h b/lib/ibutton/protocols/protocol_common.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/protocol_common.h
rename to lib/ibutton/protocols/protocol_common.h
diff --git a/lib/one_wire/ibutton/protocols/protocol_common_i.h b/lib/ibutton/protocols/protocol_common_i.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/protocol_common_i.h
rename to lib/ibutton/protocols/protocol_common_i.h
diff --git a/lib/one_wire/ibutton/protocols/protocol_group_base.h b/lib/ibutton/protocols/protocol_group_base.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/protocol_group_base.h
rename to lib/ibutton/protocols/protocol_group_base.h
diff --git a/lib/one_wire/ibutton/protocols/protocol_group_defs.c b/lib/ibutton/protocols/protocol_group_defs.c
similarity index 100%
rename from lib/one_wire/ibutton/protocols/protocol_group_defs.c
rename to lib/ibutton/protocols/protocol_group_defs.c
diff --git a/lib/one_wire/ibutton/protocols/protocol_group_defs.h b/lib/ibutton/protocols/protocol_group_defs.h
similarity index 100%
rename from lib/one_wire/ibutton/protocols/protocol_group_defs.h
rename to lib/ibutton/protocols/protocol_group_defs.h
diff --git a/lib/one_wire/SConscript b/lib/one_wire/SConscript
index 56d4759e..8d73c9db 100644
--- a/lib/one_wire/SConscript
+++ b/lib/one_wire/SConscript
@@ -11,9 +11,6 @@ env.Append(
         File("one_wire_host_timing.h"),
         File("one_wire_host.h"),
         File("one_wire_slave.h"),
-        File("ibutton/ibutton_key.h"),
-        File("ibutton/ibutton_worker.h"),
-        File("ibutton/ibutton_protocols.h"),
         File("maxim_crc.h"),
     ],
 )