jh.chun/VivaMyo-firmware-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P0.11 핀 활성화: ADA2200(Lock-in Amp.) 전원 공급(LDO)

Browse Source 
- Flash Memory(W25Q31) 전용으로 보고 IR 제어 비활성화 -> GPIO 제어 가능하도록 복원
This commit is contained in:
jhChun
2026-04-09 11:12:22 +09:00
parent 82e33d8bf9
commit d53cfc78a6
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/ble_peripheral/ble_app_vivaMayo/main.c
View File

@@ -342,7 +342,7 @@ int main(void)
LOG_PRINTF("\r\n\r\n"); LOG_PRINTF("\r\n\r\n");
LOG_PRINTF("========================================\r\n"); LOG_PRINTF("========================================\r\n");
LOG_PRINTF(" vivaMayo UART OK\r\n"); LOG_PRINTF(" VivaMayo UART OK\r\n");
LOG_PRINTF("========================================\r\n"); LOG_PRINTF("========================================\r\n");
#if DEBUG_MINIMAL_BOOT #if DEBUG_MINIMAL_BOOT

15
project/ble_peripheral/ble_app_vivaMayo/power_control.c
View File

@@ -32,6 +32,7 @@ APP_TIMER_DEF(m_w25q_test_timer_id);
#define POWER_LOOP_INTERVAL 30 #define POWER_LOOP_INTERVAL 30
static uint8_t p_order; static uint8_t p_order;
static volatile bool power_up_done = false;
extern uint8_t simple_samples_in_buffer; extern uint8_t simple_samples_in_buffer;
extern volatile bool processing; extern volatile bool processing;
bool lock_check = false; bool lock_check = false;
@@ -45,8 +46,14 @@ void power_gpio_init(void)
void ir_power_control(on_off_cont_t ir_power_st) void ir_power_control(on_off_cont_t ir_power_st)
{ {
/* Removed: P0.11 now W25Q32 power, IR power control no longer available */ /* P0.11 = PWR_I/R_EN = U6 LDO EN (+3.3V_R for ADA2200)
(void)ir_power_st; * Shared with W25Q32 power (W25Q_PWR_PIN2) - both need HIGH */
nrf_gpio_cfg_output(NRF_GPIO_PIN_MAP(0, 11));
if (ir_power_st == OFF) {
nrf_gpio_pin_clear(NRF_GPIO_PIN_MAP(0, 11));
} else if (ir_power_st == ON) {
nrf_gpio_pin_set(NRF_GPIO_PIN_MAP(0, 11));
}
} }
@@ -99,9 +106,12 @@ int device_sleep_mode(void){
} }
bool is_power_up_done(void) { return power_up_done; }
int device_activated(void){ int device_activated(void){
int rc = 0; int rc = 0;
p_order = 0; p_order = 0;
power_up_done = false;
lock_check =true; lock_check =true;
power_timer_start(); power_timer_start();
eeprom_control(OFF); eeprom_control(OFF);
@@ -249,6 +259,7 @@ void power_loop(void *p_context)
p_order++; p_order++;
power_timer_start(); power_timer_start();
} else { } else {
power_up_done = true;
DBG_PRINTF("[PWR] Device Activated OK!\r\n"); DBG_PRINTF("[PWR] Device Activated OK!\r\n");
} }
} }

1
project/ble_peripheral/ble_app_vivaMayo/power_control.h
View File

@@ -17,6 +17,7 @@ void rcv_power_control(on_off_cont_t rcv_power_st);
void eeprom_control(on_off_cont_t rcv_power_st); void eeprom_control(on_off_cont_t rcv_power_st);
int device_sleep_mode(void); int device_sleep_mode(void);
int device_activated(void); int device_activated(void);
bool is_power_up_done(void);
int device_reactivated(void); int device_reactivated(void);
void power_loop(void * p_context); /* For x ms */ void power_loop(void * p_context); /* For x ms */
void power_timer_start(void); void power_timer_start(void);