Skip to content

Fix OneWireHub to work with ESP32 #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KilDoomWise wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix OneWireHub to work with ESP32 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b819723
Update README.md
KilDoomWise Jun 2, 2025
42082d3
Fixed mem size error in compilation
KilDoomWise Jun 2, 2025
4b6c134
Update README.md
KilDoomWise Jun 7, 2025
6fc5c63
Update README.md
KilDoomWise Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/DS2408.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ void DS2408::duty(OneWireHub *const hub)
case 0xF0: // Read PIO Registers

if (hub->recv(&reg_TA, 1, crc)) return;
if ((reg_TA < REG_OFFSET) || (reg_TA >= REG_OFFSET + MEM_SIZE)) return;
if ((reg_TA < REG_OFFSET) || (reg_TA >= REG_OFFSET + MEMORY_SIZE)) return;
if (hub->recv(&data, 1, crc)) return; // seconds part of reg_TA, should be zero
if (data != 0) return;

{
const uint8_t start = (reg_TA - REG_OFFSET);
const uint8_t length = MEM_SIZE - start;
const uint8_t length = MEMORY_SIZE - start;
if (hub->send(&memory[start], length, crc)) return;
}

Expand Down
4 changes: 2 additions & 2 deletions src/DS2408.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class DS2408 : public OneWireItem
{
private:
static constexpr uint8_t MEM_SIZE{8};
static constexpr uint8_t MEMORY_SIZE{8};

// Register Indexes
static constexpr uint8_t REG_OFFSET{0x88};
Expand All @@ -25,7 +25,7 @@ class DS2408 : public OneWireItem
static constexpr uint8_t REG_RD_ABOVE_ALWAYS_FF_8E{6}; // 0x8E - these bytes give always 0xFF
static constexpr uint8_t REG_RD_ABOVE_ALWAYS_FF_8F{7}; // 0x8F - these bytes give always 0xFF

uint8_t memory[MEM_SIZE];
uint8_t memory[MEMORY_SIZE];

public:
static constexpr uint8_t family_code{0x29};
Expand Down
10 changes: 5 additions & 5 deletions src/DS2423.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ void DS2423::duty(OneWireHub *const hub)
}


void DS2423::clearMemory(void) { memset(memory, static_cast<uint8_t>(0x00), MEM_SIZE); }
void DS2423::clearMemory(void) { memset(memory, static_cast<uint8_t>(0x00), MEMORY_SIZE); }

void DS2423::clearScratchpad(void) { memset(scratchpad, static_cast<uint8_t>(0x00), PAGE_SIZE); }

bool DS2423::writeMemory(const uint8_t *const source, const uint16_t length,
const uint16_t position)
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(&memory[position], source, _length);

const uint8_t page_start = uint8_t(position >> 5);
Expand All @@ -173,8 +173,8 @@ bool DS2423::writeMemory(const uint8_t *const source, const uint16_t length,
bool DS2423::readMemory(uint8_t *const destination, const uint16_t length,
const uint16_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}
Expand Down
6 changes: 3 additions & 3 deletions src/DS2423.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
class DS2423 : public OneWireItem
{
private:
static constexpr uint16_t MEM_SIZE{512};
static constexpr uint16_t MEMORY_SIZE{512};

static constexpr uint8_t PAGE_SIZE{32};
static constexpr uint16_t PAGE_COUNT{MEM_SIZE / PAGE_SIZE};
static constexpr uint16_t PAGE_COUNT{MEMORY_SIZE / PAGE_SIZE};
static constexpr uint8_t PAGE_MASK{0b00011111};

static constexpr uint8_t COUNTER_COUNT{4};
Expand All @@ -28,7 +28,7 @@ class DS2423 : public OneWireItem
static constexpr uint16_t REG_TA_MASK{
0x01FF}; // Addresses will be stripped of the highest 7 bytes

uint8_t memory[MEM_SIZE]; // 4kbit max storage
uint8_t memory[MEMORY_SIZE]; // 4kbit max storage
uint8_t scratchpad[PAGE_SIZE];
uint32_t memcounter[COUNTER_COUNT];

Expand Down
6 changes: 3 additions & 3 deletions src/DS2430.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ bool DS2430::writeMemory(const uint8_t *const source, const uint8_t length, cons
bool DS2430::readMemory(uint8_t *const destination, const uint16_t length,
const uint16_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}

bool DS2430::syncScratchpad()
{
uint8_t length = (MEM_SIZE > SCRATCHPAD_SIZE) ? SCRATCHPAD_SIZE : MEM_SIZE;
uint8_t length = (MEMORY_SIZE > SCRATCHPAD_SIZE) ? SCRATCHPAD_SIZE : MEMORY_SIZE;
memcpy(scratchpad, memory, length);
return true;
}
4 changes: 2 additions & 2 deletions src/DS2430.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class DS2430 : public OneWireItem
{
private:
static constexpr uint8_t MEM_SIZE{32 + 8};
static constexpr uint8_t MEMORY_SIZE{32 + 8};

static constexpr uint8_t SCRATCHPAD_SIZE{32 + 8};

Expand All @@ -20,7 +20,7 @@ class DS2430 : public OneWireItem
static constexpr uint8_t SCRATCHPAD2_SIZE{8};
static constexpr uint8_t SCRATCHPAD2_MASK{0b00000111};

uint8_t memory[MEM_SIZE];
uint8_t memory[MEMORY_SIZE];

uint8_t scratchpad[SCRATCHPAD_SIZE];

Expand Down
8 changes: 4 additions & 4 deletions src/DS2431.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ void DS2431::duty(OneWireHub *const hub)
case 0xF0: // READ MEMORY COMMAND

if (hub->recv(reinterpret_cast<uint8_t *>(&reg_TA), 2)) return;
if (reg_TA >= MEM_SIZE) return;
if (hub->send(&memory[reg_TA], MEM_SIZE - uint8_t(reg_TA), crc)) return;
if (reg_TA >= MEMORY_SIZE) return;
if (hub->send(&memory[reg_TA], MEMORY_SIZE - uint8_t(reg_TA), crc)) return;
break; // send 1s when read is complete, is passive, so do nothing here

default: hub->raiseDeviceError(cmd);
Expand Down Expand Up @@ -160,8 +160,8 @@ bool DS2431::writeMemory(const uint8_t *const source, const uint8_t length, cons
bool DS2431::readMemory(uint8_t *const destination, const uint16_t length,
const uint16_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}
Expand Down
6 changes: 3 additions & 3 deletions src/DS2431.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
class DS2431 : public OneWireItem
{
private:
static constexpr uint8_t MEM_SIZE{144};
static constexpr uint8_t MEMORY_SIZE{144};

static constexpr uint8_t PAGE_SIZE{32};
static constexpr uint8_t PAGE_COUNT{MEM_SIZE / PAGE_SIZE};
static constexpr uint8_t PAGE_COUNT{MEMORY_SIZE / PAGE_SIZE};
static constexpr uint8_t PAGE_MASK{0b00011111};

static constexpr uint8_t SCRATCHPAD_SIZE{8};
Expand All @@ -28,7 +28,7 @@ class DS2431 : public OneWireItem
static constexpr uint8_t WP_MODE{0x55}; // write protect mode
static constexpr uint8_t EP_MODE{0xAA}; // eprom mode

uint8_t memory[MEM_SIZE];
uint8_t memory[MEMORY_SIZE];

uint8_t scratchpad[SCRATCHPAD_SIZE];
uint8_t page_protection;
Expand Down
12 changes: 6 additions & 6 deletions src/DS2433.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void DS2433::duty(OneWireHub *const hub)

if (hub->recv(reinterpret_cast<uint8_t *>(&reg_TA), 2)) return;

for (uint16_t i = reg_TA; i < MEM_SIZE;
for (uint16_t i = reg_TA; i < MEMORY_SIZE;
i += PAGE_SIZE) // model of the 32byte scratchpad
{
if (hub->send(&memory[i], PAGE_SIZE)) return;
Expand All @@ -109,24 +109,24 @@ void DS2433::duty(OneWireHub *const hub)
}
}

void DS2433::clearMemory(void) { memset(memory, static_cast<uint8_t>(0x00), MEM_SIZE); }
void DS2433::clearMemory(void) { memset(memory, static_cast<uint8_t>(0x00), MEMORY_SIZE); }

void DS2433::clearScratchpad(void) { memset(scratchpad, static_cast<uint8_t>(0x00), PAGE_SIZE); }

bool DS2433::writeMemory(const uint8_t *const source, const uint16_t length,
const uint16_t position)
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(&memory[position], source, _length);
return true;
}

bool DS2433::readMemory(uint8_t *const destination, const uint16_t length,
const uint16_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}
6 changes: 3 additions & 3 deletions src/DS2433.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
class DS2433 : public OneWireItem
{
private:
static constexpr uint16_t MEM_SIZE{512};
static constexpr uint16_t MEMORY_SIZE{512};
static constexpr uint16_t MEM_MASK{0x01FF};

static constexpr uint8_t PAGE_SIZE{32};
static constexpr uint16_t PAGE_COUNT{MEM_SIZE / PAGE_SIZE};
static constexpr uint16_t PAGE_COUNT{MEMORY_SIZE / PAGE_SIZE};
static constexpr uint8_t PAGE_MASK{0b00011111};

static constexpr uint8_t REG_ES_PF_MASK{0b00100000}; // partial byte flag
static constexpr uint8_t REG_ES_ZERO_MASK{0b01000000}; // reads always zero
static constexpr uint8_t REG_ES_AA_MASK{
0b10000000}; // authorization accepted (data copied to target memory)

uint8_t memory[MEM_SIZE]; // 4kbit max storage
uint8_t memory[MEMORY_SIZE]; // 4kbit max storage
uint8_t scratchpad[PAGE_SIZE];

void clearScratchpad(void);
Expand Down
10 changes: 5 additions & 5 deletions src/DS2434.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void DS2434::duty(OneWireHub *const hub)
}
}

void DS2434::clearMemory(void) { memset(memory, static_cast<uint8_t>(0xFF), MEM_SIZE); }
void DS2434::clearMemory(void) { memset(memory, static_cast<uint8_t>(0xFF), MEMORY_SIZE); }

void DS2434::clearScratchpad(void)
{
Expand All @@ -147,17 +147,17 @@ void DS2434::clearScratchpad(void)
bool DS2434::writeMemory(const uint8_t *const source, const uint16_t length,
const uint16_t position)
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(&memory[position], source, _length);
return true;
}

bool DS2434::readMemory(uint8_t *const destination, const uint16_t length,
const uint16_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}
Expand Down
4 changes: 2 additions & 2 deletions src/DS2434.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class DS2434 : public OneWireItem
static constexpr uint8_t PAGE_SIZE{32};
static constexpr uint8_t PAGE_COUNT{5};

static constexpr uint8_t MEM_SIZE{4 * PAGE_SIZE +
static constexpr uint8_t MEMORY_SIZE{4 * PAGE_SIZE +
4}; // Limit the memory size to the working space
static constexpr uint8_t SCRATCHPAD_SIZE{3 * PAGE_SIZE}; // Scratchpad is used for first 3 pages

Expand All @@ -58,7 +58,7 @@ class DS2434 : public OneWireItem
uint32_t timer_nvwr = 0u;
bool request_temp = false;

uint8_t memory[MEM_SIZE];
uint8_t memory[MEMORY_SIZE];
uint8_t scratchpad[SCRATCHPAD_SIZE];

void clearScratchpad(void);
Expand Down
8 changes: 4 additions & 4 deletions src/DS2438.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ void DS2438::clearMemory(void)

bool DS2438::writeMemory(const uint8_t *const source, const uint8_t length, const uint8_t position)
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(&memory[position], source, _length);

const uint8_t page_start = uint8_t(position >> 3);
Expand All @@ -113,8 +113,8 @@ bool DS2438::writeMemory(const uint8_t *const source, const uint8_t length, cons
bool DS2438::readMemory(uint8_t *const destination, const uint8_t length,
const uint8_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}
Expand Down
4 changes: 2 additions & 2 deletions src/DS2438.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class DS2438 : public OneWireItem
8}; // how much of the real 8 pages should be emulated, use at least 1, max 8
static constexpr uint8_t PAGE_SIZE{8}; //

static constexpr uint8_t MEM_SIZE{PAGE_COUNT * PAGE_SIZE};
static constexpr uint8_t MEMORY_SIZE{PAGE_COUNT * PAGE_SIZE};

// Register Addresses
static constexpr uint8_t REG0_MASK_IAD{0x01}; // enable automatic current measurements
Expand All @@ -60,7 +60,7 @@ class DS2438 : public OneWireItem
static constexpr uint8_t REG0_MASK_ADB{0x40}; // adc busy flag

uint8_t memory
[MEM_SIZE]; // this mem is the "scratchpad" in the datasheet., no EEPROM implemented
[MEMORY_SIZE]; // this mem is the "scratchpad" in the datasheet., no EEPROM implemented
uint8_t crc
[PAGE_COUNT +
1]; // keep the matching crc for each memory-page, reading can be very time-sensitive
Expand Down
6 changes: 3 additions & 3 deletions src/DS2450.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void DS2450::duty(OneWireHub *const hub)
{
case 0xAA: // READ MEMORY

while (reg_TA < MEM_SIZE)
while (reg_TA < MEMORY_SIZE)
{
const uint8_t length = PAGE_SIZE - (uint8_t(reg_TA) & PAGE_MASK);
if (hub->send(&memory[reg_TA], length, crc)) return;
Expand All @@ -36,7 +36,7 @@ void DS2450::duty(OneWireHub *const hub)

case 0x55: // write memory (only page 1&2 allowed)

while (reg_TA < MEM_SIZE)
while (reg_TA < MEMORY_SIZE)
{
uint8_t data;
if (hub->recv(&data, 1, crc)) break;
Expand Down Expand Up @@ -71,7 +71,7 @@ void DS2450::duty(OneWireHub *const hub)
void DS2450::clearMemory(void)
{
constexpr uint8_t value_x00 = 0;
memset(memory, value_x00, MEM_SIZE);
memset(memory, value_x00, MEMORY_SIZE);

// set power on defaults
for (uint8_t adc = 0; adc < POTI_COUNT; ++adc)
Expand Down
4 changes: 2 additions & 2 deletions src/DS2450.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class DS2450 : public OneWireItem
static constexpr uint8_t PAGE_SIZE{2 * POTI_COUNT};
static constexpr uint8_t PAGE_MASK{0b00000111};

static constexpr uint8_t MEM_SIZE{PAGE_COUNT * PAGE_SIZE};
static constexpr uint8_t MEMORY_SIZE{PAGE_COUNT * PAGE_SIZE};

uint8_t memory[MEM_SIZE];
uint8_t memory[MEMORY_SIZE];
// Page1 : conversion results: 16 bit for Channel A, B, C & D, power on default: 0x00
// Page2 : control / status: 16 bit per channel
// Page3 : alarm settings: 16 bit per channel
Expand Down
12 changes: 6 additions & 6 deletions src/DS2502.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DS2502::DS2502(uint8_t ID1, uint8_t ID2, uint8_t ID3, uint8_t ID4, uint8_t ID5,
uint8_t ID7)
: OneWireItem(ID1, ID2, ID3, ID4, ID5, ID6, ID7)
{
static_assert(MEM_SIZE < 256, "Implementation does not cover the whole address-space");
static_assert(MEMORY_SIZE < 256, "Implementation does not cover the whole address-space");

clearMemory();
clearStatus();
Expand Down Expand Up @@ -142,7 +142,7 @@ uint8_t DS2502::translateRedirection(const uint8_t source_address) const
return destin_address;
}

void DS2502::clearMemory(void) { memset(memory, static_cast<uint8_t>(0xFF), MEM_SIZE); }
void DS2502::clearMemory(void) { memset(memory, static_cast<uint8_t>(0xFF), MEMORY_SIZE); }

void DS2502::clearStatus(void)
{
Expand All @@ -152,8 +152,8 @@ void DS2502::clearStatus(void)

bool DS2502::writeMemory(const uint8_t *const source, const uint8_t length, const uint8_t position)
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(&memory[position], source, _length);

const uint8_t page_start = static_cast<uint8_t>(position >> 5);
Expand All @@ -166,8 +166,8 @@ bool DS2502::writeMemory(const uint8_t *const source, const uint8_t length, cons
bool DS2502::readMemory(uint8_t *const destination, const uint8_t length,
const uint8_t position) const
{
if (position >= MEM_SIZE) return false;
const uint16_t _length = (position + length >= MEM_SIZE) ? (MEM_SIZE - position) : length;
if (position >= MEMORY_SIZE) return false;
const uint16_t _length = (position + length >= MEMORY_SIZE) ? (MEMORY_SIZE - position) : length;
memcpy(destination, &memory[position], _length);
return (_length == length);
}
Expand Down
Loading