CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BLE : Display the actual status of the connection on the screen.

Browse Source
This commit is contained in:
JF
2020-04-27 20:13:27 +02:00
parent 557e8fa19f
commit 746c164c59
5 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.cpp
View File

@@ -7,7 +7,6 @@
#include <softdevice/common/nrf_sdh.h>
#include <hal/nrf_rtc.h>
#include <timers.h>
//#include <ble/ble_services/ble_cts_c/ble_cts_c.h>
#include <Components/DateTime/DateTimeController.h>
#include "Components/Battery/BatteryController.h"
#include "Components/Ble/BleController.h"
@@ -90,34 +89,6 @@ void DebounceTimerCallback(TimerHandle_t xTimer) {
systemTask->OnButtonPushed();
}
void OnBleConnection() {
bleController.Connect();
}
void OnBleDisconnection() {
bleController.Disconnect();
}
void OnNewNotification(const char* message, uint8_t size) {
notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, message, size);
systemTask->PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
}
//void OnNewTime(current_time_char_t* currentTime) {
// auto dayOfWeek = currentTime->exact_time_256.day_date_time.day_of_week;
// auto year = currentTime->exact_time_256.day_date_time.date_time.year;
// auto month = currentTime->exact_time_256.day_date_time.date_time.month;
// auto day = currentTime->exact_time_256.day_date_time.date_time.day;
// auto hour = currentTime->exact_time_256.day_date_time.date_time.hours;
// auto minute = currentTime->exact_time_256.day_date_time.date_time.minutes;
// auto second = currentTime->exact_time_256.day_date_time.date_time.seconds;
//
// dateTimeController.SetTime(year, month, day,
// dayOfWeek, hour, minute, second, nrf_rtc_counter_get(portNRF_RTC_REG));
//
// systemTask->PushMessage(Pinetime::System::SystemTask::Messages::OnNewTime);
//}
void SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler(void) {
if(((NRF_SPIM0->INTENSET & (1<<6)) != 0) && NRF_SPIM0->EVENTS_END == 1) {
NRF_SPIM0->EVENTS_END = 0;
@@ -218,8 +189,6 @@ void nimble_port_init(void) {
ble_ll_init();
ble_hci_ram_init();
nimble_port_freertos_init(BleHost);
}
void nimble_port_ll_task_func(void *args) {
@@ -238,16 +207,8 @@ int main(void) {
systemTask.reset(new Pinetime::System::SystemTask(spi, lcd, touchPanel, lvgl, batteryController, bleController,
dateTimeController, notificationManager));
systemTask->Start();
nimble_port_init();
// ble_manager_init();
// ble_manager_set_new_time_callback(OnNewTime);
// ble_manager_set_ble_connection_callback(OnBleConnection);
// ble_manager_set_ble_disconnection_callback(OnBleDisconnection);
// ble_manager_set_new_notification_callback(OnNewNotification);
vTaskStartScheduler();
for (;;) {