[FL-3070] iButton system and app refactoring (#2388)
* Add 1-wire thermometer example app stub * Working 1-wire thermometer app * Refactor app to use threads * Clean up code, add comments * Add CRC checking * Increase update period * Fix error in fbt * Revert the old update period * Use settable pin in onewire_host * Use settable pin for onewire_slave * Clear EXTI flag after callback, make private methods static in onewire_slave * Do not hardcode GPIO pin number * Remove iButton hal from furi_hal_rfid * Remove most of furi_hal_ibutton * Add some of furi_hal_ibutton back * Slightly neater code * Update CODEOWNERS * Add furi_hal_gpio_get_ext_pin_number * Create README.md * Temporary get Metakom and Cyfral keys out of the way * Better enum name * Syncing work, does not compile * Syncing work, now compiles * Working read impl for DS1990 and DS1992 * Add the ability to display extended key data * Get rid of DialogEx * Add save and load API * Better iButtonKey encapsulation * Fix crash * Load key code boilerplate * More load key code boilerplate * Minor code cleanup * Implement loading and saving DS1990 keys * Implement the Info scene * Implement loading & saving for DS1992 * Implement read error scene stub * Implement delete confirmation screen * Better error messages (protocol-dependent) * Minor old code cleanup * Remove iButtonDevice, add command callback to iButtonSlave * Implement draft emulation for DS1990 * Better emulation for DS1990 * Initial emulation implementation for DS1992 * Better common command definitions * Use common submenu callback, add protocol list * Improve ViewData screen * Improve scene_add_type * Add stubs for write functionality * Improve naming consistency * Implement writing a DS1992 onto another one * Improve DS1992 write code * Improve DS1992 write code once more * Prepare write_blank for DS1990, delete ibutton_writer * Implement writing DS1990 onto blanks * Fix reading DS1990 * Partially implement writing DS1992 onto blanks * Implement GUI for writing keys * Implement GUI for emulating keys * Reduce memory usage for pretty_format * Automatically truncate data more than 256 bytes * Initial implementation of DS1996 (not tested) * Fix crash due to missing virtual function * Improve emulation code * Improve DS1992 emulation code * Correct return value for onewire_slave_send * Correct return value for onewire_slave_receive * Implement emulation for DS1992 & DS1996 * Better constant names * Simplify & optimise the emulation code * Remove duplicate code * Add skip rom command emulation * Show loading animation for large keys * Implement manual adding & editing of keys * Use buffered file streams to speed up saving & loading * Reset key name before adding a new one * Sync a buffered file stream before saving * Use the DSGeneric protocol as a fallback option * Implement emulation via RPC * Refactor iButton code in preparation for comparator keys * Refactor iButton code in preparation for comparator keys once more * Make some functions static * Make protocols not rely on one_wire classes * Improve ProtocolDict usage * Improve ProtocolDict usage more * Implement reading Metakom & Cyfral keys * Rename some files * Better file structure * Implement a unified interface for misc protocols * Implement a unified interface for dallas protocols * Concrete types for Dallas protocols * Implement a unified interface for all key types * Improved type naming * Improved private types * Proper types in protocol definitions * Implement emulation for Cyfral & Metakom keys * Implement save&load for Metakom & Cyfral keys * Better type names * Rename files, better names * Allocate iButtonProtocols like a normal class * Reset the key each time the start scene is selected * Improve comments and constants * Add ibutton_protocols to SDK headers * Add ibutton_key to SDK headers * Add ibutton_key to SDK headers * Implement reading via cli * Implement emulation via cli * Implement writing Dallas blanks via cli * Correctly revert the editing if cancelled by the user * Correct committing mishap * Elide the long text on the info screen * Change key name for data in Misc keys * Update iButtonFileFormat.md * Remember the key's folder * Save menu position in ReadKeyMenu and SavedKeyMenu * Correct use of preselected path in file browser Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
95
lib/one_wire/ibutton/protocols/blanks/rw1990.c
Normal file
95
lib/one_wire/ibutton/protocols/blanks/rw1990.c
Normal file
@@ -0,0 +1,95 @@
|
||||
#include "rw1990.h"
|
||||
|
||||
#include <core/kernel.h>
|
||||
|
||||
#define RW1990_1_CMD_WRITE_RECORD_FLAG 0xD1
|
||||
#define RW1990_1_CMD_READ_RECORD_FLAG 0xB5
|
||||
#define RW1990_1_CMD_WRITE_ROM 0xD5
|
||||
|
||||
#define RW1990_2_CMD_WRITE_RECORD_FLAG 0x1D
|
||||
#define RW1990_2_CMD_READ_RECORD_FLAG 0x1E
|
||||
#define RW1990_2_CMD_WRITE_ROM 0xD5
|
||||
|
||||
#define DS1990_CMD_READ_ROM 0x33
|
||||
|
||||
static void rw1990_write_byte(OneWireHost* host, uint8_t value) {
|
||||
for(uint8_t bitMask = 0x01; bitMask; bitMask <<= 1) {
|
||||
onewire_host_write_bit(host, (bool)(bitMask & value));
|
||||
furi_delay_us(5000);
|
||||
}
|
||||
}
|
||||
|
||||
static bool rw1990_read_and_compare(OneWireHost* host, const uint8_t* data, size_t data_size) {
|
||||
bool success = false;
|
||||
|
||||
if(onewire_host_reset(host)) {
|
||||
success = true;
|
||||
onewire_host_write(host, DS1990_CMD_READ_ROM);
|
||||
|
||||
for(size_t i = 0; i < data_size; ++i) {
|
||||
if(data[i] != onewire_host_read(host)) {
|
||||
success = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
bool rw1990_write_v1(OneWireHost* host, const uint8_t* data, size_t data_size) {
|
||||
// Unlock sequence
|
||||
onewire_host_reset(host);
|
||||
onewire_host_write(host, RW1990_1_CMD_WRITE_RECORD_FLAG);
|
||||
furi_delay_us(10);
|
||||
|
||||
onewire_host_write_bit(host, false);
|
||||
furi_delay_us(5000);
|
||||
|
||||
// Write data
|
||||
onewire_host_reset(host);
|
||||
onewire_host_write(host, RW1990_1_CMD_WRITE_ROM);
|
||||
|
||||
for(size_t i = 0; i < data_size; ++i) {
|
||||
// inverted key for RW1990.1
|
||||
rw1990_write_byte(host, ~(data[i]));
|
||||
furi_delay_us(30000);
|
||||
}
|
||||
|
||||
// Lock sequence
|
||||
onewire_host_write(host, RW1990_1_CMD_WRITE_RECORD_FLAG);
|
||||
|
||||
onewire_host_write_bit(host, true);
|
||||
furi_delay_us(10000);
|
||||
|
||||
// TODO: Better error handling
|
||||
return rw1990_read_and_compare(host, data, data_size);
|
||||
}
|
||||
|
||||
bool rw1990_write_v2(OneWireHost* host, const uint8_t* data, size_t data_size) {
|
||||
// Unlock sequence
|
||||
onewire_host_reset(host);
|
||||
onewire_host_write(host, RW1990_2_CMD_WRITE_RECORD_FLAG);
|
||||
furi_delay_us(10);
|
||||
|
||||
onewire_host_write_bit(host, true);
|
||||
furi_delay_us(5000);
|
||||
|
||||
// Write data
|
||||
onewire_host_reset(host);
|
||||
onewire_host_write(host, RW1990_2_CMD_WRITE_ROM);
|
||||
|
||||
for(size_t i = 0; i < data_size; ++i) {
|
||||
rw1990_write_byte(host, data[i]);
|
||||
furi_delay_us(30000);
|
||||
}
|
||||
|
||||
// Lock sequence
|
||||
onewire_host_write(host, RW1990_2_CMD_WRITE_RECORD_FLAG);
|
||||
|
||||
onewire_host_write_bit(host, false);
|
||||
furi_delay_us(10000);
|
||||
|
||||
// TODO: Better error handling
|
||||
return rw1990_read_and_compare(host, data, data_size);
|
||||
}
|
9
lib/one_wire/ibutton/protocols/blanks/rw1990.h
Normal file
9
lib/one_wire/ibutton/protocols/blanks/rw1990.h
Normal file
@@ -0,0 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <one_wire/one_wire_host.h>
|
||||
|
||||
bool rw1990_write_v1(OneWireHost* host, const uint8_t* data, size_t data_size);
|
||||
|
||||
bool rw1990_write_v2(OneWireHost* host, const uint8_t* data, size_t data_size);
|
42
lib/one_wire/ibutton/protocols/blanks/tm2004.c
Normal file
42
lib/one_wire/ibutton/protocols/blanks/tm2004.c
Normal file
@@ -0,0 +1,42 @@
|
||||
#include "tm2004.h"
|
||||
|
||||
#include <core/kernel.h>
|
||||
|
||||
#define TM2004_CMD_READ_STATUS 0xAA
|
||||
#define TM2004_CMD_READ_MEMORY 0xF0
|
||||
#define TM2004_CMD_WRITE_ROM 0x3C
|
||||
#define TM2004_CMD_FINALIZATION 0x35
|
||||
#define TM2004_ANSWER_READ_MEMORY 0xF5
|
||||
|
||||
bool tm2004_write(OneWireHost* host, const uint8_t* data, size_t data_size) {
|
||||
onewire_host_reset(host);
|
||||
onewire_host_write(host, TM2004_CMD_WRITE_ROM);
|
||||
// Starting writing from address 0x0000
|
||||
onewire_host_write(host, 0x00);
|
||||
onewire_host_write(host, 0x00);
|
||||
|
||||
size_t i;
|
||||
for(i = 0; i < data_size; ++i) {
|
||||
uint8_t answer;
|
||||
|
||||
onewire_host_write(host, data[i]);
|
||||
answer = onewire_host_read(host);
|
||||
// TODO: check answer CRC
|
||||
|
||||
// pulse indicating that data is correct
|
||||
furi_delay_us(600);
|
||||
onewire_host_write_bit(host, true);
|
||||
furi_delay_us(50000);
|
||||
|
||||
// read written key byte
|
||||
answer = onewire_host_read(host); //-V519
|
||||
|
||||
// check that written and read are same
|
||||
if(data[i] != answer) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Better error handling
|
||||
return i == data_size;
|
||||
}
|
7
lib/one_wire/ibutton/protocols/blanks/tm2004.h
Normal file
7
lib/one_wire/ibutton/protocols/blanks/tm2004.h
Normal file
@@ -0,0 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <one_wire/one_wire_host.h>
|
||||
|
||||
bool tm2004_write(OneWireHost* host, const uint8_t* data, size_t data_size);
|
Reference in New Issue
Block a user