Mirrors/OpenBK7231T_App
2
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-03-13 18:58:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

autostart bl0937, rename

Browse Source
This commit is contained in:
openshwprojects
2022-07-16 12:46:21 +02:00
parent 2e91d07f9a
commit b03890bb4e
3 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/driver/drv_cse7766.c
View File

@@ -51,7 +51,7 @@ int CSE7766_TryToGetNextCSE7766Packet() {
}
}
if(c_garbage_consumed > 0){
addLogAdv(LOG_INFO, LOG_FEATURE_BL09XX,"Consumed %i unwanted non-header byte in CSE7766 buffer\n", c_garbage_consumed);
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"Consumed %i unwanted non-header byte in CSE7766 buffer\n", c_garbage_consumed);
}
if(cs < CSE7766_PACKET_LEN) {
return 0;
@@ -75,15 +75,15 @@ int CSE7766_TryToGetNextCSE7766Packet() {
sprintf(buffer2,"%02X ",UART_GetNextByte(i));
strcat_safe(buffer_for_log,buffer2,sizeof(buffer_for_log));
}
addLogAdv(LOG_INFO, LOG_FEATURE_BL09XX,"CSE7766 received: %s\n", buffer_for_log);
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"CSE7766 received: %s\n", buffer_for_log);
}
#endif
if(checksum != UART_GetNextByte(CSE7766_PACKET_LEN-1)) {
addLogAdv(LOG_INFO, LOG_FEATURE_BL09XX,"Skipping packet with bad checksum %02X wanted %02X\n",checksum,UART_GetNextByte(CSE7766_PACKET_LEN-1));
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"Skipping packet with bad checksum %02X wanted %02X\n",checksum,UART_GetNextByte(CSE7766_PACKET_LEN-1));
UART_ConsumeBytes(CSE7766_PACKET_LEN);
return 1;
}
//addLogAdv(LOG_INFO, LOG_FEATURE_BL09XX,"CSE checksum ok");
//addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"CSE checksum ok");
{
unsigned char adjustement;
@@ -164,7 +164,7 @@ int CSE7766_TryToGetNextCSE7766Packet() {
voltage = CSE7766_UREF / raw_unscaled_voltage;
current = CSE7766_IREF / raw_unscaled_current;
BL_ProcessUpdate(voltage,current,power);
BL_ProcessUpdate(voltage,current,power);
}
}
@@ -177,7 +177,7 @@ int CSE7766_PowerSet(const void *context, const char *cmd, const char *args, int
// V=245.107925,I=109.921143,P=0.035618
sprintf(res,"V=%f,I=%f,P=%f\n",lastReadings[OBK_VOLTAGE],lastReadings[OBK_CURRENT],lastReadings[OBK_POWER]);
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,res );
}
}
#endif
UART_ConsumeBytes(CSE7766_PACKET_LEN);
@@ -185,14 +185,14 @@ int CSE7766_PowerSet(const void *context, const char *cmd, const char *args, int
return CSE7766_PACKET_LEN;
}
int CSE7766_PowerSet(const void *context, const char *cmd, const char *args, int cmdFlags) {
int CSE7766_PowerSet(const void *context, const char *cmd, const char *args, int cmdFlags) {
float realPower;
if(args==0||*args==0) {
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"This command needs one argument");
return 1;
}
realPower = atof(args);
realPower = atof(args);
CSE7766_PREF = realPower / raw_unscaled_power;
{
char dbg[128];
@@ -201,7 +201,7 @@ int CSE7766_PowerRef(const void *context, const char *cmd, const char *args, int
}
return 0;
}
int CSE7766_PowerRef(const void *context, const char *cmd, const char *args, int cmdFlags) {
int CSE7766_PowerRef(const void *context, const char *cmd, const char *args, int cmdFlags) {
if(args==0||*args==0) {
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"This command needs one argument");
@@ -210,7 +210,7 @@ int CSE7766_CurrentRef(const void *context, const char *cmd, const char *args, i
CSE7766_PREF = atof(args);
return 0;
}
int CSE7766_CurrentRef(const void *context, const char *cmd, const char *args, int cmdFlags) {
int CSE7766_CurrentRef(const void *context, const char *cmd, const char *args, int cmdFlags) {
if(args==0||*args==0) {
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"This command needs one argument");
@@ -220,7 +220,7 @@ int CSE7766_VoltageSet(const void *context, const char *cmd, const char *args, i
return 0;
}
int CSE7766_VoltageRef(const void *context, const char *cmd, const char *args, int cmdFlags) {
if(args==0||*args==0) {
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"This command needs one argument");
return 1;
@@ -228,7 +228,7 @@ int CSE7766_VoltageSet(const void *context, const char *cmd, const char *args, i
CSE7766_UREF = atof(args);
return 0;
}
int CSE7766_VoltageSet(const void *context, const char *cmd, const char *args, int cmdFlags) {
int CSE7766_VoltageSet(const void *context, const char *cmd, const char *args, int cmdFlags) {
float realV;
if(args==0||*args==0) {
@@ -237,7 +237,7 @@ int CSE7766_CurrentSet(const void *context, const char *cmd, const char *args, i
}
realV = atof(args);
CSE7766_UREF = realV / raw_unscaled_voltage;
{
{
char dbg[128];
sprintf(dbg,"CurrentSet: you gave %f, set ref to %f\n", realV, CSE7766_UREF);
addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,dbg);
@@ -245,7 +245,7 @@ int CSE7766_CurrentSet(const void *context, const char *cmd, const char *args, i
return 0;
}
int CSE7766_CurrentSet(const void *context, const char *cmd, const char *args, int cmdFlags) {
int CSE7766_CurrentSet(const void *context, const char *cmd, const char *args, int cmdFlags) {
float realI;
if(args==0||*args==0) {
@@ -262,7 +262,7 @@ void CSE7766_Init() {
return 0;
}
void CSE7766_Init() {
UART_InitUART(CSE7766_BAUD_RATE);
UART_InitReceiveRingBuffer(512);
CMD_RegisterCommand("PowerSet","",CSE7766_PowerSet, "Sets current power value for calibration", NULL);

12
src/user_main.c
View File

@@ -443,15 +443,21 @@ void Main_Init()
// but DON't run autoexec if we have had 2+ boot failures
CMD_Init();
CMD_ExecuteCommand(CFG_GetShortStartupCommand(), COMMAND_FLAG_SOURCE_SCRIPT);
CMD_ExecuteCommand("exec autoexec.bat", COMMAND_FLAG_SOURCE_SCRIPT);
// autostart drivers
if(PIN_FindPinIndexForRole(IOR_SM2135_CLK,-1) != -1 && PIN_FindPinIndexForRole(IOR_SM2135_DAT,-1) != -1) {
#ifndef OBK_DISABLE_ALL_DRIVERS
DRV_StartDriver("SM2135");
#endif
}
if(PIN_FindPinIndexForRole(IOR_BL0937_CF,-1) != -1 && PIN_FindPinIndexForRole(IOR_BL0937_CF1,-1) != -1 && PIN_FindPinIndexForRole(IOR_BL0937_SEL,-1) != -1) {
#ifndef OBK_DISABLE_ALL_DRIVERS
DRV_StartDriver("BL0937");
#endif
}
CMD_ExecuteCommand(CFG_GetShortStartupCommand(), COMMAND_FLAG_SOURCE_SCRIPT);
CMD_ExecuteCommand("exec autoexec.bat", COMMAND_FLAG_SOURCE_SCRIPT);
g_enable_pins = 1;
// this actually sets the pins, moved out so we could avoid if necessary

12
windowsTest_msvc2008.vcproj
View File

@@ -843,6 +843,10 @@
RelativePath=".\src\driver\drv_config.h"
>
</File>
<File
RelativePath=".\src\driver\drv_cse7766.c"
>
</File>
<File
RelativePath=".\src\driver\drv_local.h"
>
@@ -859,6 +863,14 @@
RelativePath=".\src\driver\drv_public.h"
>
</File>
<File
RelativePath=".\src\driver\drv_sm2135.c"
>
</File>
<File
RelativePath=".\src\driver\drv_sm2135.h"
>
</File>
<File
RelativePath=".\src\driver\drv_tasmotaDeviceGroups.c"
>