Skip to content

Commit ff4137f

Browse files
authored
Merge pull request #284 from Workshopshed/master
Revert "Добавлена поддержка EEPROM для сохранения PID-параметров и пр…
2 parents d0a456a + 61b6584 commit ff4137f

File tree

3 files changed

+1
-63
lines changed

3 files changed

+1
-63
lines changed

DallasTemperature.cpp

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -806,26 +806,4 @@ int16_t DallasTemperature::getUserDataByIndex(uint8_t deviceIndex) {
806806
DeviceAddress deviceAddress;
807807
getAddress(deviceAddress, deviceIndex);
808808
return getUserData((uint8_t*)deviceAddress);
809-
}
810-
struct PIDParams { float Kp; float Ki; float Kd; uint16_t checksum; };
811-
static uint16_t calcChecksum(const PIDParams &p) {
812-
uint32_t sum = 0;
813-
sum += *((uint32_t*)&p.Kp);
814-
sum += *((uint32_t*)&p.Ki);
815-
sum += *((uint32_t*)&p.Kd);
816-
return (uint16_t)(sum & 0xFFFF);
817-
}
818-
bool PID::saveParameters(int addr) {
819-
PIDParams p{dispKp, dispKi, dispKd, 0};
820-
p.checksum = calcChecksum(p);
821-
for (size_t i = 0; i < sizeof(p); ++i) EEPROM.write(addr + i, *((uint8_t*)&p + i));
822-
EEPROM.commit();
823-
return true;
824-
}
825-
bool PID::loadParameters(int addr) {
826-
PIDParams p;
827-
for (size_t i = 0; i < sizeof(p); ++i) *((uint8_t*)&p + i) = EEPROM.read(addr + i);
828-
if (p.checksum != calcChecksum(p)) return false;
829-
dispKp = p.Kp; dispKi = p.Ki; dispKd = p.Kd;
830-
return true;
831-
}
809+
}

DallasTemperature.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ class DallasTemperature {
121121
bool recallScratchPad(const uint8_t* = nullptr);
122122
void setAutoSaveScratchPad(bool);
123123
bool getAutoSaveScratchPad(void);
124-
bool saveParameters(int addr = 0);
125-
bool loadParameters(int addr = 0);
126-
127124

128125
#if REQUIRESALARMS
129126
typedef void AlarmHandler(const uint8_t*);

examples/EEPROM_PID/EEPROM_PID.ino

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)