PCB version 6.0: Software changes needed?

[pipip]

I am currently running a hardware v5.0 which I bought in the "first tindie round". The device is running great :)
Anyways, I kept following EngeryMe because I really like the approach and active development. So when I realized that their is a new PCB version (6.0) I decided to start my first SMD soldering project and ordered the PCBs and parts. Unfortunately, a little later the 6.1 was published...

I have just finished soldering my first PCB 6.0 and I am ready to flash the software. I have also ordered the v6.1 from jlcpcb since they have a good discount at the moment :) So my next soldering project will be the 6.1. Anyways, I still want the 6.0 to work since it would be waste to just through it away.

Unfortunately, I am not sure what I have to do in order to get the right software changes/settings for the PCB 6.0.
The feature "handle different PCB versions (v6 hardware profile)" #126 sounds promising but it states that it is only supported with version 6.1. So what exactly do I have to change in this branch in order to make this work with the 6.0?

I looked at the multiplexer schema for 6.1 (https://github.com/jibrilsharafi/EnergyMe-Home/blob/8fa66a99f8eb18974fe1ecbabf21b296679b81f2/documentation/pcb/schematics_page_2.png) and 6.0 (https://github.com/jibrilsharafi/EnergyMe-Home/blob/38612737064c21e481a5f08a2e1d59a4115f0d94/documentation/pcb/schematics_page_2.png). As stated, the CT2 is removed (which is on the extension board; main board has channel 0, 1, 5-10.

Do I have to create a ".version = 60," profile in source/src/hardware_profile.cpp (https://github.com/jibrilsharafi/EnergyMe-Home/pull/126/changes#diff-3b1bd846b12fb5893a595f5d766932e5ad5d0f221d5fdf11a63672a6cb9a3b91)? From my understanding the 6.1 profile should work since only CT2 (Y1) is removed, the rest is the same (so only the CT2 on the extension board will not work). So I don't understand what to do/change

[jibrilsharafi]

Hi @pipip ! Thanks for moving the conversation over here.

In general, I advise to always wait for the merge in main for ordering PCBs. If instead a development version is chosen, please ask first so you don't waste money!

In this case, v6.1 has one channel less due to mechanical interference on the top board 1. Given this, one multiplexer channel is unused, and in order to avoid having a dead/unusable channel in software, I just shifted all channels after 2 so that we don't have a gap.
Moreover, also the LED pins are swapped, so they need to be remapped.

You can simply define a v6.0 hardware version in source/src/hardware_profile.cpp with the correct pin mapping, but if you are not in a rush, I will do it anyway in the following days/weeks.

Sorry for the delay but this period is quite busy for me!

[pipip]

Hey @jibrilsharafi: thanks, that sounds good. I am not in a rush :) I will wait

/edit
I went via oswhlab, so I did not really notice that 6.0 was not ready yet. Now I know better and pay more attention to git.

[jibrilsharafi]

Hi @pipip , I just released the 2.0.0 version with the profile for PCB v6.0.

To use it, simply add the following flag in platformio.ini when compiling-DPCB_VERSION_FALLBACK=60

Let me know if this work!

[pipip]

Everything is working fine with DPCB_VERSION_FALLBACK=60, thank you very much