mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update xnrg_04_mcp39f501.ino 

Fix Exception 9 (Buffer overflow)
This commit is contained in:
Theo Arends 2019-02-05 10:13:22 +01:00
parent b839d7e80e
commit e9ad78c616
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sonoff/xnrg_04_mcp39f501.ino
View File

@ -28,6 +28,7 @@
#define XNRG_04 4 #define XNRG_04 4
#define MCP_BAUDRATE 4800
#define MCP_TIMEOUT 4 #define MCP_TIMEOUT 4
#define MCP_CALIBRATION_TIMEOUT 2 #define MCP_CALIBRATION_TIMEOUT 2
@ -66,7 +67,7 @@
#define MCP_BUFFER_SIZE 60 #define MCP_BUFFER_SIZE 60
#include <TasmotaSerial.h> #include <TasmotaSerial.h>
TasmotaSerial *McpSerial; TasmotaSerial *McpSerial = NULL;
typedef struct mcp_cal_registers_type { typedef struct mcp_cal_registers_type {
uint16_t gain_current_rms; uint16_t gain_current_rms;
@ -92,7 +93,6 @@ typedef struct mcp_cal_registers_type {
} mcp_cal_registers_type; } mcp_cal_registers_type;
char *mcp_buffer = NULL; // Serial receive buffer char *mcp_buffer = NULL; // Serial receive buffer
int mcp_byte_counter = 0; // Index in serial receive buffer
unsigned long mcp_kWhcounter = 0; unsigned long mcp_kWhcounter = 0;
uint32_t mcp_system_configuration = 0x03000000; uint32_t mcp_system_configuration = 0x03000000;
@ -475,8 +475,10 @@ void McpParseData(void)
void McpSerialInput(void) void McpSerialInput(void)
{ {
if (McpSerial->available()) { if (McpSerial->available()) {
int mcp_byte_counter = 0;
unsigned long start = millis(); unsigned long start = millis();
while (millis() - start < 20) { while ((millis() - start < (24000 / MCP_BAUDRATE) +1) && (mcp_byte_counter < MCP_BUFFER_SIZE)) {
yield(); yield();
if (McpSerial->available()) { if (McpSerial->available()) {
mcp_buffer[mcp_byte_counter++] = McpSerial->read(); mcp_buffer[mcp_byte_counter++] = McpSerial->read();
@ -515,7 +517,6 @@ void McpSerialInput(void)
mcp_timeout = 0; mcp_timeout = 0;
} }
mcp_byte_counter = 0;
McpSerial->flush(); McpSerial->flush();
} }
} }
@ -556,7 +557,7 @@ void McpSnsInit(void)
{ {
// Software serial init needs to be done here as earlier (serial) interrupts may lead to Exceptions // Software serial init needs to be done here as earlier (serial) interrupts may lead to Exceptions
McpSerial = new TasmotaSerial(pin[GPIO_MCP39F5_RX], pin[GPIO_MCP39F5_TX], 1); McpSerial = new TasmotaSerial(pin[GPIO_MCP39F5_RX], pin[GPIO_MCP39F5_TX], 1);
if (McpSerial->begin(4800)) { if (McpSerial->begin(MCP_BAUDRATE)) {
if (McpSerial->hardwareSerial()) { ClaimSerial(); } if (McpSerial->hardwareSerial()) { ClaimSerial(); }
if (pin[GPIO_MCP39F5_RST] < 99) { if (pin[GPIO_MCP39F5_RST] < 99) {
digitalWrite(pin[GPIO_MCP39F5_RST], 1); // MCP enable digitalWrite(pin[GPIO_MCP39F5_RST], 1); // MCP enable
@ -652,10 +653,10 @@ int Xnrg04(uint8_t function)
McpSnsInit(); McpSnsInit();
break; break;
case FUNC_LOOP: case FUNC_LOOP:
McpSerialInput(); if (McpSerial) { McpSerialInput(); }
break; break;
case FUNC_EVERY_SECOND: case FUNC_EVERY_SECOND:
McpEverySecond(); if (McpSerial) { McpEverySecond(); }
break; break;
case FUNC_COMMAND: case FUNC_COMMAND:
result = McpCommand(); result = McpCommand();