liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor F2/local before F3 merge (#220)

Browse Source 
* add files from f3
* rollback lfs
* Move assets from LFS
* remove lfs from build

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
coreglitch
2020-11-06 14:31:59 +06:00
committed by GitHub
parent 841cae99ef
commit eb2679b982
106 changed files with 879 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/irda/irda.c
View File

@@ -7,6 +7,7 @@
typedef enum {
EventTypeTick,
EventTypeKey,
EventTypeLed,
} EventType;
typedef struct {
@@ -121,13 +122,9 @@ void render_samsung(CanvasApi* canvas, State* state) {
void input_carrier(AppEvent* event, State* state) {
if(event->value.input.input == InputOk) {
if(event->value.input.state) {
hal_pwm_set(
duty_cycles[state->carrier_duty_cycle_id],
state->carrier_freq,
&htim2,
TIM_CHANNEL_4);
irda_pwm_set(duty_cycles[state->carrier_duty_cycle_id], state->carrier_freq);
} else {
hal_pwm_stop(&htim2, TIM_CHANNEL_4);
irda_pwm_stop();
}
}

8
applications/irda/irda_nec.c
View File

@@ -4,18 +4,18 @@
void ir_nec_preambula(void) {
// 9ms carrier + 4.5ms pause
hal_pwm_set(NEC_DUTY_CYCLE, NEC_CARRIER_FREQUENCY, &htim2, TIM_CHANNEL_4);
irda_pwm_set(NEC_DUTY_CYCLE, NEC_CARRIER_FREQUENCY);
delay_us(9000);
hal_pwm_stop(&htim2, TIM_CHANNEL_4);
irda_pwm_stop();
delay_us(4500);
}
void ir_nec_send_bit(bool bit) {
// 0 is 562.5us carrier + 1687.5us pause
// 1 is 562.5us carrier + 562.5us pause
hal_pwm_set(NEC_DUTY_CYCLE, NEC_CARRIER_FREQUENCY, &htim2, TIM_CHANNEL_4);
irda_pwm_set(NEC_DUTY_CYCLE, NEC_CARRIER_FREQUENCY);
delay_us(562.5);
hal_pwm_stop(&htim2, TIM_CHANNEL_4);
irda_pwm_stop();
if(bit) {
delay_us(562.5);
} else {

2
applications/irda/irda_protocols.h
View File

@@ -1,7 +1,7 @@
#pragma once
// our tx pin is TIM2_CH4
extern TIM_HandleTypeDef htim2;
extern TIM_HandleTypeDef TIM_A;
#define RC5_CARRIER_FREQUENCY 36000
#define RC5_DUTY_CYCLE 0.33

8
applications/irda/irda_samsung.c
View File

@@ -3,16 +3,16 @@
#include "irda_protocols.h"
void ir_samsung_preambula(void) {
hal_pwm_set(SAMSUNG_DUTY_CYCLE, SAMSUNG_CARRIER_FREQUENCY, &htim2, TIM_CHANNEL_4);
irda_pwm_set(SAMSUNG_DUTY_CYCLE, SAMSUNG_CARRIER_FREQUENCY);
delay_us(4500);
hal_pwm_stop(&htim2, TIM_CHANNEL_4);
irda_pwm_stop();
delay_us(4500);
}
void ir_samsung_send_bit(bool bit) {
hal_pwm_set(SAMSUNG_DUTY_CYCLE, SAMSUNG_CARRIER_FREQUENCY, &htim2, TIM_CHANNEL_4);
irda_pwm_set(SAMSUNG_DUTY_CYCLE, SAMSUNG_CARRIER_FREQUENCY);
delay_us(560);
hal_pwm_stop(&htim2, TIM_CHANNEL_4);
irda_pwm_stop();
if(bit) {
delay_us(1590);
} else {