Iobox support

.github/workflows/build-firmware.yaml

@@ -48,3 +48,12 @@ jobs:
         with:
           name: Wideband ${{matrix.build-target}}
           path: ./firmware/deliver/${{matrix.build-target}}/wideband*
+
+      - name: Zip artifacts
+        run: zip Wideband\ ${{matrix.build-target}}.zip ./firmware/deliver/${{matrix.build-target}}/wideband*
+
+      - name: Make a new Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: Wideband\ ${{matrix.build-target}}.zip

.gitmodules

@@ -10,7 +10,7 @@
 	url = https://github.com/rusefi/kicad-libraries
 [submodule "firmware/ext/openblt"]
 	path = firmware/ext/openblt
-	url = https://github.com/rusefi/openblt
+	url = https://github.com/dron0gus/openblt
 [submodule "firmware/libfirmware"]
 	path = firmware/libfirmware
 	url = https://github.com/rusefi/libfirmware.git

README.md

@@ -1,3 +1,25 @@
+# Wideband
+
+This fork is for development of FW for [RusEFI](https://github.com/rusefi) [dual channel wideband](https://github.com/rusefi/rusefi-hardware/tree/main/lambda-x2). Based on [original desing](https://github.com/mck1117/wideband) from [mck1117](https://github.com/mck1117)
+
+For stm32f042 FW please refer to original repo. While I try to keep it buildable and unaffected by my modification I can not guaranty its functionality and provide any support.
+
+# Initial flashing
+
+For initial flashing of newly assembled device under Windows please refer to [this instruction](https://rusefi.com/forum/viewtopic.php?p=48379#p48379).
+
+I hope Linux users are experience enough to know how to use [stm32flash tool](https://github.com/ARMinARM/stm32flash). There are two sample scripts to [flash OpenBLT only](/firmware/dfu_flash_openblt.sh) and [flash combined image of OpenBLT + main FW](/firmware/dfu_flash.sh).
+
+# Update using OpenBLT
+
+[OpenBLT](https://github.com/feaser/openblt) bootloader is used for FW update functionality. Please reffer to original [documentation](https://www.feaser.com/openblt/doku.php?id=faq) on how to compile host tools and use it.
+
+There are few sample linux scripts for updating device over [CAN](/firmware/flash_can.sh) or [UART](/firmware/flash_uart.sh).
+
+Linux users can use almost any USB to CAN adapter supported by linux and providing SocketCAN interface ([for example](https://rusefi.com/forum/viewtopic.php?f=13&t=2209)). Windows users please check OpenBLT documentation.
+
+# Original readme
+
 [![Build Firmware](https://github.com/mck1117/wideband/actions/workflows/build-firmware.yaml/badge.svg)](https://github.com/mck1117/wideband/actions/workflows/build-firmware.yaml) ![license](https://img.shields.io/github/license/mck1117/wideband)
 
 # rusEFI Wideband Controller

firmware/.gdbinit

@@ -0,0 +1,6 @@
+target extended-remote localhost:3333
+file build/wideband.elf
+load
+set breakpoint auto-hw on
+set remote hardware-breakpoint-limit 8
+set remote hardware-watchpoint-limit 4

firmware/Makefile

@@ -136,7 +136,9 @@ LDSCRIPT=app.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(ALLCSRC) $(BOARDDIR)/board.c
+CSRC = $(ALLCSRC) \
+        $(BOARDDIR)/board.c \
+        boards/f1_common/openblt/shared_params.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
@@ -148,6 +150,8 @@ CPPSRC = $(ALLCPPSRC) \
           shared/flash.cpp \
           can.cpp \
           can_helper.cpp \
+          can_aemnet.cpp \
+          can_iobox.cpp \
           fault.cpp \
           lambda_conversion.cpp \
           pwm.cpp \
@@ -187,7 +191,8 @@ INCDIR = $(CONFDIR) \
          console/binary/ \
          boards/ \
          shared/ \
-         $(BOARDDIR)/io/
+         $(BOARDDIR)/io/ \
+         boards/f1_common/openblt
 
 # Define C warning options here.
 CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
@@ -236,9 +241,6 @@ ifeq ($(USE_OPENBLT),yes)
   # Reserve start of flash for OpenBLT
   USE_OPT += -Wl,--defsym=USE_BOOTLOADER=1
   DDEFS += -DUSE_OPENBLT=TRUE
-  # Shared params
-  INCDIR += boards/f1_common/openblt
-  CSRC += boards/f1_common/openblt/shared_params.c
 endif
 
 #

firmware/auxout.cpp

@@ -78,15 +78,19 @@ static const int8_t auxOutPwmChN[AFR_CHANNELS] = {
 #endif
 };
 
-void SetAuxDac(int channel, float voltage)
+void SetAuxDac(size_t channel, float voltage)
 {
+    if (channel >= AFR_CHANNELS) {
+        return;
+    }
+
     voltage = voltage / AUXOUT_GAIN;
     auto duty = voltage / VCC_VOLTS;
     duty = clampF(0, duty, 1);
 
     auxDac.SetDuty(auxOutPwmCh[channel], duty);
     // Ripple cancelation channel
-    if (auxOutPwmChN[channel >= 0]) {
+    if (auxOutPwmChN[channel] >= 0) {
         auxDac.SetDuty(auxOutPwmChN[channel], duty);
     }
 }
@@ -110,8 +114,12 @@ static const uint8_t auxOutDacCh[] = {
 #endif
 };
 
-void SetAuxDac(int channel, float voltage)
+void SetAuxDac(size_t channel, float voltage)
 {
+    if (channel >= AFR_CHANNELS) {
+        return;
+    }
+
     voltage = voltage / AUXOUT_GAIN;
 
     auxDac.SetVoltage(auxOutDacCh[channel], voltage);
@@ -158,6 +166,9 @@ void AuxOutThread(void*)
     {
         for (int ch = 0; ch < AFR_CHANNELS; ch++)
         {
+            if (cfg->auxOutputSource[ch] == AuxOutputMode::MsIoBox)
+                continue;
+
             float input = AuxGetInputSignal(cfg->auxOutputSource[ch]);
             float voltage = interpolate2d(input, cfg->auxOutBins[ch], cfg->auxOutValues[ch]);
 
@@ -192,4 +203,9 @@ void InitAuxDac()
 {
 }
 
+
+void SetAuxDac(size_t, float)
+{
+}
+
 #endif

firmware/auxout.h

@@ -3,4 +3,4 @@
 #include <cstdint>
 
 void InitAuxDac();
-void SetAuxDac(int channel, float voltage);
+void SetAuxDac(size_t channel, float voltage);

firmware/boards/f0_module/port.cpp

@@ -53,6 +53,7 @@ AnalogResult AnalogSample()
                 .NernstVoltage = AverageSamples(adcBuffer, 0) * (1.0 / NERNST_INPUT_GAIN),
                 .PumpCurrentVoltage = AverageSamples(adcBuffer, 1),
                 .HeaterSupplyVoltage = 0,
+                .NernstClamped = false,
             },
         },
         .VirtualGroundVoltageInt = AverageSamples(adcBuffer, 2),
@@ -118,15 +119,15 @@ Configuration* GetConfiguration()
 
     // See https://github.com/mck1117/wideband/issues/11 to explain this madness
     switch (3 * sel1 + sel2) {
-        case 0: config.CanIndexOffset = 2; break;
-        case 1: config.CanIndexOffset = 0; break;
-        case 2: config.CanIndexOffset = 3; break;
-        case 3: config.CanIndexOffset = 4; break;
+        case 0: config.afr[0].RusEfiIdOffset = 2; break;
+        case 1: config.afr[0].RusEfiIdOffset = 0; break;
+        case 2: config.afr[0].RusEfiIdOffset = 3; break;
+        case 3: config.afr[0].RusEfiIdOffset = 4; break;
         case 4: /* both floating, do nothing */ break;
-        case 5: config.CanIndexOffset = 1; break;
-        case 6: config.CanIndexOffset = 5; break;
-        case 7: config.CanIndexOffset = 6; break;
-        case 8: config.CanIndexOffset = 7; break;
+        case 5: config.afr[0].RusEfiIdOffset = 1; break;
+        case 6: config.afr[0].RusEfiIdOffset = 5; break;
+        case 7: config.afr[0].RusEfiIdOffset = 6; break;
+        case 8: config.afr[0].RusEfiIdOffset = 7; break;
         default: break;
     }
 
@@ -146,6 +147,11 @@ void SetConfiguration()
     );
 }
 
+void ResetConfiguration(uint16_t option)
+{
+    // NOP
+}
+
 SensorType GetSensorType()
 {
     return SensorType::LSU49;

firmware/boards/f0_module/wideband_board_config.h

@@ -17,3 +17,9 @@
 //    Nernst voltage & ESR sense
 // *******************************
 #define VM_RESISTOR_VALUE (10)
+
+// *******************************
+// Hack: allow pump driving above target temperature
+// minus this offset to avoid Vnerns voltage clamp near 0V
+// *******************************
+#define START_PUMP_TEMP_OFFSET	(200.0)