Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MGR] Add support for Methylene HW2 PCB #750

Closed
wants to merge 1 commit into from
Closed

[MGR] Add support for Methylene HW2 PCB #750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 75 additions & 39 deletions main/system/manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
#define LED_P3_PIN 12
#define LED_P4_PIN 15

#define RELAY_PULSE_MS 20
#define RELAY_PULSE_MS 2000
#define DUTY_CYCLE_HALF 0x80000
#define DUTY_CYCLE_FULL 0xFFFFF

typedef void (*sys_mgr_cmd_t)(void);

enum {
SYS_MGR_POWER_ON_HOLD = 0,
SYS_MGR_POWER_ON_HOLD = 1,
SYS_MGR_SENSE_NEG,
SYS_MGR_POWER_NEG,
SYS_MGR_EXTERNAL,
Expand Down Expand Up @@ -125,24 +125,27 @@ static inline uint32_t sense_port_is_empty(uint32_t index) {
#endif
}

// Methylene OK
static inline void set_power_on(uint32_t state) {
if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_NEG)) {
// if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_NEG)) {
gpio_set_level(POWER_ON_PIN, !state);
}
else {
gpio_set_level(POWER_ON_PIN, state);
}
// }
// else {
// gpio_set_level(POWER_ON_PIN, state);
// }
}

static inline void set_power_off(uint32_t state) {
if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_NEG)) {
// Methylene OK
// if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_NEG)) {
gpio_set_level(power_off_pin, !state);
}
else {
gpio_set_level(power_off_pin, state);
}
// }
// else {
// gpio_set_level(power_off_pin, state);
// }
}


static inline void set_port_led(uint32_t index, uint32_t state) {
gpio_set_level(led_list[index], state);
}
Expand All @@ -153,16 +156,22 @@ static inline uint32_t get_port_led_pin(uint32_t index) {

static void internal_flag_init(void) {
#ifdef CONFIG_BLUERETRO_HW2
if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_NEG)) {
if (!gpio_get_level(POWER_ON_PIN) && gpio_get_level(RESET_PIN)) {
atomic_set_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL);
}
}
else {
if (gpio_get_level(POWER_ON_PIN) && gpio_get_level(RESET_PIN)) {
atomic_set_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL);
}
}

// Methylene
if (sys_mgr_get_power()) {
atomic_set_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL);
}

// if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_NEG)) {
// if (!gpio_get_level(POWER_ON_PIN) && gpio_get_level(RESET_PIN)) {
// atomic_set_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL);
// }
// }
// else {
// if (gpio_get_level(POWER_ON_PIN) && gpio_get_level(RESET_PIN)) {
// atomic_set_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL);
// }
// }
#else
atomic_set_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL);
#endif
Expand Down Expand Up @@ -222,6 +231,9 @@ static void power_on_hdl(void) {
/* System is power on */
bt_hci_inquiry_override(0);

/* Methylene - CONSOLE ON - so stop starting attempt */
set_power_on(0);

if (bt_host_get_active_dev(&not_used) < 0) {
/* No Bt device */
uint32_t port_cnt_loc = 0;
Expand Down Expand Up @@ -453,37 +465,61 @@ static void sys_mgr_inquiry_toggle(void) {
}

static void sys_mgr_power_on(void) {
set_power_on(1);
if (!atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_ON_HOLD)) {
vTaskDelay(RELAY_PULSE_MS / portTICK_PERIOD_MS);
set_power_on(0);

// Methylene OK
if (!sys_mgr_get_power()) {
// sys_mgr_power_on();

set_power_on(1);
return;
}


// set_power_on(1);
// if (!atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_ON_HOLD)) {
// vTaskDelay(RELAY_PULSE_MS / portTICK_PERIOD_MS);
// set_power_on(0);
// }
}

static void sys_mgr_power_off(void) {
bt_host_disconnect_all();
#ifdef CONFIG_BLUERETRO_HW2
if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_ON_HOLD)) {

// Methylene OK
if (sys_mgr_get_power()) {
// sys_mgr_power_on();

//set_power_off(1);

// Methylene Send signal
set_power_on(1);
vTaskDelay(1000 / portTICK_PERIOD_MS);
set_power_on(0);
return;
}
else {
set_power_off(1);
vTaskDelay(RELAY_PULSE_MS / portTICK_PERIOD_MS);
set_power_off(0);
}

// if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_POWER_ON_HOLD)) {
// set_power_on(0);
// }
// else {
// set_power_off(1);
// vTaskDelay(RELAY_PULSE_MS / portTICK_PERIOD_MS);
// set_power_off(0);
// }
#endif
}

static int32_t sys_mgr_get_power(void) {
#ifdef CONFIG_BLUERETRO_SYSTEM_UNIVERSAL
return 1;
#else
if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL)) {
return 1;
}
else {
// if (atomic_test_bit(&sys_mgr_flags, SYS_MGR_EXTERNAL)) {
// return 1;
// }
// else {
return gpio_get_level(POWER_SENSE_PIN);
}
// }
#endif
}

Expand Down Expand Up @@ -540,15 +576,15 @@ void sys_mgr_init(void) {
ledc_timer_config_t ledc_timer = {
.duty_resolution = LEDC_TIMER_20_BIT,
.freq_hz = 2,
.speed_mode = LEDC_LOW_SPEED_MODE,
.speed_mode = LEDC_SPEED_MODE_MAX,
.timer_num = LEDC_TIMER_1,
.clk_cfg = LEDC_AUTO_CLK,
};
ledc_channel_config_t ledc_channel = {
.channel = LEDC_CHANNEL_1,
.duty = DUTY_CYCLE_FULL,
.gpio_num = LED_P1_PIN,
.speed_mode = LEDC_LOW_SPEED_MODE,
.speed_mode = LEDC_SPEED_MODE_MAX,
.hpoint = 0,
.timer_sel = LEDC_TIMER_1,
};
Expand Down