Browse Source

update

master
zhaohe 1 year ago
parent
commit
9f4833f754
  1. 4
      app/app.uvoptx
  2. 9
      app/src/app_ble_service.c
  3. 2
      app/src/board/board.h
  4. 3
      app/src/device_ctrl_service.c
  5. 2
      app/src/sample_data_manager_service.c
  6. 2
      app/src/sample_data_manager_service.h
  7. 46
      ble_app_uart_c/ble_app_uart_c_pca10100_s122.uvguix.h_zha
  8. 7
      ble_app_uart_c/main.c

4
app/app.uvoptx

@ -134,10 +134,6 @@
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>DLGUARM</Key>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key> <Key>JL2CM3</Key>
<Name>-U150710864 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC4000 -FN2 -FF0nrf52xxx.flm -FS00 -FL0200000 -FP0($$Device:nRF52833_xxAA$Flash\nrf52xxx.flm) -FF1nrf52xxx_uicr.flm -FS110001000 -FL11000 -FP1($$Device:nRF52833_xxAA$Flash\nrf52xxx_uicr.flm)</Name> <Name>-U150710864 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC4000 -FN2 -FF0nrf52xxx.flm -FS00 -FL0200000 -FP0($$Device:nRF52833_xxAA$Flash\nrf52xxx.flm) -FF1nrf52xxx_uicr.flm -FS110001000 -FL11000 -FP1($$Device:nRF52833_xxAA$Flash\nrf52xxx_uicr.flm)</Name>
</SetRegEntry> </SetRegEntry>

9
app/src/app_ble_service.c

@ -98,9 +98,9 @@ static void prvf_try_report_sensor_drop_event(uint8_t dropstate0, uint8_t dropst
static void prvf_try_report_sample_end_event() { static void prvf_try_report_sample_end_event() {
ify_hrs_packet_t* reportpacket = (ify_hrs_packet_t*)m_reportbuf; ify_hrs_packet_t* reportpacket = (ify_hrs_packet_t*)m_reportbuf;
reportpacket->cmd = ify_hrs_report_sample_finish_end;
reportpacket->frame_index = 0;
reportpacket->frame_type = kifyhrs_pt_report;
reportpacket->cmd = ify_hrs_report_sample_finish_end;
reportpacket->frame_index = 0;
reportpacket->frame_type = kifyhrs_pt_report;
uint16_t sendlen = sizeof(ify_hrs_packet_t); uint16_t sendlen = sizeof(ify_hrs_packet_t);
zdatachannel_data_send2(m_reportbuf, sendlen); zdatachannel_data_send2(m_reportbuf, sendlen);
@ -142,6 +142,9 @@ void prvf_report_sample_data(uint32_t frameIndex, uint32_t data, uint32_t data2,
reportpacket->data[10] = (data3 >> 16) & 0xFF; reportpacket->data[10] = (data3 >> 16) & 0xFF;
reportpacket->data[11] = 0; reportpacket->data[11] = 0;
// reportpacket->data[12] = 0xFE;
// reportpacket->data[13] = 0xEF;
uint16_t sendlen = sizeof(heartrate_report_packet_t) + 4 * 3; uint16_t sendlen = sizeof(heartrate_report_packet_t) + 4 * 3;
zdatachannel_data_send2(m_reportbuf, sendlen); zdatachannel_data_send2(m_reportbuf, sendlen);
return; return;

2
app/src/board/board.h

@ -58,7 +58,7 @@
#define HEART_WAVE_SAMPLE_SERVICE_CACHE_SIZE (3 * 3 * 256) #define HEART_WAVE_SAMPLE_SERVICE_CACHE_SIZE (3 * 3 * 256)
#define FILE_MAX_COUNT 1 #define FILE_MAX_COUNT 1
#define SDCARD_MAX_FILE_SIZE (3 * 1024 * 1024 * 1024)
#define SDCARD_MAX_FILE_SIZE (uint32_t)(3 * 1024 * 1024 * 1024)
// //
#define SAMPLE_RATE 800 #define SAMPLE_RATE 800
#define SAMPLE_PRECISION 24 #define SAMPLE_PRECISION 24

3
app/src/device_ctrl_service.c

@ -116,6 +116,7 @@ static void prvf_change_to_standby_state() {
static void prvf_change_to_ready_state() { static void prvf_change_to_ready_state() {
poweron(); poweron();
DeviceCtrl_change_to_state(kdevice_state_ready); DeviceCtrl_change_to_state(kdevice_state_ready);
BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortBeep);
} }
static const char* dropstate(uint8_t drop0, uint8_t drop1) { static const char* dropstate(uint8_t drop0, uint8_t drop1) {
static char state[128]; static char state[128];
@ -179,6 +180,8 @@ static void app_event_listener(void* p_event_data, uint16_t event_size) { //
event.eventType = kevent_sample_start_event; event.eventType = kevent_sample_start_event;
AppEvent_pushEvent(&event); AppEvent_pushEvent(&event);
} }
BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortBeep);
} }
} }
// //

2
app/src/sample_data_manager_service.c

@ -136,7 +136,7 @@ int32_t SampleDataMgr_read(int32_t fd, uint8_t* data, int32_t size) {
ZASSERT(ff_result == FR_OK); ZASSERT(ff_result == FR_OK);
return read_size; return read_size;
} }
int32_t SampleDataMgr_getFileSizeByFd(int32_t fd) {
uint32_t SampleDataMgr_getFileSizeByFd(int32_t fd) {
ZASSERT(m_is_open); ZASSERT(m_is_open);
return f_size(&m_default_file_handler); return f_size(&m_default_file_handler);
} }

2
app/src/sample_data_manager_service.h

@ -67,7 +67,7 @@ int32_t SampleDataMgr_open(sample_data_filename_t* filename, wrflag_t flag);
int32_t SampleDataMgr_close(int32_t fd); int32_t SampleDataMgr_close(int32_t fd);
int32_t SampleDataMgr_write(int32_t fd, const uint8_t* data, int32_t size); int32_t SampleDataMgr_write(int32_t fd, const uint8_t* data, int32_t size);
int32_t SampleDataMgr_read(int32_t fd, uint8_t* data, int32_t size); int32_t SampleDataMgr_read(int32_t fd, uint8_t* data, int32_t size);
int32_t SampleDataMgr_getFileSizeByFd(int32_t fd);
uint32_t SampleDataMgr_getFileSizeByFd(int32_t fd);
/******************************************************************************* /*******************************************************************************
* * * *

46
ble_app_uart_c/ble_app_uart_c_pca10100_s122.uvguix.h_zha
File diff suppressed because it is too large
View File

7
ble_app_uart_c/main.c

@ -221,7 +221,8 @@ static void ble_nus_chars_received_uart_print(uint8_t * p_data, uint16_t data_le
NRF_LOG_DEBUG("Receiving data."); NRF_LOG_DEBUG("Receiving data.");
NRF_LOG_HEXDUMP_DEBUG(p_data, data_len); NRF_LOG_HEXDUMP_DEBUG(p_data, data_len);
// app_uart_put(0x5A);
// app_uart_put(data_len);
for (uint32_t i = 0; i < data_len; i++) for (uint32_t i = 0; i < data_len; i++)
{ {
do do
@ -234,6 +235,8 @@ static void ble_nus_chars_received_uart_print(uint8_t * p_data, uint16_t data_le
} }
} while (ret_val == NRF_ERROR_BUSY); } while (ret_val == NRF_ERROR_BUSY);
} }
app_uart_put(0x5A);
app_uart_put(0xA5);
// if (p_data[data_len-1] == '\r') // if (p_data[data_len-1] == '\r')
// { // {
// while (app_uart_put('\n') == NRF_ERROR_BUSY); // while (app_uart_put('\n') == NRF_ERROR_BUSY);
@ -690,7 +693,7 @@ int main(void)
app_timer_create(&m_uart_send_tmr, APP_TIMER_MODE_REPEATED, uart_send_tmr_cb); app_timer_create(&m_uart_send_tmr, APP_TIMER_MODE_REPEATED, uart_send_tmr_cb);
app_timer_start(m_uart_send_tmr, APP_TIMER_TICKS(2), NULL); app_timer_start(m_uart_send_tmr, APP_TIMER_TICKS(2), NULL);
app_uart_put(1);
// app_uart_put(1);
// Start execution. // Start execution.
printf("BLE UART central example started.\r\n"); printf("BLE UART central example started.\r\n");

Loading…
Cancel
Save