helloyifa/temperature_iT12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本号更新

Browse Source
This commit is contained in:
hu-jiafeng 2025-07-07 10:56:25 +08:00
parent 40fdd1395f
commit 996d1ab3bb
11 changed files with 1047 additions and 1245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fw-AC63_BT_SDK/apps/spp_and_le/app_temperature.c
View File

@ -15,7 +15,6 @@
#include "timer.h"
#include "os/os_api.h"
#include "system/includes.h"
#include "asm/power/p33.h"
#include "gatt_common/le_gatt_common.h"
#include "examples/trans_data/ble_trans_profile.h"
//#include "ble_trans_profile.h"
@ -433,20 +432,14 @@ u16 buffer[MAX_SIZE];
return;
}
//printf("cal %d\r\n", cal);
dtmp = cal / 128.0f;
int temp_value = dtmp*100;
//printf("Temp %3.7f\r\n", dtmp);
printf("Temp: %d\r\n\r\n", temp_value);
//FF
//BBOOEEb 2字节体温 2字节物温 2字节环温 1字节电量
u16 body = (u16)temp_value;
u16 obj = (u16)temp_value;
u16 ntc = (u16)0;
// u8 battery = 99;
u8 battery = get_vbat_percent();
u16 batt_val = 0;
@ -455,8 +448,7 @@ u16 buffer[MAX_SIZE];
} else {
batt_val = (get_vbat_level() + batt_val) / 2;
}
//batt
// battery = get_cur_battery_level() *10;
dev_info.init_sensor = body; //原始温度
if (ADJ_temp != 0) {
@ -506,7 +498,7 @@ u16 buffer[MAX_SIZE];
//计算当前温度是否稳定
u16 temp_body = dev_info.temperature_sensor;
//添加数据到队列，数量足够后取出所有温度数据 计算方差 如果小于 N N可以趋近于0 暂定小于20 则表示温度稳定
//添加数据到队列，数量足够后取出所有温度数据 计算方差 如果小于 N N可以趋近于0 暂定小于30 则表示温度稳定
if (tuya_ble_queue_isFull(&temp_queue)) {
tuya_ble_queue_decrease(&temp_queue); // 移除队首元素
}
@ -869,7 +861,6 @@ void temperature_charge_state(int state){
printf("BLE_TEMPERATURE_CHARGE_STATE_IDLE\n");
//timer_temperature_detect = sys_timer_add(NULL, temperature_detect, dev_config.detect_interval);
//temperature_charge_led(0);
if(init_complete == 0 ){ //如果开机未进入BLE_TEMPERATURE_CHARGE_KEEP_CHARGING则亮灯
temperature_work_led(1);
@ -934,7 +925,6 @@ void temperature_config_init(){
printf("temperature_offset :%d", dev_config.temperature_offset);
}
dev_config.detect_interval = 2000;
}
void alarm_isr_user_cbfun(u8 index)
{
@ -980,17 +970,12 @@ void temperature_init(void)
//timer_temperature_detect = sys_timer_add(NULL, temperature_detect, dev_config.detect_interval);
//HALL PIN 输入
gpio_set_direction(IO_PORTB_04,0);
gpio_direction_output(IO_PORTB_04, 1);
gpio_set_direction(IO_PORTB_06,0);
gpio_direction_output(IO_PORTB_06, 1);
// NTC VDD
//gpio_set_direction(IO_PORTB_05,0);
//gpio_direction_output(IO_PORTB_05, 1);

2
fw-AC63_BT_SDK/apps/spp_and_le/board/bd19/AC632N_spp_and_le.depend
View File

@ -12541,7 +12541,7 @@
"jl_kws/jl_kws_api.h"
"debug.h"
1751506996 c:\users\hjf\desktop\temperature_it12\fw-ac63_bt_sdk\apps\spp_and_le\include\app_temperature.h
1751526999 c:\users\hjf\desktop\temperature_it12\fw-ac63_bt_sdk\apps\spp_and_le\include\app_temperature.h
"typedef.h"
"system/event.h"

70
fw-AC63_BT_SDK/apps/spp_and_le/board/bd19/AC632N_spp_and_le.layout
View File

@ -2,14 +2,14 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Release" />
<File name="..\..\include\app_config.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\app_main.c" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="10242" topLine="189" />
<Cursor1 position="3753" topLine="118" />
</Cursor>
</File>
<File name="..\..\..\..\cpu\bd19\adc_api.c" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\app_temperature.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="11677" topLine="439" />
<Cursor1 position="25741" topLine="769" />
</Cursor>
</File>
<File name="..\..\examples\trans_data\ble_trans.c" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -17,14 +17,9 @@
<Cursor1 position="26810" topLine="719" />
</Cursor>
</File>
<File name="..\..\modules\power\app_charge.c" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\include\app_config.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1522" topLine="53" />
</Cursor>
</File>
<File name="..\..\..\common\third_party_profile\jieli\gatt_common\le_gatt_server.c" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="27428" topLine="677" />
<Cursor1 position="10242" topLine="189" />
</Cursor>
</File>
<File name="board_config.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -32,9 +27,9 @@
<Cursor1 position="518" topLine="13" />
</Cursor>
</File>
<File name="board_ac6323a_demo_cfg.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\..\common\third_party_profile\jieli\gatt_common\le_gatt_server.c" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="12074" topLine="209" />
<Cursor1 position="27428" topLine="677" />
</Cursor>
</File>
<File name="..\..\..\..\cpu\bd19\charge.c" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -42,39 +37,44 @@
<Cursor1 position="8796" topLine="308" />
</Cursor>
</File>
<File name="..\..\modules\power\app_charge.c" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1522" topLine="53" />
</Cursor>
</File>
<File name="..\..\..\common\device\usb\device\user_setup.c" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6496" topLine="231" />
</Cursor>
</File>
<File name="..\..\app_temperature.c" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="25741" topLine="759" />
</Cursor>
</File>
<File name="..\..\..\common\device\usb\host\aoa.c" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="593" topLine="9" />
</Cursor>
</File>
<File name="..\..\examples\trans_data\ble_trans.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="553" topLine="0" />
</Cursor>
</File>
<File name="..\..\modules\bt\app_comm_edr.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1154" topLine="18" />
</Cursor>
</File>
<File name="..\..\..\..\include_lib\system\timer.h" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1916" topLine="61" />
</Cursor>
</File>
<File name="..\..\app_main.c" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\..\common\device\usb\host\aoa.c" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="3753" topLine="118" />
<Cursor1 position="593" topLine="9" />
</Cursor>
</File>
<File name="..\..\modules\bt\app_comm_edr.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1154" topLine="18" />
</Cursor>
</File>
<File name="..\..\examples\trans_data\ble_trans.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="553" topLine="0" />
</Cursor>
</File>
<File name="board_ac6323a_demo_cfg.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="12074" topLine="209" />
</Cursor>
</File>
<File name="..\..\..\..\cpu\bd19\adc_api.c" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="11677" topLine="439" />
</Cursor>
</File>
</CodeBlocks_layout_file>

5
fw-AC63_BT_SDK/apps/spp_and_le/include/app_temperature.h
View File

@ -5,9 +5,9 @@
#include "system/event.h"
/**
* 1.0.3 2025.06.26
* 1.0.4 2025.07.03
*/
#define BLE_TEMPERATURE_DEVICE_SOFT_VER "1.0.3"
#define BLE_TEMPERATURE_DEVICE_SOFT_VER "1.0.4"
#define BLE_TEMPERATURE_DETECT_INTERVAL 250
#define BLE_TEMPERATURE_WORK_TIMEOUT 10*1000
@ -28,7 +28,6 @@
//VM用户自定义配置项[1 ~ 49]
#define BLE_TEMPERATURE_VM_DEVICE_CONFIG 2
#define INIT_COMPLETE_FLAG_CONFIG 3
#define ADJ_TEMP_CONFIG 4
#define HELL_WAKEUP 5

BIN
fw-AC63_BT_SDK/cpu/bd19/tools/app.bin
View File

Binary file not shown.

BIN
fw-AC63_BT_SDK/cpu/bd19/tools/download/data_trans/app.bin
View File

Binary file not shown.

BIN
fw-AC63_BT_SDK/cpu/bd19/tools/download/data_trans/jl_isd.bin
View File

Binary file not shown.

BIN
fw-AC63_BT_SDK/cpu/bd19/tools/download/data_trans/jl_isd.fw
View File

Binary file not shown.

1
fw-AC63_BT_SDK/cpu/bd19/tools/sdk.elf.resolution.txt
View File

@ -2382,7 +2382,6 @@ obj/Release/apps/spp_and_le/app_temperature.o
-r=obj/Release/apps/spp_and_le/app_temperature.o,ble_comm_set_config_name,l
-r=obj/Release/apps/spp_and_le/app_temperature.o,temperature_config_init,pl
-r=obj/Release/apps/spp_and_le/app_temperature.o,alarm_isr_user_cbfun,pl
-r=obj/Release/apps/spp_and_le/app_temperature.o,timer_sleep_callback,pl
-r=obj/Release/apps/spp_and_le/app_temperature.o,temperature_init,pl
-r=obj/Release/apps/spp_and_le/app_temperature.o,get_vbat_trim,l
-r=obj/Release/apps/spp_and_le/app_temperature.o,get_vbg_trim,l

2014
fw-AC63_BT_SDK/cpu/bd19/tools/sdk.lst
View File

File diff suppressed because it is too large Load Diff

181
fw-AC63_BT_SDK/launr.c
View File

@ -1,181 +0,0 @@
#include <stdio.h>
#include <string.h>
#include <cstdlib>
static unsigned int LunarCalendarDay;
static unsigned int LunarCalendarTable[199] =
{
0x04AE53,0x0A5748,0x5526BD,0x0D2650,0x0D9544,0x46AAB9,0x056A4D,0x09AD42,0x24AEB6,0x04AE4A,/*1901-1910*/
0x6A4DBE,0x0A4D52,0x0D2546,0x5D52BA,0x0B544E,0x0D6A43,0x296D37,0x095B4B,0x749BC1,0x049754,/*1911-1920*/
0x0A4B48,0x5B25BC,0x06A550,0x06D445,0x4ADAB8,0x02B64D,0x095742,0x2497B7,0x04974A,0x664B3E,/*1921-1930*/
0x0D4A51,0x0EA546,0x56D4BA,0x05AD4E,0x02B644,0x393738,0x092E4B,0x7C96BF,0x0C9553,0x0D4A48,/*1931-1940*/
0x6DA53B,0x0B554F,0x056A45,0x4AADB9,0x025D4D,0x092D42,0x2C95B6,0x0A954A,0x7B4ABD,0x06CA51,/*1941-1950*/
0x0B5546,0x555ABB,0x04DA4E,0x0A5B43,0x352BB8,0x052B4C,0x8A953F,0x0E9552,0x06AA48,0x6AD53C,/*1951-1960*/
0x0AB54F,0x04B645,0x4A5739,0x0A574D,0x052642,0x3E9335,0x0D9549,0x75AABE,0x056A51,0x096D46,/*1961-1970*/
0x54AEBB,0x04AD4F,0x0A4D43,0x4D26B7,0x0D254B,0x8D52BF,0x0B5452,0x0B6A47,0x696D3C,0x095B50,/*1971-1980*/
0x049B45,0x4A4BB9,0x0A4B4D,0xAB25C2,0x06A554,0x06D449,0x6ADA3D,0x0AB651,0x093746,0x5497BB,/*1981-1990*/
0x04974F,0x064B44,0x36A537,0x0EA54A,0x86B2BF,0x05AC53,0x0AB647,0x5936BC,0x092E50,0x0C9645,/*1991-2000*/
0x4D4AB8,0x0D4A4C,0x0DA541,0x25AAB6,0x056A49,0x7AADBD,0x025D52,0x092D47,0x5C95BA,0x0A954E,/*2001-2010*/
0x0B4A43,0x4B5537,0x0AD54A,0x955ABF,0x04BA53,0x0A5B48,0x652BBC,0x052B50,0x0A9345,0x474AB9,/*2011-2020*/
0x06AA4C,0x0AD541,0x24DAB6,0x04B64A,0x69573D,0x0A4E51,0x0D2646,0x5E933A,0x0D534D,0x05AA43,/*2021-2030*/
0x36B537,0x096D4B,0xB4AEBF,0x04AD53,0x0A4D48,0x6D25BC,0x0D254F,0x0D5244,0x5DAA38,0x0B5A4C,/*2031-2040*/
0x056D41,0x24ADB6,0x049B4A,0x7A4BBE,0x0A4B51,0x0AA546,0x5B52BA,0x06D24E,0x0ADA42,0x355B37,/*2041-2050*/
0x09374B,0x8497C1,0x049753,0x064B48,0x66A53C,0x0EA54F,0x06B244,0x4AB638,0x0AAE4C,0x092E42,/*2051-2060*/
0x3C9735,0x0C9649,0x7D4ABD,0x0D4A51,0x0DA545,0x55AABA,0x056A4E,0x0A6D43,0x452EB7,0x052D4B,/*2061-2070*/
0x8A95BF,0x0A9553,0x0B4A47,0x6B553B,0x0AD54F,0x055A45,0x4A5D38,0x0A5B4C,0x052B42,0x3A93B6,/*2071-2080*/
0x069349,0x7729BD,0x06AA51,0x0AD546,0x54DABA,0x04B64E,0x0A5743,0x452738,0x0D264A,0x8E933E,/*2081-2090*/
0x0D5252,0x0DAA47,0x66B53B,0x056D4F,0x04AE45,0x4A4EB9,0x0A4D4C,0x0D1541,0x2D92B5 /*2091-2099*/
};
static int MonthAdd[12] = { 0,31,59,90,120,151,181,212,243,273,304,334 };
static int LunarCalendar(int year, int month, int day)
{
int Spring_NY, Sun_NY, StaticDayCount;
int index, flag;
//Spring_NY 记录春节离当年元旦的天数。
//Sun_NY 记录阳历日离当年元旦的天数。
if (((LunarCalendarTable[year - 1901] & 0x0060) >> 5) == 1)
Spring_NY = (LunarCalendarTable[year - 1901] & 0x001F) - 1;
else
Spring_NY = (LunarCalendarTable[year - 1901] & 0x001F) - 1 + 31;
Sun_NY = MonthAdd[month - 1] + day - 1;
if ((!(year % 4)) && (month > 2))
Sun_NY++;
//特殊处理2025年4月28日-2025年5月26日
if (year == 2025 && ((month == 4 && day >= 28) || (month == 5 && day <= 26))) {
Sun_NY--;
}
// 特殊处理2025年4月27日
if (year == 2025 && month == 4 && day == 27) {
LunarCalendarDay = (3 << 6) | 30;
return 0;
}
//StaticDayCount记录大小月的天数 29 或30
//index 记录从哪个月开始来计算。
//flag 是用来对闰月的特殊处理。
//判断阳历日在春节前还是春节后
if (Sun_NY >= Spring_NY)//阳历日在春节后（含春节那天）
{
Sun_NY -= Spring_NY;
month = 1;
index = 1;
flag = 0;
int leap_month = (LunarCalendarTable[year - 1901] & 0xF00000) >> 20;
while (1) {
if ((LunarCalendarTable[year - 1901] & (0x80000 >> (index - 1))))
StaticDayCount = 30;
else
StaticDayCount = 29;
if (Sun_NY < StaticDayCount)
break;
Sun_NY -= StaticDayCount;
if (month == leap_month && !flag) {
flag = 1; // 遇到闰月，处理闰月
int leapDays = ((LunarCalendarTable[year - 1901] & (0x80000 >> (index))) ? 30 : 29);
if (Sun_NY < leapDays) {
// 闰月内
month = leap_month;
flag = 1;
break;
}
else {
Sun_NY -= leapDays;
index++;
}
}
index++;
month++;
}
day = Sun_NY + 1;
}
else //阳历日在春节前
{
Spring_NY -= Sun_NY;
year--;
month = 12;
if (((LunarCalendarTable[year - 1901] & 0xF00000) >> 20) == 0)
index = 12;
else
index = 13;
flag = 0;
if ((LunarCalendarTable[year - 1901] & (0x80000 >> (index - 1))) == 0)
StaticDayCount = 29;
else
StaticDayCount = 30;
while (Spring_NY > StaticDayCount)
{
Spring_NY -= StaticDayCount;
index--;
if (flag == 0)
month--;
if (month == ((LunarCalendarTable[year - 1901] & 0xF00000) >> 20))
flag = ~flag;
if ((LunarCalendarTable[year - 1901] & (0x80000 >> (index - 1))) == 0)
StaticDayCount = 29;
else
StaticDayCount = 30;
}
day = StaticDayCount - Spring_NY + 1;
}
LunarCalendarDay |= day;
LunarCalendarDay |= (month << 6);
if (month == ((LunarCalendarTable[year - 1901] & 0xF00000) >> 20))
return 1;
else
return 0;
}
// char *to_luanr(int year,int month,int day)
void to_luanr(int year, int month, int day)
{
const char* ChDay[] = { "*","初一","初二","初三","初四","初五",
"初六","初七","初八","初九","初十",
"十一","十二","十三","十四","十五",
"十六","十七","十八","十九","二十",
"廿一","廿二","廿三","廿四","廿五",
"廿六","廿七","廿八","廿九","三十"
};
const char* ChMonth[] = { "*","正","二","三","四","五","六","七","八","九","十","十一","腊" };
// char *str;
// str = (char *)lv_mem_alloc(15);
char str[15];
memset(str, 0, 15);
LunarCalendarDay = 0;
if (LunarCalendar(year, month, day))
{
strcat(str, "闰");
strcat(str, ChMonth[(LunarCalendarDay & 0x3C0) >> 6]);
}
else
strcat(str, ChMonth[(LunarCalendarDay & 0x3C0) >> 6]);
strcat(str, "月");
strcat(str, ChDay[LunarCalendarDay & 0x3F]);
printf("str:%s\n", str);
// return str; //记得lv_mem_free(str);
}
int main(int argc, char* argv[]) {
if (argc != 4) {
printf("Usage: %s <year> <month> <day>\n", argv[0]);
return 1;
}
int year = atoi(argv[1]);
int month = atoi(argv[2]);
int day = atoi(argv[3]);
if (year < 1901 || year > 2099 || month < 1 || month > 12 || day < 1 || day > 31) {
printf("Invalid date. Please provide a valid year (1901-2099), month (1-12), and day (1-31).\n");
return 1;
}
to_luanr(year, month, day);
return 0;
}