Skip to content

Fix ListRepeatingEvents log #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshwprojects merged 2 commits into from
Apr 6, 2026
Merged

Fix ListRepeatingEvents log #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085b409
Cleanup string
giedriuslt Mar 31, 2026
345df76
Fix listrepeatingevents log
giedriuslt Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/berry/modules/be_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static int m_scanI2c(bvm* vm)
Soft_I2C_Stop(i2c);
if(bOk)
{
ADDLOG_INFO(LOG_FEATURE_BERRY, "Address 0x%x (dec %i)\n", a, a);
ADDLOG_INFO(LOG_FEATURE_BERRY, "Address 0x%x (dec %i)", a, a);
}
rtos_delay_milliseconds(5);
}
Expand Down
4 changes: 2 additions & 2 deletions src/cmnds/cmd_newLEDDriver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,9 +711,9 @@ void apply_smart_light() {

void led_gamma_list (void) { // list RGB gamma settings
led_gamma_enable_channel_messages = 1;
addLogAdv (LOG_INFO, LOG_FEATURE_CFG, "RGB cal %f %f %f",
addLogAdv (LOG_INFO, LOG_FEATURE_CFG, "RGB cal %f %f %f",
g_cfg.led_corr.rgb_cal[0], g_cfg.led_corr.rgb_cal[1], g_cfg.led_corr.rgb_cal[2]);
addLogAdv (LOG_INFO, LOG_FEATURE_CFG, "LED gamma %.2f brtMinRGB %.2f%% brtMinCW %.2f%%",
addLogAdv (LOG_INFO, LOG_FEATURE_CFG, "LED gamma %.2f brtMinRGB %.2f%% brtMinCW %.2f%%",
g_cfg.led_corr.led_gamma, g_cfg.led_corr.rgb_bright_min, g_cfg.led_corr.cw_bright_min);
}

Expand Down
6 changes: 3 additions & 3 deletions src/cmnds/cmd_repeatingEvents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void RepeatingEvents_RunUpdate(float deltaTimeSeconds) {
cur = cur->next;
}

//addLogAdv(LOG_INFO, LOG_FEATURE_CMD,"RepeatingEvents_OnEverySecond checked %i events, ran %i\n",c_checked,c_ran);
//addLogAdv(LOG_INFO, LOG_FEATURE_CMD,"RepeatingEvents_OnEverySecond checked %i events, ran %i",c_checked,c_ran);
}
// addRepeatingEventID 1234 5 -1 DGR_SendPower "testgr" 1 1
// cancelRepeatingEvent 1234
Expand Down Expand Up @@ -213,7 +213,7 @@ commandResult_t RepeatingEvents_Cmd_ClearRepeatingEvents(const void *context, co
free(rem);
c++;
}
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "Fried %i rep. events", c);
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "Fired %i rep. events", c);
g_repeatingEvents = 0;
return CMD_RES_OK;
}
Expand Down Expand Up @@ -244,7 +244,7 @@ static commandResult_t RepeatingEvents_Cmd_ListRepeatingEvents(const void *conte
c = 0;

while (ev) {
ADDLOG_INFO(LOG_FEATURE_EVENT, "Repeater %i has ID %i, interval %i, reps %i, and command %s",
ADDLOG_INFO(LOG_FEATURE_EVENT, "Repeater %i has ID %i, interval %f, reps %i, and command %s",
c, ev->userID, ev->intervalSeconds, ev->times, ev->command);
ev = ev->next;
c++;
Expand Down
10 changes: 5 additions & 5 deletions src/cmnds/cmd_script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,14 +722,14 @@ static commandResult_t CMD_GoTo(const void *context, const char *cmd, const char
if(Tokenizer_GetArgsCount() == 1) {
label = Tokenizer_GetArg(0);

ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_GoTo: goto local %s\n",label);
ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_GoTo: goto local %s",label);

SVM_GoToLocal(g_activeThread,label);
} else {

fname = Tokenizer_GetArg(0);
label = Tokenizer_GetArg(1);
ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_GoTo: goto global %s %s\n",fname,label);
ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_GoTo: goto global %s %s",fname,label);
SVM_GoTo(g_activeThread,fname,label);
}

Expand Down Expand Up @@ -777,7 +777,7 @@ static commandResult_t CMD_Delay_s(const void *context, const char *cmd, const c

del = Tokenizer_GetArgFloat(0);
delMS = del * 1000;
ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_Delay_s: thread will delay %i extra ms\n",delMS);
ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_Delay_s: thread will delay %i extra ms",delMS);
g_activeThread->currentDelayMS += delMS;


Expand All @@ -800,7 +800,7 @@ static commandResult_t CMD_Delay_ms(const void *context, const char *cmd, const

del = Tokenizer_GetArgInteger(0);

ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_Delay_ms: thread will delay %i\n",del);
ADDLOG_EXTRADEBUG(LOG_FEATURE_CMD, "CMD_Delay_ms: thread will delay %i",del);
g_activeThread->currentDelayMS += del;


Expand All @@ -813,7 +813,7 @@ static commandResult_t CMD_Return(const void *context, const char *cmd, const ch
return CMD_RES_ERROR;
}

ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_Return: thread will return\n");
ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_Return: thread will return");
g_activeThread->curFile = 0;
g_activeThread->curLine = 0;

Expand Down
4 changes: 2 additions & 2 deletions src/cmnds/cmd_tasmota.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ byte *LFS_ReadFile(const char *fname) {
}
#endif
res[len] = 0;
ADDLOG_DEBUG(LOG_FEATURE_CMD, "LFS_ReadFile: Loaded %i bytes\n",len);
//ADDLOG_INFO(LOG_FEATURE_CMD, "LFS_ReadFile: Loaded %s\n",res);
ADDLOG_DEBUG(LOG_FEATURE_CMD, "LFS_ReadFile: Loaded %i bytes",len);
//ADDLOG_INFO(LOG_FEATURE_CMD, "LFS_ReadFile: Loaded %s",res);
}
lfs_file_close(&lfs, &file);
ADDLOG_DEBUG(LOG_FEATURE_CMD, "LFS_ReadFile: closed file %s", fname);
Expand Down
6 changes: 3 additions & 3 deletions src/cmnds/cmd_tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void CMD_StartTCPCommandLine()
OSStatus err = kNoErr;

if(g_bStarted) {
ADDLOG_ERROR(LOG_FEATURE_CMD, "CMD server is already running!\r\n");
ADDLOG_ERROR(LOG_FEATURE_CMD, "CMD server is already running!");
return;
}
err = rtos_create_thread( &g_cmd_thread, 6,
Expand All @@ -129,11 +129,11 @@ void CMD_StartTCPCommandLine()
(beken_thread_arg_t)0 );
if(err != kNoErr)
{
ADDLOG_ERROR(LOG_FEATURE_CMD, "create \"CMD_server\" thread failed with %i!\r\n",err);
ADDLOG_ERROR(LOG_FEATURE_CMD, "create \"CMD_server\" thread failed with %i!",err);
}
else
{
ADDLOG_INFO(LOG_FEATURE_CMD, "CMD TCP server started!\r\n");
ADDLOG_INFO(LOG_FEATURE_CMD, "CMD TCP server started!");
g_bStarted = 1;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/cmnds/cmd_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ static commandResult_t cmnd_lfs_test1(const void * context, const char *cmd, con
lfsres = lfs_file_read(&lfs, &file, &a, 1);
cnt++;
} while (lfsres > 0);
ADDLOG_INFO(LOG_FEATURE_CMD, "cmnd_lfs_test1: Stopped at char %i\n", cnt);
ADDLOG_INFO(LOG_FEATURE_CMD, "cmnd_lfs_test1: Stopped at char %i", cnt);

lfs_file_close(&lfs, &file);
ADDLOG_INFO(LOG_FEATURE_CMD, "cmnd_lfs_test1: closed file %s", args);
Expand Down Expand Up @@ -302,7 +302,7 @@ static commandResult_t cmnd_lfs_test2(const void * context, const char *cmd, con
lfsres = lfs_file_read(&lfs, file, &a, 1);
cnt++;
} while (lfsres > 0);
ADDLOG_INFO(LOG_FEATURE_CMD, "cmnd_lfs_test2: Stopped at char %i\n", cnt);
ADDLOG_INFO(LOG_FEATURE_CMD, "cmnd_lfs_test2: Stopped at char %i", cnt);

lfs_file_close(&lfs, file);
ADDLOG_INFO(LOG_FEATURE_CMD, "cmnd_lfs_test2: closed file %s", args);
Expand Down
2 changes: 1 addition & 1 deletion src/devicegroups/deviceGroups_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int DGR_Parse(const byte *data, int len, dgrDevice_t *dev, struct sockaddr *addr
addLogAdv(LOG_DEBUG, LOG_FEATURE_DGR,"[OFF]");
}
}
addLogAdv(LOG_DEBUG, LOG_FEATURE_DGR,"\n");
addLogAdv(LOG_DEBUG, LOG_FEATURE_DGR,"");
} else {
MSG_SkipBytes(&msg,4);
}
Expand Down
8 changes: 4 additions & 4 deletions src/devicegroups/deviceGroups_write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@ int DGR_BeginWriting(bitMessage_t *msg, const char *groupName, unsigned short se
//
// It should not happen, do not waste flash space for warning text...
//
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for header\n");
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for header");
return 1;
}

if(MSG_WriteString(msg,groupName) <= 0) {
//
// It should not happen, do not waste flash space for warning text...
//
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for group name\n");
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for group name");
return 1;
}

if(MSG_WriteU16(msg,sequence) <= 0) {
//
// It should not happen, do not waste flash space for warning text...
//
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for sequence\n");
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for sequence");
return 1;
}

if(MSG_WriteU16(msg,flags) <= 0) {
//
// It should not happen, do not waste flash space for warning text...
//
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for flags\n");
//addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"DGR_BeginWriting: no space for flags");
return 1;
}
return 0;
Expand Down
22 changes: 11 additions & 11 deletions src/driver/drv_DCF77.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static void raw_dcf77_decode_u64(const uint64_t bits, int *minute, int *hour, in
*month = u64_to_bcd(bits,45, 5);
// Year: bits 50-57 (8)
*year = u64_to_bcd(bits,50, 8);
addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: (raw - no parity check) dcf77_decode_u64 %02d.%02d.%02d %02d:%02d:00 (weekday=%d)",*day,*month,*year+2000,*hour,*minute, *weekday);
addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: (raw - no parity check) dcf77_decode_u64 %02d.%02d.%02d %02d:%02d:00 (weekday=%d)",*day,*month,*year+2000,*hour,*minute, *weekday);
}

static int dcf77_decode_u64(const uint64_t bits, time_t* epoch_out) {
Expand Down Expand Up @@ -216,11 +216,11 @@ void DCF77_QuickTick(){
if (last_t > done){
#ifndef IRQ_raise_and_fall
HAL_AttachInterrupt(GPIO_DCF77, toggle_IRQ(), DCF77_ISR_Common);
addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: EXTRADEBUG: changed IRQ to %i", act_IRQ );
addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: EXTRADEBUG: changed IRQ to %i", act_IRQ );
#endif
uint32_t gap = last_t - done;
done = last_t;
addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: DEBUG: gap to prev. interrupt %i", gap );
addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: DEBUG: gap to prev. interrupt %i", gap );
// handle detection of "long gap" == start of sync
if (gap > DCF77_SYNC_THRESHOLD_MS){
dcf77_pulse_count = 0;
Expand Down Expand Up @@ -280,7 +280,7 @@ static time_t last_epoch;
void DCF77_OnEverySecond() {

if (GPIO_DCF77 < 0){
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: No pin defined! \n");
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: No pin defined! ");
return;
}

Expand All @@ -295,20 +295,20 @@ void DCF77_OnEverySecond() {
*/
settime = dcf77_decode_u64(dcfbits, &act_epoch) ? 2 : 3;
dcfbits_last = dcfbits;
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: Summer time bits Z1 and Z2: %d (%s)\n",ST, ST==1? "summer time": ST==2 ? "winter time" : "illegal");
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: Summer time bits Z1 and Z2: %d (%s)",ST, ST==1? "summer time": ST==2 ? "winter time" : "illegal");
// DCF77 will allways broadcast local time in Germany. So to get UTC: if ST==1 (summer time) sub 2h, if ST==2 (winter time) sub 1h
act_epoch -= 3600 * (3-ST);
// addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: UTC calculated: %llu (previous: %llu - diff=%llu seconds)\n",act_epoch, last_epoch, (act_epoch - last_epoch));
// addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: UTC calculated: %llu (previous: %llu - diff=%llu seconds)",act_epoch, last_epoch, (act_epoch - last_epoch));
if (ST < 1 || ST > 2){
addLogAdv(LOG_ERROR, LOG_FEATURE_RAW, "DCF77: Illegal state of DST indcator (%d)! Not setting time \n",ST);
addLogAdv(LOG_ERROR, LOG_FEATURE_RAW, "DCF77: Illegal state of DST indcator (%d)! Not setting time",ST);
settime=4;
}
} else {
// do this in "else" path, so it's 1 second after we got all bits ( = second 59)

if (settime==2){
// as an additonal sanity check: last time decoded must be one exactly minute (60 seconds) before!
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: UTC calculated: %u (previous: %u - diff=%u seconds)\n",(uint32_t)act_epoch, (uint32_t)last_epoch, (uint32_t)(act_epoch - last_epoch));
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: UTC calculated: %u (previous: %u - diff=%u seconds)",(uint32_t)act_epoch, (uint32_t)last_epoch, (uint32_t)(act_epoch - last_epoch));
// if ( (act_epoch - 60) == last_epoch ) TIME_setDeviceTime((uint32_t)act_epoch);
TIME_setDeviceTime((uint32_t)act_epoch);
last_epoch = act_epoch;
Expand All @@ -326,7 +326,7 @@ void DCF77_OnEverySecond() {
// Print the bit at position i
str[i]=((dcfbits >> i) & 1)?'1':'0';
}
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: %ssynced - state= %i - got %02i bits: %s \n",dcf77_synced?"":"not ",settime, i,str);
addLogAdv(LOG_DEBUG, LOG_FEATURE_RAW, "DCF77: %ssynced - state= %i - got %02i bits: %s",dcf77_synced?"":"not ",settime, i,str);

}

Expand All @@ -339,7 +339,7 @@ void DCF77_AppendInformationToHTTPIndexPage(http_request_t* request, int bPreSta
int minute, hour, day, weekday, month, year;
raw_dcf77_decode_u64(dcfbits_last, &minute, &hour, &day, &weekday, &month, &year);

// addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: (raw - no parity check) dcf77_decode_u64 %02d.%02d.%02d %02d:%02d:00 (weekday=%d)",day,month,year+2000,hour,minute, weekday);
// addLogAdv(LOG_EXTRADEBUG, LOG_FEATURE_RAW, "DCF77: (raw - no parity check) dcf77_decode_u64 %02d.%02d.%02d %02d:%02d:00 (weekday=%d)",day,month,year+2000,hour,minute, weekday);


hprintf255(request, "<h5>DCF77: last raw info: %02d.%02d.%02d %02d:%02d:00 (weekday=%d) - last time set %i secs ago</h5>",day,month,year+2000,hour,minute, weekday, g_secondsElapsed - lastset);
Expand Down Expand Up @@ -388,7 +388,7 @@ void DCF77_Init(void) {
}


addLogAdv(LOG_INFO, LOG_FEATURE_RAW, "DCF77: DCF77_Init_Pin()\n");
addLogAdv(LOG_INFO, LOG_FEATURE_RAW, "DCF77: DCF77_Init_Pin()");
DCF77_Init_Pin();
dcf77_pulse_count = 0;
dcf77_synced = false;
Expand Down
2 changes: 1 addition & 1 deletion src/driver/drv_adcButton.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void DRV_ADCButtonDoMeasurement() {

newButton = chooseButton(adcValue);

addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL, "ADC %i -> button %i (total %i)\r\n", adcValue, newButton, g_numRanges);
addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL, "ADC %i -> button %i (total %i)", adcValue, newButton, g_numRanges);

if (newButton != g_prevButton) {
EventHandlers_FireEvent(CMD_EVENT_ADC_BUTTON, newButton);
Expand Down
2 changes: 1 addition & 1 deletion src/driver/drv_adcSmoother.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void DRV_ADCSmootherDoSmooth() {
ADCSmoother_AppendSample(raw);
int smoothed = ADCSmoother_Sample();
int lowHigh = smoothed > g_margin;
addLogAdv(LOG_INFO, LOG_FEATURE_DRV, "AS: raw %i, smoothed %i, LowHigh %i\n", raw, smoothed, lowHigh);
addLogAdv(LOG_INFO, LOG_FEATURE_DRV, "AS: raw %i, smoothed %i, LowHigh %i", raw, smoothed, lowHigh);

if (smoothed != g_smoothed) {
g_smoothed = smoothed;
Expand Down
18 changes: 9 additions & 9 deletions src/driver/drv_battery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static void Batt_Measure() {
//this command has only been tested on CBU
float batt_ref, batt_res, vref;
int writeVal = 1;
ADDLOG_INFO(LOG_FEATURE_DRV, "DRV_BATTERY : Measure Battery volt en perc");
ADDLOG_INFO(LOG_FEATURE_DRV, "DRV_BATTERY: Measure Battery volt en perc");
g_pin_adc = PIN_FindPinIndexForRole(IOR_BAT_ADC, g_pin_adc);
if (PIN_FindPinIndexForRole(IOR_BAT_Relay, -1) == -1 && PIN_FindPinIndexForRole(IOR_BAT_Relay_n, -1) == -1) {
g_vdivider = 1;
Expand All @@ -42,7 +42,7 @@ static void Batt_Measure() {
//HAL_ADC_Init(g_pin_adc);
g_battlevel = HAL_ADC_Read(g_pin_adc);
if (g_battlevel < 1024) {
ADDLOG_INFO(LOG_FEATURE_DRV, "DRV_BATTERY : ADC Value low device not on battery");
ADDLOG_INFO(LOG_FEATURE_DRV, "DRV_BATTERY: ADC Value low device not on battery");
}
if (g_vdivider > 1) {
//CHANNEL_Set(channel_rel, 1, 0);
Expand All @@ -52,22 +52,22 @@ static void Batt_Measure() {
rtos_delay_milliseconds(10);
}
g_battvoltage = HAL_ADC_Read(g_pin_adc);
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY : ADC binary Measurement : %f and channel %i", g_battvoltage, channel_adc);
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY: ADC binary Measurement: %f and channel %i", g_battvoltage, channel_adc);
if (g_vdivider > 1) {
if (g_pin_rel > 0) {
HAL_PIN_SetOutputValue(g_pin_rel, !writeVal);
}
//CHANNEL_Set(channel_rel, 0, 0);
}
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY : Calculation with param : %f %f %f", g_vref, g_adcbits, g_vdivider);
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY: Calculation with param: %f %f %f", g_vref, g_adcbits, g_vdivider);
// batt_value = batt_value / vref / 12bits value should be 10 un doc ... but on CBU is 12 ....
vref = g_vref / g_adcbits;
g_battvoltage = g_battvoltage * vref;
// multiply by 2 cause ADC is measured after the Voltage Divider
g_battvoltage = g_battvoltage * g_vdivider;
batt_ref = g_maxbatt - g_minbatt;
batt_res = g_battvoltage - g_minbatt;
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY : Ref battery: %f, rest battery %f", batt_ref, batt_res);
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY: Ref battery: %f, rest battery %f", batt_ref, batt_res);
g_battlevel = (batt_res / batt_ref) * 100;
if (g_battlevel < 0)
g_battlevel = 0;
Expand All @@ -80,7 +80,7 @@ static void Batt_Measure() {
#endif
g_lastbattlevel = (int)g_battlevel;
g_lastbattvoltage = (int)g_battvoltage;
ADDLOG_INFO(LOG_FEATURE_DRV, "DRV_BATTERY : battery voltage : %f and percentage %f%%", g_battvoltage, g_battlevel);
ADDLOG_INFO(LOG_FEATURE_DRV, "DRV_BATTERY: battery voltage: %f and percentage %f%%", g_battvoltage, g_battlevel);
}
void Simulator_Force_Batt_Measure() {
Batt_Measure();
Expand Down Expand Up @@ -121,7 +121,7 @@ commandResult_t Battery_Setup(const void* context, const char* cmd, const char*
g_adcbits = Tokenizer_GetArgFloat(4);
}

ADDLOG_INFO(LOG_FEATURE_CMD, "Battery Setup : Min %f Max %f Vref %f adcbits %f vdivider %f", g_minbatt, g_maxbatt, g_vref, g_adcbits, g_vdivider);
ADDLOG_INFO(LOG_FEATURE_CMD, "Battery Setup: Min %f Max %f Vref %f adcbits %f vdivider %f", g_minbatt, g_maxbatt, g_vref, g_adcbits, g_vdivider);

return CMD_RES_OK;
}
Expand All @@ -139,7 +139,7 @@ commandResult_t Battery_cycle(const void* context, const char* cmd, const char*
}
g_battcycleref = Tokenizer_GetArgFloat(0);

ADDLOG_INFO(LOG_FEATURE_CMD, "Battery Cycle : Measurement will run every %i seconds", g_battcycleref);
ADDLOG_INFO(LOG_FEATURE_CMD, "Battery Cycle: Measurement will run every %i seconds", g_battcycleref);

return CMD_RES_OK;
}
Expand Down Expand Up @@ -171,7 +171,7 @@ void Batt_OnEverySecond() {
if (g_battcycle > 0) {
--g_battcycle;
}
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY : Measurement will run in %i cycle", g_battcycle);
ADDLOG_DEBUG(LOG_FEATURE_DRV, "DRV_BATTERY: Measurement will run in %i cycle", g_battcycle);


}
Expand Down
4 changes: 2 additions & 2 deletions src/driver/drv_bkPartitions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ void BKPartitions_QuickFrame() {
for (int pos = 0; pos <= scan_len; pos++) {
if (memcmp(&g_buf[pos], search_magic, magic_len) == 0) {
unsigned int abs_off = (unsigned int)(cur_adr + pos);
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "AS: found magic at 0x%X\n", abs_off);
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "AS: found magic at 0x%X", abs_off);
// find nearest first record
int nearest = (abs_off/ 34) * 34;
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "AS: nearest at 0x%X\n", nearest);
addLogAdv(LOG_INFO, LOG_FEATURE_CMD, "AS: nearest at 0x%X", nearest);
ReadPartition(nearest);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/driver/drv_bl0937.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void BL0937_RunEverySecond(void)
xPassedTicks = xTaskGetTickCount();
ticksElapsed = (xPassedTicks - pulseStamp);
pulseStamp = xPassedTicks;
//addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"Voltage pulses %i, current %i, power %i\n", res_v, res_c, res_p);
//addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER,"Voltage pulses %i, current %i, power %i", res_v, res_c, res_p);

PwrCal_Scale(res_v, res_c, res_p, &final_v, &final_c, &final_p);

Expand Down
Loading
Loading