Combine Base and Advanced into the SolarXiao basic power profile

This commit is contained in:
mikecarper committed 2026-10-21 16:45:34 -07:00
1 parent 7182c01ff8
commit c6f1300af8
5 files changed
+141 -99

No files matched your search

+18 -9
View File
@@ -7,9 +7,12 @@ saved-policy reset require local USB. Commands do not change RF settings.
## Automatic detection and manual overrides
The default is `auto` when no carrier selection has been saved. Existing saved
`mppt` or `advanced` selections remain manual overrides after an update.
Use `set solar.board auto` to enable detection on such an installation.
There are three power profiles: `auto`, `basic` and `mppt`. Base and Advanced
share `basic` because their onboard power telemetry and software controls are
the same; their different analog charger designs require no different driver.
The default is `auto` when no carrier selection has been saved. Saved MPPT
selections remain manual overrides, and saved Base/Advanced selections load as
`basic`. Use `set solar.board auto` to enable detection on such an installation.
The firmware environment, hardware/OTA identity and flash layout are unchanged.
```
@@ -43,12 +46,18 @@ Manual settings are available when the physical carrier is known:
| Setting | Behavior |
| --- | --- |
| `set solar.board auto` | Verify INA260 before enabling MPPT; otherwise self-only, retrying. |
| `set solar.board base` | Base/CN3791 capabilities, self readings, no native I2C access. |
| `set solar.board advanced` | Advanced/BQ24650 capabilities, self readings, no native I2C access. |
| `set solar.board basic` | Base/Advanced self battery voltage and MCU temperature; no native I2C access. |
| `set solar.board mppt` | Enable native access without requiring INA260 detection; existing charger write identity checks still apply. |
For Base or Advanced, an explicit selection reports that design's hardware
capabilities and the live XIAO battery ADC and processor temperature.
Legacy `base` and `advanced` command values are compatibility aliases for
`basic`; they are not separate modes. Readbacks and help use the three canonical
names. Existing Base/Advanced records load as `basic` without being rewritten;
new Basic saves use the original Advanced record value, preserving the same
self-only behavior across upgrades.
For Base or Advanced, `basic` reports the common hardware capabilities and live
XIAO battery ADC and processor temperature. It does not claim which analog
charger is fitted.
The existing self telemetry stays on channel 1, with voltage and temperature as
different LPP types. It adds no invented charger flags, current, watts, battery
NTC temperature or panel measurements. `get solar battery` aliases the self
@@ -72,9 +81,9 @@ NTC goes only to the charger, and current/voltage/MPP setpoints use hardware
resistors, switches and a solder jumper. An OTA update cannot measure those
signals or change those setpoints without additional hardware connections.
Manual Base/Advanced mode suppresses native LTC4162/INA260 polling, register reads/writes,
Manual Basic mode suppresses native LTC4162/INA260 polling, register reads/writes,
replay and telemetry/history channels 2..13. `get mppt`, `set mppt ...` and
`mppt ...` explain that the selected carrier has no digital charger interface.
`mppt ...` explain that Basic Base/Advanced layouts have no digital charger interface.
Pending auto mode only probes INA260 identity; it does not access the charger.
The generic sensor scanner still reserves native addresses 0x40 and 0x68, so it
cannot bypass that policy. Optional external sensor channels still start at 14.
+15 -18
View File
@@ -6,8 +6,9 @@
namespace mesh { namespace solar {
namespace {
// Complete canonical records detect bad version, length, value or complement.
// Complete records detect bad version, length, value or complement.
// The filesystem adapter also verifies atomic publication and public readback.
// Value 3 is the old Base setting, accepted on read but no longer written.
const uint8_t images[4][CarrierSelection::IMAGE_SIZE] = {
{'S','X','B',1,0,0xff,0xa5,0x5a},
{'S','X','B',1,1,0xfe,0xa5,0x5a},
@@ -21,12 +22,12 @@ void CarrierSelection::begin() {
verified_mppt=false; probed=false; next_probe=0;
if (!healthy || !store.exists()) return;
uint8_t image[IMAGE_SIZE];
if (!store.load(image,sizeof(image)) || image[4]>Base
if (!store.load(image,sizeof(image)) || image[4]>=sizeof(images)/sizeof(images[0])
|| memcmp(image,images[image[4]],sizeof(image))) {
healthy=false;
return;
}
type=static_cast<Type>(image[4]); saved=true;
type=image[4]==3?Basic:static_cast<Type>(image[4]); saved=true;
}
void CarrierSelection::service(Bus& bus,uint32_t now) {
@@ -56,11 +57,11 @@ bool CarrierSelection::handle(const char* command,char* reply,size_t capacity,
float battery_v,float mcu_c,bool history_available) {
if (!command || !reply || !capacity) return false;
if (!strcmp(command,"get solar.board")) {
if (!healthy) snprintf(reply,capacity,"Err - carrier selection unconfirmed; set solar.board auto|advanced|base|mppt");
if (!healthy) snprintf(reply,capacity,"Err - carrier selection unconfirmed; set solar.board auto|basic|mppt");
else if (type==Auto) snprintf(reply,capacity,"> auto source=%s result=%s",saved?"saved":"default",
verified_mppt?"mppt (INA260 ID verified)":"self-only (MPPT unconfirmed; Base/Advanced indistinguishable)");
else snprintf(reply,capacity,"> %s source=%s (manual override)",
type==Advanced?"advanced":type==Base?"base":"mppt",saved?"saved":"default");
type==Basic?"basic":"mppt",saved?"saved":"default");
return true;
}
if (!strncmp(command,"set solar.board",15) && (!command[15] || command[15]==' ')) {
@@ -69,18 +70,17 @@ bool CarrierSelection::handle(const char* command,char* reply,size_t capacity,
Type requested=Auto;
bool valid=true;
if (!strcmp(value,"auto")) requested=Auto;
else if (!strcmp(value,"advanced")) requested=Advanced;
else if (!strcmp(value,"base")) requested=Base;
else if (!strcmp(value,"basic") || !strcmp(value,"advanced") || !strcmp(value,"base")) requested=Basic;
else if (!strcmp(value,"mppt")) requested=Mppt;
else valid=false;
if (!valid) {
snprintf(reply,capacity,"Err - use set solar.board auto|advanced|base|mppt");
snprintf(reply,capacity,"Err - use set solar.board auto|basic|mppt");
} else if (!select(requested)) {
snprintf(reply,capacity,"Err - carrier save unconfirmed; native access blocked; repeat selection");
} else if (type==Auto) {
snprintf(reply,capacity,"OK - auto saved; verifying INA260; self ADC/MCU retained; verified MPPT reloads retained charger overrides");
} else if (type==Advanced || type==Base) {
snprintf(reply,capacity,"OK - %s saved; native LTC/INA access disabled; self ADC/MCU telemetry retained",type==Base?"Base":"Advanced");
} else if (type==Basic) {
snprintf(reply,capacity,"OK - basic (Base/Advanced) saved; native LTC/INA access disabled; self ADC/MCU telemetry retained");
} else {
snprintf(reply,capacity,"OK - MPPT saved; native access and retained charger overrides re-enabled");
}
@@ -100,20 +100,17 @@ bool CarrierSelection::handle(const char* command,char* reply,size_t capacity,
? "> get telemetry.volt [1-7]; get telemetry.temp [1-7]; 30min samples, 7d RAM history; voltage trend does not measure charge current"
: "Err - telemetry history is not included in this build");
} else if (!healthy) {
snprintf(reply,capacity,"Err - carrier selection unconfirmed; self readings available; set solar.board auto|advanced|base|mppt");
snprintf(reply,capacity,"Err - carrier selection unconfirmed; self readings available; set solar.board auto|basic|mppt");
} else if (!*key || !strcmp(key,"info")) {
if (type==Auto) snprintf(reply,capacity,"> mode=auto source=%s %s",saved?"saved":"default",
verified_mppt?"carrier=mppt (INA260 verified); use get mppt for LTC4162 identity/readings"
:"result=self-only; INA260 not verified; Base/Advanced cannot be distinguished");
else snprintf(reply,capacity,"> carrier=%s source=%s charger=%s; %s",
type==Advanced?"advanced":type==Base?"base":"mppt",saved?"configured":"default",
type==Advanced?"BQ24650":type==Base?"CN3791":"LTC4162",
else snprintf(reply,capacity,"> carrier=%s source=%s; %s",
type==Basic?"basic (Base/Advanced)":"mppt",saved?"configured":"default",
type==Mppt?"use get mppt for live chip identity/readings":"ADC/MCU only; charger settings hardware-only");
} else if (!strcmp(key,"capabilities")) {
const char* capabilities=type==Advanced
? "> Advanced: battery ADC + MCU temp; solar V/I, battery I/W, NTC and charger flags unwired; settings hardware-only"
: type==Base
? "> Base: battery ADC + MCU temp; CN3791 analog charger has no digital readings/settings; other power signals unwired"
const char* capabilities=type==Basic
? "> Basic (Base/Advanced): battery ADC + MCU temp; no digital power readings/settings on these layouts"
: nativeAllowed()
? "> MPPT: self ADC/MCU + INA260 V/A/W + LTC4162 readings/settings when reachable; use get mppt fields 0"
: "> Auto: self ADC/MCU only until INA260 ID verifies MPPT; Base/Advanced have no digital identity; retrying detection";
+3 -4
View File
@@ -8,8 +8,8 @@ namespace mesh { namespace solar {
// responses leave self-only telemetry; Base and Advanced have no digital ID.
class CarrierSelection {
public:
// Preserve the original manual record values for installed selections.
enum Type : uint8_t { Mppt = 0, Advanced = 1, Auto = 2, Base = 3 };
// Legacy Advanced (1) and Base (3) records both load as Basic.
enum Type : uint8_t { Mppt = 0, Basic = 1, Auto = 2 };
static constexpr size_t IMAGE_SIZE = 8;
private:
@@ -27,8 +27,7 @@ public:
void begin();
void service(Bus& bus, uint32_t now);
bool nativeAllowed() const { return healthy && (type == Mppt || (type == Auto && verified_mppt)); }
bool isAdvanced() const { return healthy && type == Advanced; }
bool isBase() const { return healthy && type == Base; }
bool isBasic() const { return healthy && type == Basic; }
bool isAuto() const { return healthy && type == Auto; }
bool settingsHealthy() const { return healthy; }
bool handle(const char* command, char* reply, size_t capacity,
+3 -5
View File
@@ -115,13 +115,11 @@ bool handleCommand(const char* command,char* reply,size_t capacity,bool local) {
const bool mppt=(!strncmp(command,"get mppt",8) && (!command[8] || command[8]==' '))
|| !strncmp(command,"set mppt ",9) || !strncmp(command,"mppt ",5);
if (mppt && !selection.nativeAllowed()) {
const char* error=selection.isAdvanced()
? "Err - BQ24650 Advanced has no digital charger/INA interface; use get solar readings"
: selection.isBase()
? "Err - CN3791 Base has no digital charger/INA interface; use get solar readings"
const char* error=selection.isBasic()
? "Err - basic (Base/Advanced) has no digital charger/INA interface; use get solar readings"
: selection.isAuto()
? "Err - auto has not verified INA260; self-only; use get solar.board or set solar.board mppt for manual override"
: "Err - carrier selection unconfirmed; set solar.board auto|advanced|base|mppt";
: "Err - carrier selection unconfirmed; set solar.board auto|basic|mppt";
snprintf(reply,capacity,"%s",error);
return true;
}
+102 -63
View File
@@ -75,7 +75,7 @@ void has(const std::string& text,const char* wanted) {
assert(text.find(wanted)!=std::string::npos);
}
void blocked(CarrierSelection& c) {
assert(!c.nativeAllowed() && !c.settingsHealthy() && !c.isAdvanced());
assert(!c.nativeAllowed() && !c.settingsHealthy() && !c.isBasic());
has(cli(c,"get solar.board"),"unconfirmed");
}
int main(int argc,char** argv) {
@@ -83,34 +83,31 @@ int main(int argc,char** argv) {
if(scenario=="persistence") {
MemoryStore store;CarrierSelection c(store);
assert(!c.nativeAllowed());c.begin();
assert(c.settingsHealthy() && c.isAuto() && !c.nativeAllowed() && !c.isAdvanced());
assert(c.settingsHealthy() && c.isAuto() && !c.nativeAllowed() && !c.isBasic());
assert(!store.loads && !store.saves && !store.present);
has(cli(c,"get solar.board"),"source=default");
has(cli(c,"get solar.board"),"auto");assert(!store.saves);
has(cli(c,"set solar.board advanced"),"OK");
assert(c.isAdvanced() && !c.nativeAllowed() && store.saves==1);
has(cli(c,"set solar.board basic"),"OK");
assert(c.isBasic() && !c.nativeAllowed() && store.saves==1);
assert(store.bytes.size()==CarrierSelection::IMAGE_SIZE);
assert(store.bytes[4]==1 && store.bytes[5]==0xfe);
CarrierSelection restarted(store);restarted.begin();
assert(restarted.isAdvanced() && !restarted.nativeAllowed());
assert(restarted.isBasic() && !restarted.nativeAllowed());
has(cli(restarted,"get solar.board"),"source=saved");
has(cli(restarted,"get solar info"),"BQ24650");
has(cli(restarted,"get solar capabilities"),"unwired");
has(cli(restarted,"get solar info"),"basic");
has(cli(restarted,"get solar capabilities"),"MCU");
assert(store.saves==1);
has(cli(restarted,"set solar.board mppt"),"retained charger overrides");
CarrierSelection mppt(store);mppt.begin();
assert(mppt.nativeAllowed() && !mppt.isAdvanced());
assert(mppt.nativeAllowed() && !mppt.isBasic());
has(cli(mppt,"get solar.board"),"mppt source=saved");
cli(mppt,"set solar.board base");assert(mppt.isBase() && !mppt.nativeAllowed());
CarrierSelection base(store);base.begin();assert(base.isBase());
has(cli(base,"get solar info"),"CN3791");
has(cli(base,"get solar capabilities"),"Base");
cli(base,"set solar.board auto");assert(base.isAuto() && !base.nativeAllowed());
cli(mppt,"set solar.board auto");assert(mppt.isAuto() && !mppt.nativeAllowed());
CarrierSelection automatic(store);automatic.begin();
assert(automatic.isAuto() && !automatic.nativeAllowed());
has(cli(automatic,"get solar.board"),"source=saved");
} else if(scenario=="invalid-records") {
MemoryStore reference;CarrierSelection baseline(reference);baseline.begin();
cli(baseline,"set solar.board advanced");const auto valid=reference.bytes;
cli(baseline,"set solar.board basic");const auto valid=reference.bytes;
for(size_t byte=0;byte<valid.size();++byte) {
MemoryStore store;store.present=true;store.bytes=valid;store.bytes[byte]^=0x40;
CarrierSelection c(store);c.begin();blocked(c);assert(!store.saves);
@@ -120,21 +117,27 @@ int main(int argc,char** argv) {
MemoryStore store;store.present=true;store.bytes=valid;store.bytes.resize(size);
CarrierSelection c(store);c.begin();blocked(c);assert(!store.saves);
}
for(unsigned mode=4;mode<=255;++mode) {
MemoryStore store;store.present=true;
store.bytes={'S','X','B',1,uint8_t(mode),uint8_t(0xff^mode),0xa5,0x5a};
CarrierSelection c(store);IdentityBus bus;c.begin();blocked(c);
c.service(bus,0);assert(!bus.reads && !bus.writes && !store.saves);
}
MemoryStore store;store.present=true;store.bytes=valid;store.fail_load=true;
CarrierSelection c(store);c.begin();blocked(c);
store.fail_load=false;cli(c,"set solar.board advanced");assert(c.isAdvanced());
store.fail_load=false;cli(c,"set solar.board basic");assert(c.isBasic());
store.available_now=false;c.begin();blocked(c);
const unsigned saves=store.saves;has(cli(c,"set solar.board mppt"),"unconfirmed");
assert(store.saves==saves);blocked(c);
store.available_now=true;c.begin();assert(c.isAdvanced());
store.available_now=true;c.begin();assert(c.isBasic());
} else if(scenario=="save-failures") {
for(bool published:{false,true}) {
MemoryStore store;CarrierSelection c(store);c.begin();
store.fail_save=true;store.publish_before_failure=published;
has(cli(c,"set solar.board advanced"),"native access blocked");blocked(c);
has(cli(c,"set solar.board basic"),"native access blocked");blocked(c);
assert(store.present==published);
store.fail_save=false;
has(cli(c,"set solar.board advanced"),"OK");assert(c.isAdvanced());
has(cli(c,"set solar.board basic"),"OK");assert(c.isBasic());
store.fail_save=true;store.publish_before_failure=published;
has(cli(c,"set solar.board mppt"),"unconfirmed");blocked(c);
assert(store.bytes[4]==(published?0:1));
@@ -142,7 +145,7 @@ int main(int argc,char** argv) {
cli(c,"set solar.board mppt");assert(c.nativeAllowed());
}
} else if(scenario=="readings-history") {
MemoryStore store;CarrierSelection c(store);c.begin();cli(c,"set solar.board advanced");
MemoryStore store;CarrierSelection c(store);c.begin();cli(c,"set solar.board basic");
has(cli(c,"get solar readings"),"battery=3.876V MCU=27.25C");
has(cli(c,"get solar battery"),"processor");
has(cli(c,"get solar readings"),"self channel=1");
@@ -164,17 +167,18 @@ int main(int argc,char** argv) {
assert(!c.handle(unrelated,reply,sizeof(reply),3.8f,25,true));
}
for(const char* invalid:{"set solar.board", "set solar.board unknown",
"set solar.board ADVANCED", "set solar.board advanced extra",
"set solar.board advanced ", "get solar unknown"}) {
"set solar.board BASIC", "set solar.board basic extra",
"set solar.board basic ", "get solar unknown"}) {
has(cli(c,invalid),"Err");assert(!store.saves && c.isAuto() && !c.nativeAllowed());
}
has(cli(c,"set solar.board unknown"),"auto|basic|mppt");
assert(!c.handle(nullptr,reply,sizeof(reply),3.8f,25,true));
assert(!c.handle("get solar",nullptr,sizeof(reply),3.8f,25,true));
assert(!c.handle("get solar",reply,0,3.8f,25,true));
for(const char* cmd:{"get solar", "get solar info", "get solar.board",
"get solar capabilities", "get solar readings", "get solar battery",
"get solar history", "set solar.board advanced", "set solar.board mppt",
"set solar.board auto", "set solar.board base"}) {
"get solar history", "set solar.board basic", "set solar.board mppt",
"set solar.board auto", "set solar.board base", "set solar.board advanced"}) {
for(size_t capacity=1;capacity<=157;++capacity) {
std::vector<char> guarded(capacity+16,'~');
char* out=guarded.data()+8;
@@ -191,7 +195,7 @@ int main(int argc,char** argv) {
assert(!store.saves);has(cli(c,"get solar.board"),"auto");
bus.online=false;const unsigned reads=bus.reads;
c.service(bus,5000);c.service(bus,100000);assert(c.nativeAllowed() && bus.reads==reads);
cli(c,"set solar.board advanced");assert(!c.nativeAllowed());
cli(c,"set solar.board basic");assert(!c.nativeAllowed());
c.service(bus,100001);assert(bus.reads==reads);
cli(c,"set solar.board auto");assert(c.isAuto() && !c.nativeAllowed());
bus.online=true;bus.device=0x227f;c.service(bus,100002);
@@ -207,7 +211,7 @@ int main(int argc,char** argv) {
if(fault==2)bus.device=0x2260;
if(fault==3){bus.manufacturer=0;bus.device=0;} // ACK alone is not identity.
if(fault==4)bus.fail_reg=0xff;
c.service(bus,123);assert(!c.nativeAllowed() && !c.isAdvanced() && !c.isBase());
c.service(bus,123);assert(!c.nativeAllowed() && !c.isBasic());
const unsigned reads=bus.reads;assert(reads>=1 && reads<=2 && !bus.writes);
bus.online=true;bus.manufacturer=0x5449;bus.device=0x2270;bus.fail_reg=-1;
c.service(bus,124);c.service(bus,5122);assert(bus.reads==reads && !c.nativeAllowed());
@@ -221,7 +225,7 @@ int main(int argc,char** argv) {
bus.online=true;c.service(bus,UINT32_MAX);c.service(bus,0);c.service(bus,3998);
assert(bus.reads==reads && !c.nativeAllowed());
c.service(bus,3999);assert(c.nativeAllowed() && bus.reads==reads+2);
for(const char* mode:{"set solar.board advanced","set solar.board base","set solar.board mppt"}) {
for(const char* mode:{"set solar.board basic","set solar.board mppt"}) {
cli(c,mode);const unsigned before=bus.reads;
c.service(bus,10000);c.service(bus,0xf0000000);assert(bus.reads==before);
}
@@ -229,14 +233,35 @@ int main(int argc,char** argv) {
store.fail_save=true;cli(c,"set solar.board mppt");blocked(c);
const unsigned before=bus.reads;c.service(bus,1);c.service(bus,99999);
assert(bus.reads==before && !bus.writes);
} else if(scenario=="legacy-manual-records") {
for(uint8_t mode:{0,1}) {
} else if(scenario=="legacy-records-aliases") {
for(uint8_t mode:{0,1,2,3}) {
MemoryStore store;store.present=true;
store.bytes={'S','X','B',1,mode,uint8_t(0xff^mode),0xa5,0x5a};
const auto original=store.bytes;
CarrierSelection c(store);IdentityBus bus;c.begin();
assert(c.settingsHealthy() && c.nativeAllowed()==(mode==0));
assert(c.isAdvanced()==(mode==1) && !c.isAuto() && !c.isBase());
assert(c.isBasic()==(mode==1 || mode==3) && c.isAuto()==(mode==2));
has(cli(c,"get solar.board"),mode==0?"mppt":mode==2?"auto":"basic");
assert(store.bytes==original && !store.saves);
if(mode==2)continue;
c.service(bus,0);c.service(bus,99999);assert(!bus.reads && !bus.writes && !store.saves);
assert(store.bytes==original);
if(mode==3) {
cli(c,"set solar.board basic");
assert(store.saves==1 && store.bytes[4]==1 && store.bytes[5]==0xfe);
assert(c.isBasic() && !c.nativeAllowed());
}
}
for(const char* alias:{"set solar.board base","set solar.board advanced","set solar.board basic"}) {
MemoryStore store;CarrierSelection c(store);IdentityBus bus;c.begin();
has(cli(c,alias),"OK");assert(c.isBasic() && !c.nativeAllowed());
assert(store.bytes==std::vector<uint8_t>({'S','X','B',1,1,0xfe,0xa5,0x5a}));
const std::string info=cli(c,"get solar info"),board=cli(c,"get solar.board");
has(info,"basic");has(board,"basic");
assert(info.find("charger=")==std::string::npos);
assert(board.find("base")==std::string::npos && board.find("advanced")==std::string::npos);
c.service(bus,0);c.service(bus,99999);assert(!bus.reads && !bus.writes);
CarrierSelection restart(store);restart.begin();assert(restart.isBasic());
}
} else assert(false);
}
@@ -354,9 +379,9 @@ void nativeSilent(bool periodic=true) {
}
int main(int argc,char** argv) {
assert(argc==2);const std::string scenario=argv[1];MockFS fs;MainBoard board;
if(scenario=="advanced-runtime") {
if(scenario=="basic-runtime") {
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);assert(!Wire.calls);
has(cli("set solar.board advanced"),"OK");nativeSilent();
has(cli("set solar.board basic"),"OK");nativeSilent();
assert(fs.exists("/solar_board") && !fs.exists("/solar_power"));
const auto calls=Wire.calls;
has(cli("get solar readings"),"battery=3.850V MCU=26.75C");
@@ -364,22 +389,22 @@ int main(int argc,char** argv) {
board.battery_mv=3991;board.mcu_c=-12.5f;
has(cli("get solar battery"),"battery=3.991V MCU=-12.50C");
assert(board.battery_reads==2 && board.temperature_reads==2);
has(cli("get solar info"),"BQ24650");has(cli("get solar capabilities"),"unwired");
has(cli("get solar info"),"basic");has(cli("get solar capabilities"),"MCU");
has(cli("get solar history"),MESH_ENABLE_TELEMETRY_HISTORY?"30min":"not included");
assert(board.battery_reads==2 && board.temperature_reads==2 && calls==Wire.calls);
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);has(cli("get solar.board"),"advanced source=saved");nativeSilent();
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);has(cli("get solar.board"),"basic source=saved");nativeSilent();
board.battery_mv=0;board.mcu_c=NAN;
has(cli("get solar readings"),"battery=unavailable MCU=unavailable");
} else if(scenario=="invalid-runtime") {
fs.files["/solar_board"]={'b','a','d'};beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);assert(!Wire.calls);
nativeSilent();has(cli("get solar.board"),"unconfirmed");
has(cli("get solar readings"),"3.850V");assert(board.battery_reads==1);
has(cli("set solar.board advanced"),"OK");nativeSilent();
has(cli("set solar.board basic"),"OK");nativeSilent();
beginSettings(board,nullptr,MESH_ENABLE_TELEMETRY_HISTORY);nativeSilent();has(cli("get solar.board"),"unconfirmed");
has(cli("set solar.board mppt"),"unconfirmed");nativeSilent();
has(cli("get solar battery"),"3.850V");
} else if(scenario=="reenable-reload") {
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);has(cli("set solar.board advanced"),"OK");nativeSilent();
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);has(cli("set solar.board basic"),"OK");nativeSilent();
Settings overrides;overrides.defaults();overrides.masks[0x14]=2;overrides.values[0x14]=0;
uint8_t image[Settings::IMAGE_SIZE];overrides.encode(image);
fs.files["/solar_power"]=std::vector<uint8_t>(image,image+sizeof(image));
@@ -397,47 +422,61 @@ int main(int argc,char** argv) {
for(unsigned i=0;i<4;++i)assert(channels[i]==i+2 && values[i].channel==i+2);
assert(values[0].valid && fabs(values[0].voltage-13.2f)<0.001f);
assert(channels[4]==99 && values[4].channel==99);
has(cli("set solar.board advanced"),"OK");nativeSilent();
has(cli("set solar.board basic"),"OK");nativeSilent();
assert(fs.files["/solar_power"]==std::vector<uint8_t>(image,image+sizeof(image)));
} else if(scenario=="selection-store-faults") {
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);has(cli("set solar.board advanced"),"OK");
const auto advanced=fs.files["/solar_board"];
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);has(cli("set solar.board basic"),"OK");
const auto basic=fs.files["/solar_board"];
fs.fail_write=true;has(cli("set solar.board mppt"),"unconfirmed");nativeSilent();
assert(fs.files["/solar_board"]==advanced);fs.fail_write=false;
cli("set solar.board advanced");
assert(fs.files["/solar_board"]==basic);fs.fail_write=false;
cli("set solar.board basic");
fs.fail_rename_from="/solar_board.tmp";
has(cli("set solar.board mppt"),"unconfirmed");nativeSilent();
assert(fs.files["/solar_board"]==advanced);fs.fail_rename_from.clear();
cli("set solar.board advanced");fs.corrupt_write=true;
assert(fs.files["/solar_board"]==basic);fs.fail_rename_from.clear();
cli("set solar.board basic");fs.corrupt_write=true;
has(cli("set solar.board mppt"),"unconfirmed");nativeSilent();
assert(fs.files["/solar_board"]==advanced);fs.corrupt_write=false;
cli("set solar.board advanced");fs.fail_read_path="/solar_board";
assert(fs.files["/solar_board"]==basic);fs.corrupt_write=false;
cli("set solar.board basic");fs.fail_read_path="/solar_board";
has(cli("set solar.board mppt"),"unconfirmed");nativeSilent();
assert(fs.files["/solar_board"]!=advanced);fs.fail_read_path.clear();
has(cli("set solar.board advanced"),"OK");nativeSilent();
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);assert(selection.isAdvanced());nativeSilent();
assert(fs.files["/solar_board"]!=basic);fs.fail_read_path.clear();
has(cli("set solar.board basic"),"OK");nativeSilent();
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);assert(selection.isBasic());nativeSilent();
} else if(scenario=="metadata-faults") {
fs.fail_stat=true;
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
has(cli("get solar.board"),"unconfirmed");nativeSilent();
has(cli("set solar.board advanced"),"OK");nativeSilent();
has(cli("set solar.board basic"),"OK");nativeSilent();
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
has(cli("get solar.board"),"advanced source=saved");nativeSilent();
has(cli("get solar.board"),"basic source=saved");nativeSilent();
fs.fail_read_path="/solar_board";
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
has(cli("get solar.board"),"unconfirmed");nativeSilent();
fs.fail_read_path.clear();
has(cli("set solar.board advanced"),"OK");nativeSilent();
has(cli("set solar.board basic"),"OK");nativeSilent();
fs.files["/solar_board"][0]^=1;
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
has(cli("get solar.board"),"unconfirmed");nativeSilent();
} else if(scenario=="base-runtime") {
} else if(scenario=="legacy-basic-runtime") {
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);assert(!Wire.calls);
has(cli("set solar.board base"),"OK");nativeSilent();
has(cli("get solar info"),"CN3791");has(cli("get solar capabilities"),"Base");
has(cli("get solar readings"),"battery=3.850V MCU=26.75C");
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
assert(selection.isBase());nativeSilent();
std::string blocked_message;
for(const char* alias:{"set solar.board base","set solar.board advanced","set solar.board basic"}) {
has(cli(alias),"OK");assert(selection.isBasic());nativeSilent();
assert(fs.files["/solar_board"]==std::vector<uint8_t>({'S','X','B',1,1,0xfe,0xa5,0x5a}));
has(cli("get solar.board"),"basic source=saved");
has(cli("get solar info"),"basic");has(cli("get solar capabilities"),"MCU");
has(cli("get solar readings"),"battery=3.850V MCU=26.75C");
if(blocked_message.empty())blocked_message=cli("get mppt");
else assert(blocked_message==cli("get mppt"));
}
for(uint8_t mode:{1,3}) {
const std::vector<uint8_t> original={'S','X','B',1,mode,uint8_t(0xff^mode),0xa5,0x5a};
fs.files["/solar_board"]=original;const auto writes=fs.writes;
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
assert(selection.isBasic() && !selection.nativeAllowed());nativeSilent();
has(cli("get solar.board"),"basic source=saved");
assert(blocked_message==cli("get mppt"));
assert(fs.writes==writes && fs.files["/solar_board"]==original);
}
} else if(scenario=="auto-pending-replay") {
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
assert(!Wire.calls && selection.isAuto() && !selection.nativeAllowed());
@@ -472,7 +511,7 @@ int main(int argc,char** argv) {
beginSettings(board,&fs,MESH_ENABLE_TELEMETRY_HISTORY);
cli("set solar.board mppt");now_ms=100;service();
assert(selection.nativeAllowed() && Wire.calls>0 && !Wire.writes);
cli("set solar.board advanced");nativeSilent(false);
cli("set solar.board basic");nativeSilent(false);
Settings overrides;overrides.defaults();overrides.masks[0x14]=2;overrides.values[0x14]=0;
uint8_t image[Settings::IMAGE_SIZE];overrides.encode(image);
fs.files["/solar_power"]=std::vector<uint8_t>(image,image+sizeof(image));
@@ -554,10 +593,10 @@ class SolarXiaoCarrierTests(unittest.TestCase):
def test_command_boundaries_and_every_reply_capacity(self):
self.run_scenario("selector", "parser-bounds")
def test_actual_advanced_adapter_has_no_native_io_and_live_self_readings(self):
def test_actual_basic_adapter_has_no_native_io_and_live_self_readings(self):
for binary in ("adapter-history", "adapter-no-history"):
with self.subTest(binary=binary):
self.run_scenario(binary, "advanced-runtime")
self.run_scenario(binary, "basic-runtime")
def test_actual_adapter_blocks_native_io_with_unconfirmed_selection(self):
self.run_scenario("adapter-history", "invalid-runtime")
@@ -586,11 +625,11 @@ class SolarXiaoCarrierTests(unittest.TestCase):
def test_auto_timer_wrap_and_all_manual_or_unhealthy_modes_are_silent(self):
self.run_scenario("selector", "auto-wrap-manual-silence")
def test_original_manual_record_bytes_keep_their_meanings(self):
self.run_scenario("selector", "legacy-manual-records")
def test_all_legacy_record_values_and_old_aliases_map_to_canonical_modes(self):
self.run_scenario("selector", "legacy-records-aliases")
def test_actual_base_adapter_has_no_native_io_or_invented_measurements(self):
self.run_scenario("adapter-history", "base-runtime")
def test_actual_old_aliases_and_records_share_basic_gating_without_startup_rewrite(self):
self.run_scenario("adapter-history", "legacy-basic-runtime")
def test_actual_auto_adapter_reloads_overrides_only_after_positive_detection(self):
self.run_scenario("adapter-history", "auto-pending-replay")