patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the implementation has used HSPI with the default VSPI pins for a long time. Change VSPI and HSPI to use the right pins in order to avoid confusing

Browse Source
This commit is contained in:
MalteSchm 2023-03-26 12:36:21 +02:00
parent d80f62d1b9
commit 06d5da50a2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Huawei_can.cpp
View File

@ -14,7 +14,7 @@ HuaweiCanClass HuaweiCan;
void HuaweiCanClass::init(uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power) void HuaweiCanClass::init(uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power)
{ {
hspi = new SPIClass(VSPI); hspi = new SPIClass(HSPI);
hspi->begin(huawei_clk, huawei_miso, huawei_mosi, huawei_cs); hspi->begin(huawei_clk, huawei_miso, huawei_mosi, huawei_cs);
pinMode(huawei_cs, OUTPUT); pinMode(huawei_cs, OUTPUT);
digitalWrite(huawei_cs, HIGH); digitalWrite(huawei_cs, HIGH);
@ -89,6 +89,7 @@ void HuaweiCanClass::onReceive(uint8_t* frame, uint8_t len)
case R48xx_DATA_OUTPUT_POWER: case R48xx_DATA_OUTPUT_POWER:
_rp.output_power = value / 1024.0; _rp.output_power = value / 1024.0;
lastUpdate = millis(); // We'll only update last update on the important params
break; break;
case R48xx_DATA_EFFICIENCY: case R48xx_DATA_EFFICIENCY:
@ -124,7 +125,7 @@ void HuaweiCanClass::onReceive(uint8_t* frame, uint8_t len)
_rp.output_current = value / 1024.0; _rp.output_current = value / 1024.0;
/* This is normally the last parameter received. Print */ /* This is normally the last parameter received. Print */
lastUpdate = millis(); lastUpdate = millis(); // We'll only update last update on the important params
MessageOutput.printf("In: %.02fV, %.02fA, %.02fW\n", _rp.input_voltage, _rp.input_current, _rp.input_power); MessageOutput.printf("In: %.02fV, %.02fA, %.02fW\n", _rp.input_voltage, _rp.input_current, _rp.input_power);
MessageOutput.printf("Out: %.02fV, %.02fA of %.02fA, %.02fW\n", _rp.output_voltage, _rp.output_current, _rp.max_output_current, _rp.output_power); MessageOutput.printf("Out: %.02fV, %.02fA of %.02fA, %.02fW\n", _rp.output_voltage, _rp.output_current, _rp.max_output_current, _rp.output_power);

2
src/InverterSettings.cpp
View File

@ -19,7 +19,7 @@ void InverterSettingsClass::init()
// Initialize inverter communication // Initialize inverter communication
MessageOutput.print(F("Initialize Hoymiles interface... ")); MessageOutput.print(F("Initialize Hoymiles interface... "));
if (PinMapping.isValidNrf24Config()) { if (PinMapping.isValidNrf24Config()) {
SPIClass* spiClass = new SPIClass(HSPI); SPIClass* spiClass = new SPIClass(VSPI);
spiClass->begin(pin.nrf24_clk, pin.nrf24_miso, pin.nrf24_mosi, pin.nrf24_cs); spiClass->begin(pin.nrf24_clk, pin.nrf24_miso, pin.nrf24_mosi, pin.nrf24_cs);
Hoymiles.setMessageOutput(&MessageOutput); Hoymiles.setMessageOutput(&MessageOutput);
Hoymiles.init(spiClass, pin.nrf24_en, pin.nrf24_irq); Hoymiles.init(spiClass, pin.nrf24_en, pin.nrf24_irq);