Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-20 16:18:49 +01:00
Code Issues Projects Releases Wiki Activity

Improvement pipsolar crc (#3316)

Browse Source 
Co-authored-by: Andreas <andreas.hergert@otrs.com>
This commit is contained in:
Andreas Hergert 2022-07-07 02:54:19 +02:00 committed by GitHub
parent 093989406f
commit e0555e140f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
esphome/components/pipsolar/pipsolar.cpp
View File

@ -768,7 +768,7 @@ uint8_t Pipsolar::check_incoming_length_(uint8_t length) {
uint8_t Pipsolar::check_incoming_crc_() { uint8_t Pipsolar::check_incoming_crc_() {
uint16_t crc16; uint16_t crc16;
crc16 = calc_crc_(read_buffer_, read_pos_ - 3); crc16 = cal_crc_half_(read_buffer_, read_pos_ - 3);
ESP_LOGD(TAG, "checking crc on incoming message"); ESP_LOGD(TAG, "checking crc on incoming message");
if (((uint8_t)((crc16) >> 8)) == read_buffer_[read_pos_ - 3] && if (((uint8_t)((crc16) >> 8)) == read_buffer_[read_pos_ - 3] &&
((uint8_t)((crc16) &0xff)) == read_buffer_[read_pos_ - 2]) { ((uint8_t)((crc16) &0xff)) == read_buffer_[read_pos_ - 2]) {
@ -797,7 +797,7 @@ uint8_t Pipsolar::send_next_command_() {
this->command_start_millis_ = millis(); this->command_start_millis_ = millis();
this->empty_uart_buffer_(); this->empty_uart_buffer_();
this->read_pos_ = 0; this->read_pos_ = 0;
crc16 = calc_crc_(byte_command, length); crc16 = cal_crc_half_(byte_command, length);
this->write_str(command); this->write_str(command);
// checksum // checksum
this->write(((uint8_t)((crc16) >> 8))); // highbyte this->write(((uint8_t)((crc16) >> 8))); // highbyte
@ -824,8 +824,8 @@ void Pipsolar::send_next_poll_() {
this->command_start_millis_ = millis(); this->command_start_millis_ = millis();
this->empty_uart_buffer_(); this->empty_uart_buffer_();
this->read_pos_ = 0; this->read_pos_ = 0;
crc16 = calc_crc_(this->used_polling_commands_[this->last_polling_command_].command, crc16 = cal_crc_half_(this->used_polling_commands_[this->last_polling_command_].command,
this->used_polling_commands_[this->last_polling_command_].length); this->used_polling_commands_[this->last_polling_command_].length);
this->write_array(this->used_polling_commands_[this->last_polling_command_].command, this->write_array(this->used_polling_commands_[this->last_polling_command_].command,
this->used_polling_commands_[this->last_polling_command_].length); this->used_polling_commands_[this->last_polling_command_].length);
// checksum // checksum
@ -892,29 +892,41 @@ void Pipsolar::add_polling_command_(const char *command, ENUMPollingCommand poll
} }
} }
uint16_t Pipsolar::calc_crc_(uint8_t *msg, int n) { uint16_t Pipsolar::cal_crc_half_(uint8_t *msg, uint8_t len) {
// Initial value. xmodem uses 0xFFFF but this example uint16_t crc;
// requires an initial value of zero.
uint16_t x = 0;
while (n--) {
x = crc_xmodem_update_(x, (uint16_t) *msg++);
}
return (x);
}
// See bottom of this page: http://www.nongnu.org/avr-libc/user-manual/group__util__crc.html uint8_t da;
// Polynomial: x^16 + x^12 + x^5 + 1 (0x1021) uint8_t *ptr;
uint16_t Pipsolar::crc_xmodem_update_(uint16_t crc, uint8_t data) { uint8_t b_crc_hign;
int i; uint8_t b_crc_low;
crc = crc ^ ((uint16_t) data << 8);
for (i = 0; i < 8; i++) { uint16_t crc_ta[16] = {0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
if (crc & 0x8000) { 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef};
crc = (crc << 1) ^ 0x1021; //(polynomial = 0x1021)
} else { ptr = msg;
crc <<= 1; crc = 0;
}
while (len-- != 0) {
da = ((uint8_t)(crc >> 8)) >> 4;
crc <<= 4;
crc ^= crc_ta[da ^ (*ptr >> 4)];
da = ((uint8_t)(crc >> 8)) >> 4;
crc <<= 4;
crc ^= crc_ta[da ^ (*ptr & 0x0f)];
ptr++;
} }
return crc;
b_crc_low = crc;
b_crc_hign = (uint8_t)(crc >> 8);
if (b_crc_low == 0x28 || b_crc_low == 0x0d || b_crc_low == 0x0a)
b_crc_low++;
if (b_crc_hign == 0x28 || b_crc_hign == 0x0d || b_crc_hign == 0x0a)
b_crc_hign++;
crc = ((uint16_t) b_crc_hign) << 8;
crc += b_crc_low;
return (crc);
} }
} // namespace pipsolar } // namespace pipsolar

3
esphome/components/pipsolar/pipsolar.h
View File

@ -193,8 +193,7 @@ class Pipsolar : public uart::UARTDevice, public PollingComponent {
void empty_uart_buffer_(); void empty_uart_buffer_();
uint8_t check_incoming_crc_(); uint8_t check_incoming_crc_();
uint8_t check_incoming_length_(uint8_t length); uint8_t check_incoming_length_(uint8_t length);
uint16_t calc_crc_(uint8_t *msg, int n); uint16_t cal_crc_half_(uint8_t *msg, uint8_t len);
uint16_t crc_xmodem_update_(uint16_t crc, uint8_t data);
uint8_t send_next_command_(); uint8_t send_next_command_();
void send_next_poll_(); void send_next_poll_();
void queue_command_(const char *command, uint8_t length); void queue_command_(const char *command, uint8_t length);