diff --git a/project/example/ble/ble_peripheral/app/src/Rf433.c b/project/example/ble/ble_peripheral/app/src/Rf433.c index 6951f29..25888eb 100644 --- a/project/example/ble/ble_peripheral/app/src/Rf433.c +++ b/project/example/ble/ble_peripheral/app/src/Rf433.c @@ -7,6 +7,7 @@ #include "light_transition.h" #include "pwm.h" #include "rf433_decoder.h" +#include "timeslice.h" union rf433_flag rf_flag = {0}; unsigned char high_level_time; unsigned char low_level_time; @@ -453,7 +454,6 @@ void _433_fun(){ } if(Key_TypeDef.KEY_STATE_Click==1||KEY_STATE_re==1) return; set_click(); - sss=1;//记忆标志位 switch(res_data){ //椭圆 case ON://单击 @@ -534,6 +534,7 @@ void _433_fun(){ } break; } + set_TaskComps_timer(2U, 1000U); } diff --git a/project/example/ble/ble_peripheral/app/src/arch_main.c b/project/example/ble/ble_peripheral/app/src/arch_main.c index 3cbe852..88ad1df 100644 --- a/project/example/ble/ble_peripheral/app/src/arch_main.c +++ b/project/example/ble/ble_peripheral/app/src/arch_main.c @@ -396,6 +396,7 @@ int main(void) xc_fmc_spi_flash_wake_up(); fmc_spi_read(); + power_restore_apply_on_boot(); timer0_2_init(); bluetooth_init(); diff --git a/project/example/ble/ble_peripheral/app/src/fmc_spi.c b/project/example/ble/ble_peripheral/app/src/fmc_spi.c index ddc31c6..96289dc 100644 --- a/project/example/ble/ble_peripheral/app/src/fmc_spi.c +++ b/project/example/ble/ble_peripheral/app/src/fmc_spi.c @@ -33,6 +33,7 @@ #include "PWM.h" #include "RF433.h" #include "xc60xx.h" +#include "timeslice.h" /*------------------------------------------------------------------------------------ Macros @@ -73,6 +74,15 @@ unsigned char get_checksum(unsigned char *ptrdata, unsigned char length) #define FLASH_BRIGHTNESS_PERCENT_MARK 0xA5U #define FLASH_MODE_LAYOUT_INDEX 26U #define FLASH_MODE_LAYOUT_MARK 0xA6U +#define FLASH_POWER_MODE_MARK_INDEX 27U +#define FLASH_POWER_MODE_INDEX 28U +#define FLASH_POWER_CYCLE_INDEX 29U +#define FLASH_POWER_MODE_MARK 0xA7U +#define POWER_POLICY_SAVE_DELAY_MS 100U +#define POWER_CYCLE_SAVE_DELAY_MS 100U + +uint8_t power_restore_policy = POWER_RESTORE_CYCLE_STATIC; +static uint8_t power_cycle_next_mode; void read_user_data(void) { @@ -141,6 +151,20 @@ void read_user_data(void) } if(choose_mode_falsg > CUSTOM_TEMPERATURE_MODE) choose_mode_falsg = EFFECT_MODE_MIN; + if(r_data[FLASH_POWER_MODE_MARK_INDEX] == FLASH_POWER_MODE_MARK) + { + power_restore_policy = r_data[FLASH_POWER_MODE_INDEX]; + if(power_restore_policy > POWER_RESTORE_CYCLE_STATIC) + power_restore_policy = POWER_RESTORE_CYCLE_STATIC; + power_cycle_next_mode = r_data[FLASH_POWER_CYCLE_INDEX]; + if(power_cycle_next_mode > 2U) + power_cycle_next_mode = 0U; + } + else + { + power_restore_policy = POWER_RESTORE_CYCLE_STATIC; + power_cycle_next_mode = 0U; + } //choose_mode_bh=r_data[31]; driveMode=r_data[32]; flag_1h = (r_data[36] << 24) | (r_data[35] << 16) | (r_data[34] << 8) | r_data[33]; @@ -187,9 +211,9 @@ void wright_user_data(void) app_data[24]=adress_H_array[4]; app_data[25]=adress_L_array[4]; app_data[FLASH_MODE_LAYOUT_INDEX]=FLASH_MODE_LAYOUT_MARK; - app_data[27]=0; - app_data[28]=0; - app_data[29]=0; + app_data[FLASH_POWER_MODE_MARK_INDEX]=FLASH_POWER_MODE_MARK; + app_data[FLASH_POWER_MODE_INDEX]=power_restore_policy; + app_data[FLASH_POWER_CYCLE_INDEX]=power_cycle_next_mode; app_data[30]=choose_mode_falsg; app_data[31]=choose_mode_bh; app_data[32]=driveMode; @@ -215,3 +239,55 @@ void fmc_spi_read(void) } +void power_restore_policy_set(uint8_t policy) +{ + if(policy > POWER_RESTORE_CYCLE_STATIC) return; + + if(policy == POWER_RESTORE_CYCLE_STATIC && + power_restore_policy != POWER_RESTORE_CYCLE_STATIC) + power_cycle_next_mode = 0U; + + if(policy == power_restore_policy) return; + + power_restore_policy = policy; + set_TaskComps_timer(2U, POWER_POLICY_SAVE_DELAY_MS); +} + +void power_restore_apply_on_boot(void) +{ + uint8_t mode_index; + + if(power_restore_policy != POWER_RESTORE_CYCLE_STATIC) return; + + mode_index = power_cycle_next_mode; + if(mode_index > 2U) mode_index = 0U; + + deviceStatus = POWERON; + Mode = mode0; + choose_mode_falsg = mode_index; + choose_mode_bh = 0U; + + if(mode_index == 0U) + { + W_PWM = 100U; + C_PWM = 0U; + driveMode = 1U; + } + else if(mode_index == 1U) + { + W_PWM = 0U; + C_PWM = 100U; + driveMode = 2U; + } + else + { + W_PWM = 50U; + C_PWM = 50U; + driveMode = 0U; + } + + power_cycle_next_mode = (uint8_t)((mode_index + 1U) % 3U); + + /* Save the next startup mode while power is stable. */ + set_TaskComps_timer(2U, POWER_CYCLE_SAVE_DELAY_MS); +} diff --git a/project/example/ble/ble_peripheral/app/src/fmc_spi.h b/project/example/ble/ble_peripheral/app/src/fmc_spi.h index 1ef1d64..2f45c71 100644 --- a/project/example/ble/ble_peripheral/app/src/fmc_spi.h +++ b/project/example/ble/ble_peripheral/app/src/fmc_spi.h @@ -37,6 +37,9 @@ extern "C" { #include #include +#define POWER_RESTORE_FULL_MEMORY 0U +#define POWER_RESTORE_CYCLE_STATIC 1U + /*------------------------------------------------------------------------------------ Macros -------------------------------------------------------------------------------------*/ @@ -49,12 +52,15 @@ extern "C" { Global Variables -------------------------------------------------------------------------------------*/ extern uint8_t data[]; + extern uint8_t power_restore_policy; /*------------------------------------------------------------------------------------ Exported Functions -------------------------------------------------------------------------------------*/ void fmc_spi_wright(void); void fmc_spi_dma_demo(void); void fmc_spi_read(void); +void power_restore_apply_on_boot(void); +void power_restore_policy_set(uint8_t policy); #ifdef __cplusplus } #endif diff --git a/project/example/ble/ble_peripheral/app/src/uart.c b/project/example/ble/ble_peripheral/app/src/uart.c index 775f6df..2959380 100644 --- a/project/example/ble/ble_peripheral/app/src/uart.c +++ b/project/example/ble/ble_peripheral/app/src/uart.c @@ -37,6 +37,7 @@ #include "timer.h" #include "math.h" #include "timeslice.h" +#include "fmc_spi.h" /*------------------------------------------------------------------------------------ Macros @@ -83,7 +84,6 @@ void uart_receive_cb(uint8_t *buff, uint16_t len) void scan_uar_data(uint8_t *frame){ } -extern uint8_t sss; uint8_t rx_date; void scan_uart(uint8_t *arr) { @@ -105,8 +105,7 @@ void scan_uart(uint8_t *arr) checksum += user_rx_buf[i]; } user_rx_buf[5] = checksum; // 校验位 - sss=1; - // printf("sss=%d\r\n",sss); + set_TaskComps_timer(2U, 1000U); switch (user_rx_buf[4]) { @@ -172,6 +171,9 @@ void scan_uart(uint8_t *arr) flag_1h=flag_1h*60000; //flag_1h=2000; break; + case 12: + power_restore_policy_set(user_rx_buf[1]); + break; case 9: break; diff --git a/project/example/ble/ble_peripheral/app/src/usr_server.c b/project/example/ble/ble_peripheral/app/src/usr_server.c index 7f13c6d..31c2716 100644 --- a/project/example/ble/ble_peripheral/app/src/usr_server.c +++ b/project/example/ble/ble_peripheral/app/src/usr_server.c @@ -14,6 +14,7 @@ #include "usr_server.h" #include "Mode.h" #include "PWM.h" +#include "fmc_spi.h" #if (BLE_APP_PRESENT) uint8_t srv_user_lid = GATT_INVALID_USER_LID; @@ -91,7 +92,8 @@ uint8_t send_flag=1; #define BLE_STATE_DIRTY_BRIGHTNESS 0x04U #define BLE_STATE_DIRTY_SPEED 0x08U #define BLE_STATE_DIRTY_TEMPERATURE 0x10U -#define BLE_STATE_DIRTY_ALL 0x1FU +#define BLE_STATE_DIRTY_POWER_MODE 0x20U +#define BLE_STATE_DIRTY_ALL 0x3FU static uint8_t ble_state_dirty = BLE_STATE_DIRTY_ALL; static uint8_t ble_last_power; @@ -99,6 +101,7 @@ static uint8_t ble_last_mode; static uint8_t ble_last_brightness; static uint8_t ble_last_speed; static uint8_t ble_last_temperature; +static uint8_t ble_last_power_mode; static uint8_t ble_temperature_value(void) { @@ -132,6 +135,8 @@ void ble_state_sync_poll(void) ble_state_dirty |= BLE_STATE_DIRTY_SPEED; if(Mode == mode0 && ble_temperature_value() != ble_last_temperature) ble_state_dirty |= BLE_STATE_DIRTY_TEMPERATURE; + if(power_restore_policy != ble_last_power_mode) + ble_state_dirty |= BLE_STATE_DIRTY_POWER_MODE; if(!send_flag || !ble_state_dirty) return; @@ -159,12 +164,18 @@ void ble_state_sync_poll(void) data[3] = 0x05U; sent_mask = BLE_STATE_DIRTY_SPEED; } - else + else if(ble_state_dirty & BLE_STATE_DIRTY_TEMPERATURE) { value = ble_temperature_value(); data[3] = 0x06U; sent_mask = BLE_STATE_DIRTY_TEMPERATURE; } + else + { + value = power_restore_policy; + data[3] = 0x0CU; + sent_mask = BLE_STATE_DIRTY_POWER_MODE; + } data[0] = value; if(slave_send_data(data, sizeof(data), CUSTOM_SVC_TX_CHAR_VAL) == GATT_NO_ERROR) @@ -173,7 +184,8 @@ void ble_state_sync_poll(void) else if(sent_mask == BLE_STATE_DIRTY_MODE) ble_last_mode = value; else if(sent_mask == BLE_STATE_DIRTY_BRIGHTNESS) ble_last_brightness = value; else if(sent_mask == BLE_STATE_DIRTY_SPEED) ble_last_speed = value; - else ble_last_temperature = value; + else if(sent_mask == BLE_STATE_DIRTY_TEMPERATURE) ble_last_temperature = value; + else ble_last_power_mode = value; ble_state_dirty &= (uint8_t)(~sent_mask); } } diff --git a/project/example/ble/ble_peripheral/mdk/Linker/cpu_xip.scat b/project/example/ble/ble_peripheral/mdk/Linker/cpu_xip.scat index 64a5363..b815bc8 100644 --- a/project/example/ble/ble_peripheral/mdk/Linker/cpu_xip.scat +++ b/project/example/ble/ble_peripheral/mdk/Linker/cpu_xip.scat @@ -1,6 +1,6 @@ -LOAD 0x1100E000 +LOAD 0x11011000 { - EXE 0x1100E000 + EXE 0x11011000 { startup_xinc.o (RESET, +FIRST) * (+RO) @@ -20,7 +20,8 @@ LOAD 0x1100E000 *(ram_em) } ScatterAssert((0x530077b0)+ImageLength(RW2) < 0x53008000) - ScatterAssert(ImageLength(EXE) <= 0x10000) + /* User settings start at flash offset 0x1E000. */ + ScatterAssert(ImageLength(EXE) <= 0xD000) } diff --git a/project/example/ble/ble_peripheral/mdk/ble_peripheral.uvprojx b/project/example/ble/ble_peripheral/mdk/ble_peripheral.uvprojx index 011f4f2..40e2371 100644 --- a/project/example/ble/ble_peripheral/mdk/ble_peripheral.uvprojx +++ b/project/example/ble/ble_peripheral/mdk/ble_peripheral.uvprojx @@ -338,7 +338,7 @@ 0 --gnu --diag_suppress=66 --feedback fb.txt - APP_SCAN_FUNCTION=0 CFG_MIN_STACK CONFIG_BT_WAKEUP_VIA_GPIO=0 CONFIG_HFCLK_IS_OSC32M_PLL_32M=1 SCATTER_LOAD_RAM_EM=1 SDK_VERSION="2b8e78c6" RC_32K=1 XC60XX CFG_BLE CFG_EMB CFG_STATIC HCI_TEST_NO_IP=0 CFG_ACT=20 CFG_CON=1 CFG_RAL=1 CFG_HOST CFG_APP CFG_APP_PRF CFG_RF_EXTRC CFG_AES_RPA CFG_PERIPHERAL USE_XIP=1 DEBUG_ENABLE ROM_ENV_ENABLE=0 CODE_USE_XIP CFG_PRF_BASS USE_ROM_FLASH=1 CFG_ADV_LOW_POWER CFG_CONN_OPTIMIZE_0x3E + WDT_ON=1 APP_SCAN_FUNCTION=0 CFG_MIN_STACK CONFIG_BT_WAKEUP_VIA_GPIO=0 CONFIG_HFCLK_IS_OSC32M_PLL_32M=1 SCATTER_LOAD_RAM_EM=1 SDK_VERSION="2b8e78c6" RC_32K=1 XC60XX CFG_BLE CFG_EMB CFG_STATIC HCI_TEST_NO_IP=0 CFG_ACT=20 CFG_CON=1 CFG_RAL=1 CFG_HOST CFG_APP CFG_APP_PRF CFG_RF_EXTRC CFG_AES_RPA CFG_PERIPHERAL USE_XIP=1 DEBUG_ENABLE ROM_ENV_ENABLE=0 CODE_USE_XIP CFG_PRF_BASS USE_ROM_FLASH=1 CFG_ADV_LOW_POWER CFG_CONN_OPTIMIZE_0x3E ..\..\..\..\..\component\ble\Include;..\app\api;..\..\..\..\..\component\ble\modules\aes\api;..\..\..\..\..\component\ble\modules\aes\src;..\..\..\..\..\component\ble\modules\common\api;..\..\..\..\..\component\ble\modules\common\src;..\..\..\..\..\component\ble\modules\ecc_p256\api;..\..\..\..\..\component\ble\modules\ecc_p256\src;..\..\..\..\..\component\ble\modules\h4tl\api;..\..\..\..\..\component\ble\modules\h4tl\src;..\..\..\..\..\component\ble\modules\ke\api;..\..\..\..\..\component\ble\modules\ke\src;..\..\..\..\..\component\ble\modules\nvds\api;..\..\..\..\..\component\ble\modules\nvds\src;..\..\..\..\..\component\ble\modules\rf\api;..\..\..\..\..\component\ble\modules\rf\src;..\..\..\..\..\component\ble\modules\rwip\api;..\..\..\..\..\component\ble\modules\rwip\src;..\..\..\..\..\component\ble\ip\ahi\api;..\..\..\..\..\component\ble\ip\ahi\src;..\..\..\..\..\component\ble\ip\ble\gaf\api;..\..\..\..\..\component\ble\ip\ble\gaf\inc;..\..\..\..\..\component\ble\ip\ble\gaf\src;..\..\..\..\..\component\ble\ip\ble\gaf\src\acc;..\..\..\..\..\component\ble\ip\ble\gaf\src\al;..\..\..\..\..\component\ble\ip\ble\gaf\src\arc;..\..\..\..\..\component\ble\ip\ble\gaf\src\bap\bc;..\..\..\..\..\component\ble\ip\ble\gaf\src\bap\capa;..\..\..\..\..\component\ble\ip\ble\gaf\src\bap\codec;..\..\..\..\..\component\ble\ip\ble\gaf\src\bap\uc;..\..\..\..\..\component\ble\ip\ble\gaf\src\iap;..\..\..\..\..\component\ble\ip\ble\hl\api;..\..\..\..\..\component\ble\ip\ble\hl\inc;..\..\..\..\..\component\ble\ip\ble\hl\src;..\..\..\..\..\component\ble\ip\ble\hl\src\gap;..\..\..\..\..\component\ble\ip\ble\hl\src\gap\gapc;..\..\..\..\..\component\ble\ip\ble\hl\src\gap\gapm;..\..\..\..\..\component\ble\ip\ble\hl\src\gatt;..\..\..\..\..\component\ble\ip\ble\hl\src\inc;..\..\..\..\..\component\ble\ip\ble\hl\src\l2cap;..\..\..\..\..\component\ble\ip\ble\ll\api;..\..\..\..\..\component\ble\ip\ble\ll\src;..\..\..\..\..\component\ble\ip\ble\ll\src\co;..\..\..\..\..\component\ble\ip\ble\ll\src\llc;..\..\..\..\..\component\ble\ip\ble\ll\src\lld;..\..\..\..\..\component\ble\ip\ble\ll\src\lli;..\..\..\..\..\component\ble\ip\ble\ll\src\llm;..\..\..\..\..\component\ble\ip\ble\profiles\bas\bass\api;..\..\..\..\..\component\ble\ip\ble\profiles\bas\bass\src;..\..\..\..\..\component\ble\ip\em\api;..\..\..\..\..\component\ble\ip\em\src;..\..\..\..\..\component\ble\ip\hci\api;..\..\..\..\..\component\ble\ip\hci\src;..\..\..\..\..\component\ble\ip\sch\api;..\..\..\..\..\component\ble\ip\sch\src;..\..\..\..\..\component\ble\plf\refip\src\build\ble-full\reg\fw;..\app\api;..\app\src;..\..\..\..\..\component\ble\plf\refip\src\arch;..\..\..\..\..\component\ble\plf\refip\src\arch\compiler\gnuarm;..\..\..\..\..\component\ble\plf\refip\src\arch\ll\gnuarm;..\..\..\..\..\component\ble\plf\refip\src\driver\reg;..\..\..\..\..\component\ble\plf\refip\src\arch\boot\rvds;..\..\..\..\..\component\ble\plf\refip\src\driver\syscntl;..\..\..\..\..\component\ble\plf\refip\src\driver\emi;..\..\..\..\..\component\ble\plf\refip\src\driver\intc;..\..\..\..\..\component\ble\plf\refip\src\driver\uart;..\..\..\..\..\component\ble\plf\refip\src\driver\flash;..\..\..\..\..\component\ble\plf\refip\src\driver\led;..\..\..\..\..\component\ble\modules\dbg\api;..\..\..\..\..\component\ble\plf\refip\src\driver\uart;..\..\..\..\..\component\xc6xx_drivers\Drivers\CMSIS;..\..\..\..\..\component\xc6xx_drivers\Drivers\CMSIS\Device;..\..\..\..\..\component\xc6xx_drivers\Drivers\Startup;..\..\..\..\..\component\xc6xx_drivers\Drivers\Startup\xc60xx;..\..\..\..\..\component\xc6xx_drivers\Drivers\Periph_HAL_Driver;..\..\..\..\..\component\xc6xx_drivers\Drivers\Periph_HAL_Driver\Bitfields;..\..\..\..\..\component\xc6xx_drivers\Drivers\Periph_HAL_Driver\Ringbuffer;..\..\..\..\..\component\xc6xx_drivers\Drivers\test_case\PWR;..\..\..\..\..\component\xc6xx_drivers\Drivers\test_case\TIMER;..\..\..\..\..\component\ble\ip\ble\api;..\..\..\..\..\component\ble\ip\ble\ll_rom_port;..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver;..\..\..\..\..\component\xc6xx_drivers\Drivers\CMSIS\Device\xc_m0_register;..\..\..\..\..\component\ble\modules\flash;..\..\..\..\..\component\xc6xx_drivers\Drivers\xc_driver;..\..\..\driver\adc_mic_pga\app\api;..\app\src\project_config;..\app\src\elk_leds diff --git a/project/example/ble/ble_peripheral/mdk/output_tool/xinchip_bootloader2.bat b/project/example/ble/ble_peripheral/mdk/output_tool/xinchip_bootloader2.bat index 4d93ede..a127f01 100644 --- a/project/example/ble/ble_peripheral/mdk/output_tool/xinchip_bootloader2.bat +++ b/project/example/ble/ble_peripheral/mdk/output_tool/xinchip_bootloader2.bat @@ -1,6 +1,6 @@ .\output_tool\xinchip_bootloader2_tool.exe .\output_tool\boot2 ^ .\output_tool\host 0x11002000 0 ^ -app.bin 0x1100E000 1 ^ +app.bin 0x11011000 1 ^ .\output_bin\ble_peripheral.bin 1 copy .\output_bin\ble_peripheral.bin .\