From 69d97afea8bbe2c2d6cc8f86399566a70c65c0ed Mon Sep 17 00:00:00 2001 From: DrZlo13 Date: Mon, 26 Oct 2020 10:27:27 +0300 Subject: [PATCH] IRDA samsung protocol (#200) * samsung irda protocol implementation * app for samsung irda protocol * smaller strings and hal pwm Co-authored-by: aanper --- applications/irda/irda.c | 79 +++++++++++++++++++++++++++--- applications/irda/irda_protocols.h | 3 ++ applications/irda/irda_samsung.c | 38 ++++++++++++++ applications/irda/irda_samsung.h | 4 ++ firmware/targets/f2/Src/freertos.c | 2 +- 5 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 applications/irda/irda_samsung.c create mode 100644 applications/irda/irda_samsung.h diff --git a/applications/irda/irda.c b/applications/irda/irda.c index 1c3d745b..a6e79207 100644 --- a/applications/irda/irda.c +++ b/applications/irda/irda.c @@ -1,6 +1,7 @@ #include "flipper.h" #include "flipper_v2.h" #include "irda_nec.h" +#include "irda_samsung.h" #include "irda_protocols.h" typedef enum { @@ -20,6 +21,7 @@ typedef struct { uint16_t carrier_freq; uint8_t carrier_duty_cycle_id; uint8_t nec_packet_id; + uint8_t samsung_packet_id; } State; typedef void (*ModeInput)(Event*, State*); @@ -29,6 +31,9 @@ void input_carrier(Event* event, State* state); void render_carrier(CanvasApi* canvas, State* state); void input_nec(Event* event, State* state); void render_nec(CanvasApi* canvas, State* state); +void render_carrier(CanvasApi* canvas, State* state); +void input_samsung(Event* event, State* state); +void render_samsung(CanvasApi* canvas, State* state); typedef struct { ModeRender render; @@ -40,12 +45,19 @@ typedef struct { uint8_t data; } NecPacket; +typedef struct { + uint16_t addr; + uint16_t data; +} SamsungPacket; + const Mode modes[] = { {.render = render_carrier, .input = input_carrier}, {.render = render_nec, .input = input_nec}, + {.render = render_samsung, .input = input_samsung}, }; -const NecPacket packets[] = { +const NecPacket nec_packets[] = { + {.addr = 0xFF, .data = 0x11}, {.addr = 0xF7, .data = 0x59}, {.addr = 0xFF, .data = 0x01}, {.addr = 0xFF, .data = 0x10}, @@ -54,6 +66,12 @@ const NecPacket packets[] = { {.addr = 0xFF, .data = 0xF0}, }; +const SamsungPacket samsung_packets[] = { + {.addr = 0xE0E, .data = 0xF30C}, + {.addr = 0xE0E, .data = 0xF40D}, + {.addr = 0xE0E, .data = 0xF50E}, +}; + const float duty_cycles[] = {0.1, 0.25, 0.333, 0.5, 1.0}; void render_carrier(CanvasApi* canvas, State* state) { @@ -74,15 +92,30 @@ void render_carrier(CanvasApi* canvas, State* state) { void render_nec(CanvasApi* canvas, State* state) { canvas->set_font(canvas, FontSecondary); - canvas->draw_str(canvas, 2, 25, "< nec protocol mode"); + canvas->draw_str(canvas, 2, 25, "< nec mode >"); canvas->draw_str(canvas, 2, 37, "? /\\ \\/ packet"); { char buf[24]; sprintf( buf, "packet: %02X %02X", - packets[state->nec_packet_id].addr, - packets[state->nec_packet_id].data); + nec_packets[state->nec_packet_id].addr, + nec_packets[state->nec_packet_id].data); + canvas->draw_str(canvas, 2, 50, buf); + } +} + +void render_samsung(CanvasApi* canvas, State* state) { + canvas->set_font(canvas, FontSecondary); + canvas->draw_str(canvas, 2, 25, "< samsung32 mode"); + canvas->draw_str(canvas, 2, 37, "? /\\ \\/ packet"); + { + char buf[24]; + sprintf( + buf, + "packet: %02X %02X", + samsung_packets[state->samsung_packet_id].addr, + samsung_packets[state->samsung_packet_id].data); canvas->draw_str(canvas, 2, 50, buf); } } @@ -119,16 +152,18 @@ void input_carrier(Event* event, State* state) { } void input_nec(Event* event, State* state) { + uint8_t packets_count = sizeof(nec_packets) / sizeof(nec_packets[0]); + if(event->value.input.input == InputOk) { if(event->value.input.state) { vTaskSuspendAll(); - ir_nec_send(packets[state->nec_packet_id].addr, packets[state->nec_packet_id].data); + ir_nec_send( + nec_packets[state->nec_packet_id].addr, nec_packets[state->nec_packet_id].data); xTaskResumeAll(); } } if(event->value.input.state && event->value.input.input == InputUp) { - uint8_t packets_count = sizeof(packets) / sizeof(packets[0]); if(state->nec_packet_id < (packets_count - 1)) { state->nec_packet_id++; } else { @@ -137,7 +172,6 @@ void input_nec(Event* event, State* state) { } if(event->value.input.state && event->value.input.input == InputDown) { - uint8_t packets_count = sizeof(packets) / sizeof(packets[0]); if(state->nec_packet_id > 0) { state->nec_packet_id--; } else { @@ -146,6 +180,36 @@ void input_nec(Event* event, State* state) { } } +void input_samsung(Event* event, State* state) { + uint8_t packets_count = sizeof(samsung_packets) / sizeof(samsung_packets[0]); + + if(event->value.input.input == InputOk) { + if(event->value.input.state) { + vTaskSuspendAll(); + ir_samsung_send( + samsung_packets[state->samsung_packet_id].addr, + samsung_packets[state->samsung_packet_id].data); + xTaskResumeAll(); + } + } + + if(event->value.input.state && event->value.input.input == InputUp) { + if(state->samsung_packet_id < (packets_count - 1)) { + state->samsung_packet_id++; + } else { + state->samsung_packet_id = 0; + } + } + + if(event->value.input.state && event->value.input.input == InputDown) { + if(state->samsung_packet_id > 0) { + state->samsung_packet_id--; + } else { + state->samsung_packet_id = packets_count - 1; + } + } +} + static void render_callback(CanvasApi* canvas, void* ctx) { State* state = (State*)acquire_mutex((ValueMutex*)ctx, 25); @@ -179,6 +243,7 @@ void irda(void* p) { _state.carrier_freq = 36000; _state.mode_id = 0; _state.nec_packet_id = 0; + _state.samsung_packet_id = 0; ValueMutex state_mutex; if(!init_mutex(&state_mutex, &_state, sizeof(State))) { diff --git a/applications/irda/irda_protocols.h b/applications/irda/irda_protocols.h index 5260e689..686ff219 100644 --- a/applications/irda/irda_protocols.h +++ b/applications/irda/irda_protocols.h @@ -9,6 +9,9 @@ extern TIM_HandleTypeDef htim2; #define RC6_CARRIER_FREQUENCY 36000 #define RC6_DUTY_CYCLE 0.33 +#define SAMSUNG_CARRIER_FREQUENCY 37900 +#define SAMSUNG_DUTY_CYCLE 0.33 + #define NEC_CARRIER_FREQUENCY 38000 #define NEC_DUTY_CYCLE 0.33 diff --git a/applications/irda/irda_samsung.c b/applications/irda/irda_samsung.c new file mode 100644 index 00000000..03eea7f8 --- /dev/null +++ b/applications/irda/irda_samsung.c @@ -0,0 +1,38 @@ +#include "flipper.h" +#include "irda_samsung.h" +#include "irda_protocols.h" + +void ir_samsung_preambula(void) { + hal_pwm_set(SAMSUNG_DUTY_CYCLE, SAMSUNG_CARRIER_FREQUENCY, &htim2, TIM_CHANNEL_4); + delay_us(4500); + hal_pwm_stop(&htim2, TIM_CHANNEL_4); + delay_us(4500); +} + +void ir_samsung_send_bit(bool bit) { + hal_pwm_set(SAMSUNG_DUTY_CYCLE, SAMSUNG_CARRIER_FREQUENCY, &htim2, TIM_CHANNEL_4); + delay_us(560); + hal_pwm_stop(&htim2, TIM_CHANNEL_4); + if(bit) { + delay_us(1590); + } else { + delay_us(560); + } +} + +void ir_samsung_send_byte(uint8_t data) { + for(uint8_t i = 0; i < 8; i++) { + ir_samsung_send_bit((data & (1 << (i))) != 0); + } +} + +void ir_samsung_send(uint16_t addr, uint16_t data) { + uint8_t samsung_packet[4] = { + (uint8_t)addr, (uint8_t)(addr >> 8), (uint8_t)data, (uint8_t)(data >> 8)}; + ir_samsung_preambula(); + ir_samsung_send_byte(samsung_packet[0]); + ir_samsung_send_byte(samsung_packet[1]); + ir_samsung_send_byte(samsung_packet[2]); + ir_samsung_send_byte(samsung_packet[3]); + ir_samsung_send_bit(0); +} \ No newline at end of file diff --git a/applications/irda/irda_samsung.h b/applications/irda/irda_samsung.h new file mode 100644 index 00000000..21bf4105 --- /dev/null +++ b/applications/irda/irda_samsung.h @@ -0,0 +1,4 @@ +#pragma once +#include "flipper.h" + +void ir_samsung_send(uint16_t addr, uint16_t data); \ No newline at end of file diff --git a/firmware/targets/f2/Src/freertos.c b/firmware/targets/f2/Src/freertos.c index bede73d6..55bd5970 100644 --- a/firmware/targets/f2/Src/freertos.c +++ b/firmware/targets/f2/Src/freertos.c @@ -60,7 +60,7 @@ osThreadId_t app_mainHandle; const osThreadAttr_t app_main_attributes = { .name = "app_main", .priority = (osPriority_t) osPriorityLow, - .stack_size = 128 * 4 + .stack_size = 1024 * 4 }; /* Private function prototypes -----------------------------------------------*/