WIP: BL0942 powermeter

mos.yml

@@ -700,6 +700,7 @@ conds:
       name: Plus1PMMini
       sources:
         - src/ShellyMini1PMGen3
+        - src/BL0942
       libs:
         - location: https://github.com/mongoose-os-libs/mongoose
       build_vars:
@@ -739,6 +740,8 @@ conds:
       name: Mini1PMG3
       libs:
         - location: https://github.com/mongoose-os-libs/mongoose
+      sources:
+        - src/BL0942
       build_vars:
         OTA_DATA_ADDR: 0x10000
         OTA_DATA_SIZE: 0x4000

src/BL0942/shelly_pm_bl0942.cpp

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) Shelly-HomeKit Contributors
+ * All rights reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "shelly_pm_bl0942.hpp"
+
+#include <cmath>
+
+#include "mgos.hpp"
+
+namespace shelly {
+
+BL0942PowerMeter::BL0942PowerMeter(int id, int tx_pin, int rx_pin,
+                                   int meas_time, int uart_no)
+    : PowerMeter(id),
+      tx_pin_(tx_pin),
+      rx_pin_(rx_pin),
+      meas_time_(meas_time),
+      uart_no_(uart_no),
+      meas_timer_(std::bind(&BL0942PowerMeter::MeasureTimerCB, this)) {
+}
+
+BL0942PowerMeter::~BL0942PowerMeter() {
+}
+
+#define BL_READ 0x58
+#define BL_WRITE 0xA8
+
+#define BL_SOFT_RESET 0x1C
+#define BL_USR_WRPROT 0x1D
+#define BL_MODE 0x19
+#define BL_TPS_CTRL 0x1B
+#define BL_I_FAST_RMS_CTRL 0x10
+
+#define BL_ADDR 0x0
+
+#define BL_WATT 0x6
+
+Status BL0942PowerMeter::Init() {
+  if (rx_pin_ < 0 && tx_pin_ < 0) {
+    return mgos::Errorf(STATUS_INVALID_ARGUMENT, "no valid pins");
+  }
+
+  struct mgos_uart_config ucfg;
+  mgos_uart_config_set_defaults(uart_no_, &ucfg);
+
+  ucfg.baud_rate = 9600;
+
+  ucfg.dev.rx_gpio = rx_pin_;
+  ucfg.dev.tx_gpio = tx_pin_;
+  ucfg.dev.cts_gpio = -1;
+  ucfg.dev.rts_gpio = -1;
+
+  if (!mgos_uart_configure(uart_no_, &ucfg)) {
+    return mgos::Errorf(STATUS_INVALID_ARGUMENT, "Failed to configure UART");
+  }
+
+  mgos_uart_set_rx_enabled(uart_no_, true);
+
+  meas_timer_.Reset(meas_time_ * 1000, MGOS_TIMER_REPEAT);
+  LOG(LL_INFO, ("BL0942 @ %d/%d", rx_pin_, tx_pin_));
+
+  this->WriteReg(BL_SOFT_RESET, 0x5a5a5a);
+  this->WriteReg(BL_USR_WRPROT, 0x550000);
+  this->WriteReg(BL_MODE, 0x001000);
+  this->WriteReg(BL_TPS_CTRL, 0xFF4700);
+  this->WriteReg(BL_I_FAST_RMS_CTRL, 0x1C1800);
+
+  return Status::OK();
+}
+
+StatusOr<float> BL0942PowerMeter::GetPowerW() {
+  return apa_;
+}
+
+StatusOr<float> BL0942PowerMeter::GetEnergyWH() {
+  return aea_;
+}
+
+bool BL0942PowerMeter::WriteReg(uint8_t reg, uint32_t val) {
+  uint8_t tx_buf[6] = {BL_WRITE | BL_ADDR,
+                       reg,
+                       (uint8_t) ((val >> 16) & 0xFF),
+                       (uint8_t) ((val >> 8) & 0xFF),
+                       (uint8_t) ((val >> 0) & 0xFF),
+                       0};
+
+  for (int i = 0; i < 5; i++) {
+    tx_buf[5] += tx_buf[i];
+  }
+  tx_buf[5] = tx_buf[5] ^ 0xFF;
+  mgos_uart_write(uart_no_, tx_buf, 6);
+  mgos_uart_flush(uart_no_);
+  mgos_msleep(1);
+  return true;
+}
+
+bool BL0942PowerMeter::ReadReg(uint8_t reg, uint8_t *rx_buf, size_t len) {
+  uint8_t tx_buf[2] = {BL_READ | BL_ADDR, reg};
+  size_t j = mgos_uart_write(uart_no_, tx_buf, 2);
+  mgos_uart_flush(uart_no_);
+
+  // Delay to allow data to be available
+  int baud = 9600;
+  mgos_msleep(roundf(len * 8 / baud) * 1e3);
+
+  int read_len = mgos_uart_read(uart_no_, rx_buf, len);
+  LOG(LL_ERROR, ("rx %i", read_len));
+
+  uint8_t chksum = tx_buf[0] + tx_buf[1];
+  for (int i = 0; i < len; i++) {
+    chksum += rx_buf[i];
+    LOG(LL_ERROR, ("%08X", rx_buf[i]));
+  }
+  chksum ^= 0xFF;
+
+  if (read_len != len || rx_buf[len - 1] != chksum) {
+    LOG(LL_ERROR, ("wrong checksum"));
+    return false;
+  }
+  return true;
+}
+
+void BL0942PowerMeter::MeasureTimerCB() {
+  LOG(LL_ERROR, ("timer"));
+  int len = 20;  // including 1 checksum byte
+  uint8_t rx_buf[len] = {};
+  // if (this->ReadReg(0xAA, rx_buf, len)) {
+  // }
+  if (this->ReadReg(0xAA, rx_buf, 4)) {
+    uint32_t d = rx_buf[2] << 16 | rx_buf[1] << 8 | rx_buf[0];
+    if (d & (1 << 23)) {
+      d |= 0xFF000000;
+    }
+    apa_ = d;
+  }
+}
+
+}  // namespace shelly

src/BL0942/shelly_pm_bl0942.hpp

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Shelly-HomeKit Contributors
+ * All rights reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "shelly_pm.hpp"
+
+#include "mgos_timers.hpp"
+
+namespace shelly {
+
+class BL0942PowerMeter : public PowerMeter {
+ public:
+  BL0942PowerMeter(int id, int tx_pin, int rx_pin, int meas_time, int uart_no);
+  virtual ~BL0942PowerMeter();
+
+  Status Init() override;
+  StatusOr<float> GetPowerW() override;
+  StatusOr<float> GetEnergyWH() override;
+
+ private:
+  void MeasureTimerCB();
+
+  const int tx_pin_, rx_pin_, meas_time_, uart_no_;
+
+  float apa_ = 0;  // Last active power reading, W.
+  float aea_ = 0;  // Accumulated active energy, Wh.
+                   //
+  bool ReadReg(uint8_t reg, uint8_t *rx_buf, size_t len);
+  bool WriteReg(uint8_t reg, uint32_t val);
+
+  mgos::Timer meas_timer_;
+};
+
+}  // namespace shelly

src/ShellyMini1PMGen3/shelly_init.cpp

@@ -19,6 +19,7 @@
 #include "shelly_hap_input.hpp"
 #include "shelly_input_pin.hpp"
 #include "shelly_main.hpp"
+#include "shelly_pm_bl0942.hpp"
 #include "shelly_sys_led_btn.hpp"
 #include "shelly_temp_sensor_ntc.hpp"
 
@@ -35,20 +36,19 @@ void CreatePeripherals(std::vector<std::unique_ptr<Input>> *inputs,
   in->Init();
   inputs->emplace_back(in);
 
-// not yet compatible
 #ifdef MGOS_HAVE_ADC
   sys_temp->reset(new TempSensorSDNT1608X103F3950(3, 3.3f, 10000.0f));
 #endif
 
-  // std::unique_ptr<PowerMeter> pm()
+  std::unique_ptr<PowerMeter> pm(new BL0942PowerMeter(1, 6, 7, 1, 1));
   // BL0942 GPIO6 TX GPIO7 RX
-  // const Status &st = pm->Init();
-  // if (st.ok()) {
-  //   pms->emplace_back(std::move(pm));
-  // } else {
-  //   const std::string &s = st.ToString();
-  //   LOG(LL_ERROR, ("PM init failed: %s", s.c_str()));
-  // }
+  const Status &st = pm->Init();
+  if (st.ok()) {
+    pms->emplace_back(std::move(pm));
+  } else {
+    const std::string &s = st.ToString();
+    LOG(LL_ERROR, ("PM init failed: %s", s.c_str()));
+  }
 
   InitSysLED(LED_GPIO, LED_ON);
   InitSysBtn(BTN_GPIO, BTN_DOWN);