GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-12 21:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

这样写好看点

Browse Source
This commit is contained in:
zogodo
2020-02-17 13:07:47 +08:00
parent d7c2b498ef
commit 61c349f26e
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TC1/main.h
View File

@@ -4,7 +4,7 @@
#include "mico.h" #include "mico.h"
#include "micokit_ext.h" #include "micokit_ext.h"
#define VERSION "v1.0.7" #define VERSION "v1.0.9"
#define TYPE 1 #define TYPE 1
#define TYPE_NAME "zTC1" #define TYPE_NAME "zTC1"

31
TC1/user_power.c
View File

@@ -28,7 +28,7 @@ char* GetPowerRecord(int idx)
char* tmp = power_record_str; char* tmp = power_record_str;
for (; i <= power_record.idx; i++) for (; i <= power_record.idx; i++)
{ {
sprintf(tmp, "%u,", (unsigned int)power_record.powers[i%PW_NUM]); sprintf(tmp, "%lu,", power_record.powers[i%PW_NUM]);
tmp += strlen(tmp); tmp += strlen(tmp);
} }
*(--tmp) = 0; *(--tmp) = 0;
@@ -36,7 +36,7 @@ char* GetPowerRecord(int idx)
} }
uint64_t NS = 1000000000; uint64_t NS = 1000000000;
float n_1s = 0; //在当前一秒秒功率中断次数 float n_1s = 0; //在当前这一秒功率中断次数
uint64_t past_ns = 0; //系统运行的纳秒数 uint64_t past_ns = 0; //系统运行的纳秒数
uint64_t irq_old = 0; //上次中断的时间(纳秒) uint64_t irq_old = 0; //上次中断的时间(纳秒)
@@ -52,23 +52,22 @@ static void PowerIrqHandler(void* arg)
{ {
n_1s += 1; n_1s += 1;
irq_old = past_ns; irq_old = past_ns;
return;
} }
else
{
int n = (spend_ns - past_ns % NS) / NS;
n_1s += (float)(NS - irq_old % NS) / spend_ns;
float power2 = 17.1 * n_1s;
SetPowerRecord(&power_record, (int)power2);
int i = 0; int n = (spend_ns - past_ns % NS) / NS;
for (; i < n; i++) n_1s += (float)(NS - irq_old % NS) / spend_ns;
{ float power2 = 17.1 * n_1s;
power2 = 17.1 * NS / spend_ns; SetPowerRecord(&power_record, (int)power2);
SetPowerRecord(&power_record, (int)power2);
} int i = 0;
irq_old = past_ns; for (; i < n; i++)
n_1s = (float)(past_ns % NS) / spend_ns; {
power2 = 17.1 * NS / spend_ns;
SetPowerRecord(&power_record, (int)power2);
} }
irq_old = past_ns;
n_1s = (float)(past_ns % NS) / spend_ns;
} }
void PowerInit(void) void PowerInit(void)