It's now possible to read in the demo config file and write it to the firmware
This commit is contained in:
parent
24429cde26
commit
436e1a7191
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,6 +5,7 @@ f8prog
|
||||
build/
|
||||
firmware/
|
||||
.ccls-cache/
|
||||
*.bin
|
||||
|
||||
# ---> C
|
||||
# Prerequisites
|
||||
|
@ -5,6 +5,6 @@
|
||||
#include "../include/firmware_handling.h"
|
||||
|
||||
/* Read in a config file with the specified name. */
|
||||
prog_actionP *get_config(char *conf_name);
|
||||
f8_macroP *get_f8_macros(char *conf_name);
|
||||
|
||||
#endif /* CONFIG_HANDLING_H_ */
|
||||
|
279
include/defines.h
Normal file
279
include/defines.h
Normal file
@ -0,0 +1,279 @@
|
||||
/* keycodes taken from https://usb.org/sites/default/files/hut1_22.pdf
|
||||
* See also:
|
||||
* https://github.com/benblazak/ergodox-firmware/blob/master/src/lib/usb/usage-page/keyboard.h
|
||||
*/
|
||||
|
||||
#ifndef DEFINES_H_
|
||||
#define DEFINES_H_
|
||||
|
||||
/* THESE ARE THE AVALIABLE KEYS FOR THE "MOD_KEYS" PARAMETER */
|
||||
#define MODKEY_LCTR 0x01
|
||||
#define MODKEY_LSHI 0x02
|
||||
#define MODKEY_LALT 0x03
|
||||
#define MODKEY_LWIN 0x04
|
||||
#define MODKEY_RCTR 0x05
|
||||
#define MODKEY_RSHI 0x06
|
||||
#define MODKEY_RALT 0x07
|
||||
#define MODKEY_RWIN 0x08
|
||||
#define MODKEY_RWIN_RSHI 0x09
|
||||
#define MODKEY_RWIN_RCTR 0x0A
|
||||
#define MODKEY_RWIN_RALT 0x0B
|
||||
#define MODKEY_RWIN_RCTR_RSHI 0x0C
|
||||
#define MODKEY_RCTR_RALT 0x0D
|
||||
#define MODKEY_RCTR_RSHI 0x0E
|
||||
#define MODKEY_RALT_RSHI 0x0F
|
||||
#define MODKEY_RALT_RCTR_RSHI 0x10
|
||||
|
||||
/* THESE ARE THE AVAIRABLE KEYS FOR THE "KEYS" PARAMETER */
|
||||
#define KEY_ErrorRollOver 0x01
|
||||
#define KEY_POSTFail 0x02
|
||||
#define KEY_ErrorUndefined 0x03
|
||||
#define KEY_a_A 0x04
|
||||
#define KEY_b_B 0x05
|
||||
#define KEY_c_C 0x06
|
||||
#define KEY_d_D 0x07
|
||||
#define KEY_e_E 0x08
|
||||
#define KEY_f_F 0x09
|
||||
#define KEY_g_G 0x0A
|
||||
#define KEY_h_H 0x0B
|
||||
#define KEY_i_I 0x0C
|
||||
#define KEY_j_J 0x0D
|
||||
#define KEY_k_K 0x0E
|
||||
#define KEY_l_L 0x0F
|
||||
#define KEY_m_M 0x10
|
||||
#define KEY_n_N 0x11
|
||||
#define KEY_o_O 0x12
|
||||
#define KEY_p_P 0x13
|
||||
#define KEY_q_Q 0x14
|
||||
#define KEY_r_R 0x15
|
||||
#define KEY_s_S 0x16
|
||||
#define KEY_t_T 0x17
|
||||
#define KEY_u_U 0x18
|
||||
#define KEY_v_V 0x19
|
||||
#define KEY_w_W 0x1A
|
||||
#define KEY_x_X 0x1B
|
||||
#define KEY_y_Y 0x1C
|
||||
#define KEY_z_Z 0x1D
|
||||
#define KEY_1_Exclamation 0x1E
|
||||
#define KEY_2_At 0x1F
|
||||
#define KEY_3_Pound 0x20
|
||||
#define KEY_4_Dollar 0x21
|
||||
#define KEY_5_Percent 0x22
|
||||
#define KEY_6_Caret 0x23
|
||||
#define KEY_7_Ampersand 0x24
|
||||
#define KEY_8_Asterisk 0x25
|
||||
#define KEY_9_LeftParenthesis 0x26
|
||||
#define KEY_0_RightParenthesis 0x27
|
||||
#define KEY_ReturnEnter 0x28
|
||||
#define KEY_Escape 0x29
|
||||
#define KEY_DeleteBackspace 0x2A
|
||||
#define KEY_Tab 0x2B
|
||||
#define KEY_Spacebar 0x2C
|
||||
#define KEY_Dash_Underscore 0x2D
|
||||
#define KEY_Equal_Plus 0x2E
|
||||
#define KEY_LeftBracket_LeftBrace 0x2F
|
||||
#define KEY_RightBracket_RightBrace 0x30
|
||||
#define KEY_Backslash_Pipe 0x31
|
||||
#define KEY_NonUS_Pound_Tilde 0x32
|
||||
#define KEY_Semicolon_Colon 0x33
|
||||
#define KEY_SingleQuote_DoubleQuote 0x34
|
||||
#define KEY_GraveAccent_Tilde 0x35
|
||||
#define KEY_Comma_LessThan 0x36
|
||||
#define KEY_Period_GreaterThan 0x37
|
||||
#define KEY_Slash_Question 0x38
|
||||
#define KEY_CapsLock 0x39
|
||||
#define KEY_F1 0x3A
|
||||
#define KEY_F2 0x3B
|
||||
#define KEY_F3 0x3C
|
||||
#define KEY_F4 0x3D
|
||||
#define KEY_F5 0x3E
|
||||
#define KEY_F6 0x3F
|
||||
#define KEY_F7 0x40
|
||||
#define KEY_F8 0x41
|
||||
#define KEY_F9 0x42
|
||||
#define KEY_F10 0x43
|
||||
#define KEY_F11 0x44
|
||||
#define KEY_F12 0x45
|
||||
#define KEY_PrintScreen 0x46
|
||||
#define KEY_ScrollLock 0x47
|
||||
#define KEY_Pause 0x48
|
||||
#define KEY_Insert 0x49
|
||||
#define KEY_Home 0x4A
|
||||
#define KEY_PageUp 0x4B
|
||||
#define KEY_DeleteForward 0x4C
|
||||
#define KEY_End 0x4D
|
||||
#define KEY_PageDown 0x4E
|
||||
#define KEY_RightArrow 0x4F
|
||||
#define KEY_LeftArrow 0x50
|
||||
#define KEY_DownArrow 0x51
|
||||
#define KEY_UpArrow 0x52
|
||||
#define KEYPAD_NumLock_Clear 0x53
|
||||
#define KEYPAD_Slash 0x54
|
||||
#define KEYPAD_Asterisk 0x55
|
||||
#define KEYPAD_Minus 0x56
|
||||
#define KEYPAD_Plus 0x57
|
||||
#define KEYPAD_ENTER 0x58
|
||||
#define KEYPAD_1_End 0x59
|
||||
#define KEYPAD_2_DownArrow 0x5A
|
||||
#define KEYPAD_3_PageDown 0x5B
|
||||
#define KEYPAD_4_LeftArrow 0x5C
|
||||
#define KEYPAD_5 0x5D
|
||||
#define KEYPAD_6_RightArrow 0x5E
|
||||
#define KEYPAD_7_Home 0x5F
|
||||
#define KEYPAD_8_UpArrow 0x60
|
||||
#define KEYPAD_9_PageUp 0x61
|
||||
#define KEYPAD_0_Insert 0x62
|
||||
#define KEYPAD_Period_Delete 0x63
|
||||
#define KEY_NonUS_Backslash_Pipe 0x64
|
||||
#define KEY_Application 0x65
|
||||
#define KEY_Power 0x66
|
||||
#define KEYPAD_Equal 0x67
|
||||
#define KEY_F13 0x68
|
||||
#define KEY_F14 0x69
|
||||
#define KEY_F15 0x6A
|
||||
#define KEY_F16 0x6B
|
||||
#define KEY_F17 0x6C
|
||||
#define KEY_F18 0x6D
|
||||
#define KEY_F19 0x6E
|
||||
#define KEY_F20 0x6F
|
||||
#define KEY_F21 0x70
|
||||
#define KEY_F22 0x71
|
||||
#define KEY_F23 0x72
|
||||
#define KEY_F24 0x73
|
||||
#define KEY_Execute 0x74
|
||||
#define KEY_Help 0x75
|
||||
#define KEY_Menu 0x76
|
||||
#define KEY_Select 0x77
|
||||
#define KEY_Stop 0x78
|
||||
#define KEY_Again 0x79
|
||||
#define KEY_Undo 0x7A
|
||||
#define KEY_Cut 0x7B
|
||||
#define KEY_Copy 0x7C
|
||||
#define KEY_Paste 0x7D
|
||||
#define KEY_Find 0x7E
|
||||
#define KEY_Mute 0x7F
|
||||
#define KEY_VolumeUp 0x80
|
||||
#define KEY_VolumeDown 0x81
|
||||
#define KEY_LockingCapsLock 0x82
|
||||
#define KEY_LockingNumLock 0x83
|
||||
#define KEY_LockingScrollLock 0x84
|
||||
#define KEYPAD_Comma 0x85
|
||||
#define KEYPAD_EqualSign 0x86
|
||||
#define KEY_International1 0x87
|
||||
#define KEY_International2 0x88
|
||||
#define KEY_International3 0x89
|
||||
#define KEY_International4 0x8A
|
||||
#define KEY_International5 0x8B
|
||||
#define KEY_International6 0x8C
|
||||
#define KEY_International7 0x8D
|
||||
#define KEY_International8 0x8E
|
||||
#define KEY_International9 0x8F
|
||||
#define KEY_LANG1 0x90
|
||||
#define KEY_LANG2 0x91
|
||||
#define KEY_LANG3 0x92
|
||||
#define KEY_LANG4 0x93
|
||||
#define KEY_LANG5 0x94
|
||||
#define KEY_LANG6 0x95
|
||||
#define KEY_LANG7 0x96
|
||||
#define KEY_LANG8 0x97
|
||||
#define KEY_LANG9 0x98
|
||||
#define KEY_AlternateErase 0x99
|
||||
#define KEY_SysReq_Attention 0x9A
|
||||
#define KEY_Cancel 0x9B
|
||||
#define KEY_Clear 0x9C
|
||||
#define KEY_Prior 0x9D
|
||||
#define KEY_Return 0x9E
|
||||
#define KEY_Separator 0x9F
|
||||
#define KEY_Out 0xA0
|
||||
#define KEY_Oper 0xA1
|
||||
#define KEY_Clear_Again 0xA2
|
||||
#define KEY_CrSel_Props 0xA3
|
||||
#define KEY_ExSel 0xA4
|
||||
// (Reserved) 0xA5..0xAF
|
||||
#define KEYPAD_00 0xB0
|
||||
#define KEYPAD_000 0xB1
|
||||
#define KEY_ThousandsSeparator 0xB2
|
||||
#define KEY_DecimalSeparator 0xB3
|
||||
#define KEY_CurrencyUnit 0xB4
|
||||
#define KEY_CurrencySubunit 0xB5
|
||||
#define KEYPAD_LeftParenthesis 0xB6
|
||||
#define KEYPAD_RightParenthesis 0xB7
|
||||
#define KEYPAD_LeftBrace 0xB8
|
||||
#define KEYPAD_RightBrace 0xB9
|
||||
#define KEYPAD_Tab 0xBA
|
||||
#define KEYPAD_Backspace 0xBB
|
||||
#define KEYPAD_A 0xBC
|
||||
#define KEYPAD_B 0xBD
|
||||
#define KEYPAD_C 0xBE
|
||||
#define KEYPAD_D 0xBF
|
||||
#define KEYPAD_E 0xC0
|
||||
#define KEYPAD_F 0xC1
|
||||
#define KEYPAD_XOR 0xC2
|
||||
#define KEYPAD_Caret 0xC3
|
||||
#define KEYPAD_Percent 0xC4
|
||||
#define KEYPAD_LessThan 0xC5
|
||||
#define KEYPAD_GreaterThan 0xC6
|
||||
#define KEYPAD_Ampersand 0xC7
|
||||
#define KEYPAD_AmpersandAmpersand 0xC8
|
||||
#define KEYPAD_Pipe 0xC9
|
||||
#define KEYPAD_PipePipe 0xCA
|
||||
#define KEYPAD_Colon 0xCB
|
||||
#define KEYPAD_Pound 0xCC
|
||||
#define KEYPAD_Space 0xCD
|
||||
#define KEYPAD_At 0xCE
|
||||
#define KEYPAD_Exclamation 0xCF
|
||||
#define KEYPAD_MemoryStore 0xD0
|
||||
#define KEYPAD_MemoryRecall 0xD1
|
||||
#define KEYPAD_MemoryClear 0xD2
|
||||
#define KEYPAD_MemoryAdd 0xD3
|
||||
#define KEYPAD_MemorySubtract 0xD4
|
||||
#define KEYPAD_MemoryMultiply 0xD5
|
||||
#define KEYPAD_MemoryDivide 0xD6
|
||||
#define KEYPAD_PlusMinus 0xD7
|
||||
#define KEYPAD_Clear 0xD8
|
||||
#define KEYPAD_ClearEntry 0xD9
|
||||
#define KEYPAD_Binary 0xDA
|
||||
#define KEYPAD_Octal 0xDB
|
||||
#define KEYPAD_Decimal 0xDC
|
||||
#define KEYPAD_Hexadecimal 0xDD
|
||||
// (Reserved) 0xDE..0xDF
|
||||
#define KEY_LeftControl 0xE0
|
||||
#define KEY_LeftShift 0xE1
|
||||
#define KEY_LeftAlt 0xE2
|
||||
#define KEY_LeftGUI 0xE3
|
||||
#define KEY_RightControl 0xE4
|
||||
#define KEY_RightShift 0xE5
|
||||
#define KEY_RightAlt 0xE6
|
||||
#define KEY_RightGUI 0xE7
|
||||
|
||||
/**** DEFINES FOR FIRMWARE ****/
|
||||
/* Defines for key offsets */
|
||||
#define F8_KEY1 0x00005189
|
||||
#define F8_KEY2 0x00005181
|
||||
#define F8_KEY3 0x00005179
|
||||
#define F8_KEY4 0x00005149
|
||||
#define F8_KEY5 0x0000518A
|
||||
#define F8_KEY6 0x00005182
|
||||
#define F8_KEY7 0x0000517A
|
||||
#define F8_KEY8 0x0000514A
|
||||
/* Defines for key program code */
|
||||
#define F8_PROG1 0xD7
|
||||
#define F8_PROG2 0xD8
|
||||
#define F8_PROG3 0xD9
|
||||
#define F8_PROG4 0xDA
|
||||
#define F8_PROG5 0xDB
|
||||
#define F8_PROG6 0xDC
|
||||
#define F8_PROG7 0xDD
|
||||
#define F8_PROG8 0xDE
|
||||
|
||||
/* Define for prog 1-8 offset */
|
||||
#define PROG1_OFFSET 0x0000539C
|
||||
#define PROG2_OFFSET 0x000056BC
|
||||
#define PROG3_OFFSET 0x000059DC
|
||||
#define PROG4_OFFSET 0x00005CFC
|
||||
#define PROG5_OFFSET 0x0000601C
|
||||
#define PROG6_OFFSET 0x0000633C
|
||||
#define PROG7_OFFSET 0x0000665C
|
||||
#define PROG8_OFFSET 0x0000697C
|
||||
|
||||
#endif /* DEFINES_H_ */
|
@ -3,43 +3,14 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
/**** DEFINES ****/
|
||||
/* Max prog_actions per key_prog */
|
||||
/* Max f8_macro_actions per f8_macro */
|
||||
#define MAX_ACTION 100
|
||||
/* Defines for key offsets */
|
||||
#define F8_KEY1 0x00005189
|
||||
#define F8_KEY2 0x00005181
|
||||
#define F8_KEY3 0x00005179
|
||||
#define F8_KEY4 0x00005149
|
||||
#define F8_KEY5 0x0000518A
|
||||
#define F8_KEY6 0x00005182
|
||||
#define F8_KEY7 0x0000517A
|
||||
#define F8_KEY8 0x0000514A
|
||||
/* Defines for key program code */
|
||||
#define F8_PROG1 0xD7
|
||||
#define F8_PROG2 0xD8
|
||||
#define F8_PROG3 0xD9
|
||||
#define F8_PROG4 0xDA
|
||||
#define F8_PROG5 0xDB
|
||||
#define F8_PROG6 0xDC
|
||||
#define F8_PROG7 0xDD
|
||||
#define F8_PROG8 0xDE
|
||||
|
||||
/* Define for prog1-8 offset */
|
||||
#define PROG1_OFFSET 0x0000539C
|
||||
#define PROG2_OFFSET 0x000056BC
|
||||
#define PROG3_OFFSET 0x000059DC
|
||||
#define PROG4_OFFSET 0x00005CFC
|
||||
#define PROG5_OFFSET 0x0000601C
|
||||
#define PROG6_OFFSET 0x0000633C
|
||||
#define PROG7_OFFSET 0x0000665C
|
||||
#define PROG8_OFFSET 0x0000697C
|
||||
|
||||
/**** STRUCTS ****/
|
||||
typedef struct f_bffr_t *f_bffrP;
|
||||
struct f_bffr_t {
|
||||
char *buffer;
|
||||
int size;
|
||||
int size;
|
||||
};
|
||||
|
||||
/*
|
||||
@ -49,26 +20,26 @@ struct f_bffr_t {
|
||||
* 0.0 seconds to 3.0 seconds The remaining values are the keycodes to be
|
||||
* pressed
|
||||
*/
|
||||
typedef struct prog_action *prog_actionP;
|
||||
struct prog_action {
|
||||
uint8_t k_modifier;
|
||||
uint8_t k_delay;
|
||||
uint8_t k_action1;
|
||||
uint8_t k_action2;
|
||||
uint8_t k_action3;
|
||||
uint8_t k_action4;
|
||||
uint8_t k_action5;
|
||||
uint8_t k_action6;
|
||||
typedef struct f8_macro_action *f8_macro_actionP;
|
||||
struct f8_macro_action {
|
||||
uint8_t modifier;
|
||||
uint8_t delay;
|
||||
uint8_t action1;
|
||||
uint8_t action2;
|
||||
uint8_t action3;
|
||||
uint8_t action4;
|
||||
uint8_t action5;
|
||||
uint8_t action6;
|
||||
};
|
||||
|
||||
/*
|
||||
* A single macro program consisting of the offset and up to MAX_ACTION (100)
|
||||
* actions
|
||||
*/
|
||||
typedef struct key_prog *key_progP;
|
||||
struct key_prog {
|
||||
int prog_offset;
|
||||
prog_actionP prog_actions[MAX_ACTION];
|
||||
typedef struct f8_macro *f8_macroP;
|
||||
struct f8_macro {
|
||||
int offset;
|
||||
f8_macro_actionP actions[MAX_ACTION];
|
||||
};
|
||||
|
||||
/*
|
||||
@ -76,13 +47,13 @@ struct key_prog {
|
||||
* "firmware_buffer" Key has to be the offset of the key to be altered. Value
|
||||
* has to be a keycode
|
||||
*/
|
||||
void set_key_value(char *firmware_buffer, int key, int value);
|
||||
void set_key_value(char *firmware_buffer, int key, int value);
|
||||
|
||||
void set_program(f_bffrP p_fb, key_progP kp);
|
||||
void set_program(f_bffrP p_fb, f8_macroP kp);
|
||||
|
||||
/* reads in the firmware file into a buffer */
|
||||
f_bffrP get_firmware_buffer(char *filename);
|
||||
|
||||
void write_firmware_buffer(char *filename, f_bffrP p_fb);
|
||||
void write_firmware_buffer(char *filename, f_bffrP p_fb);
|
||||
|
||||
#endif /* FIRMWARE_HANDLING_H_ */
|
||||
|
@ -1,249 +0,0 @@
|
||||
/* keycodes taken from https://usb.org/sites/default/files/hut1_22.pdf
|
||||
* See also: https://github.com/benblazak/ergodox-firmware/blob/master/src/lib/usb/usage-page/keyboard.h
|
||||
*/
|
||||
|
||||
#ifndef KEYCODES_H_
|
||||
#define KEYCODES_H_
|
||||
|
||||
/* THESE ARE THE AVALIABLE KEYS FOR THE "MOD_KEYS" PARAMETER */
|
||||
#define MODKEY_LCTR 0x01
|
||||
#define MODKEY_LSHI 0x02
|
||||
#define MODKEY_LALT 0x03
|
||||
#define MODKEY_LWIN 0x04
|
||||
#define MODKEY_RCTR 0x05
|
||||
#define MODKEY_RSHI 0x06
|
||||
#define MODKEY_RALT 0x07
|
||||
#define MODKEY_RWIN 0x08
|
||||
#define MODKEY_RWIN_RSHI 0x09
|
||||
#define MODKEY_RWIN_RCTR 0x0A
|
||||
#define MODKEY_RWIN_RALT 0x0B
|
||||
#define MODKEY_RWIN_RCTR_RSHI 0x0C
|
||||
#define MODKEY_RCTR_RALT 0x0D
|
||||
#define MODKEY_RCTR_RSHI 0x0E
|
||||
#define MODKEY_RALT_RSHI 0x0F
|
||||
#define MODKEY_RALT_RCTR_RSHI 0x10
|
||||
|
||||
|
||||
/* THESE ARE THE AVAIRABLE KEYS FOR THE "KEYS" PARAMETER */
|
||||
#define KEY_ErrorRollOver 0x01
|
||||
#define KEY_POSTFail 0x02
|
||||
#define KEY_ErrorUndefined 0x03
|
||||
#define KEY_a_A 0x04
|
||||
#define KEY_b_B 0x05
|
||||
#define KEY_c_C 0x06
|
||||
#define KEY_d_D 0x07
|
||||
#define KEY_e_E 0x08
|
||||
#define KEY_f_F 0x09
|
||||
#define KEY_g_G 0x0A
|
||||
#define KEY_h_H 0x0B
|
||||
#define KEY_i_I 0x0C
|
||||
#define KEY_j_J 0x0D
|
||||
#define KEY_k_K 0x0E
|
||||
#define KEY_l_L 0x0F
|
||||
#define KEY_m_M 0x10
|
||||
#define KEY_n_N 0x11
|
||||
#define KEY_o_O 0x12
|
||||
#define KEY_p_P 0x13
|
||||
#define KEY_q_Q 0x14
|
||||
#define KEY_r_R 0x15
|
||||
#define KEY_s_S 0x16
|
||||
#define KEY_t_T 0x17
|
||||
#define KEY_u_U 0x18
|
||||
#define KEY_v_V 0x19
|
||||
#define KEY_w_W 0x1A
|
||||
#define KEY_x_X 0x1B
|
||||
#define KEY_y_Y 0x1C
|
||||
#define KEY_z_Z 0x1D
|
||||
#define KEY_1_Exclamation 0x1E
|
||||
#define KEY_2_At 0x1F
|
||||
#define KEY_3_Pound 0x20
|
||||
#define KEY_4_Dollar 0x21
|
||||
#define KEY_5_Percent 0x22
|
||||
#define KEY_6_Caret 0x23
|
||||
#define KEY_7_Ampersand 0x24
|
||||
#define KEY_8_Asterisk 0x25
|
||||
#define KEY_9_LeftParenthesis 0x26
|
||||
#define KEY_0_RightParenthesis 0x27
|
||||
#define KEY_ReturnEnter 0x28
|
||||
#define KEY_Escape 0x29
|
||||
#define KEY_DeleteBackspace 0x2A
|
||||
#define KEY_Tab 0x2B
|
||||
#define KEY_Spacebar 0x2C
|
||||
#define KEY_Dash_Underscore 0x2D
|
||||
#define KEY_Equal_Plus 0x2E
|
||||
#define KEY_LeftBracket_LeftBrace 0x2F
|
||||
#define KEY_RightBracket_RightBrace 0x30
|
||||
#define KEY_Backslash_Pipe 0x31
|
||||
#define KEY_NonUS_Pound_Tilde 0x32
|
||||
#define KEY_Semicolon_Colon 0x33
|
||||
#define KEY_SingleQuote_DoubleQuote 0x34
|
||||
#define KEY_GraveAccent_Tilde 0x35
|
||||
#define KEY_Comma_LessThan 0x36
|
||||
#define KEY_Period_GreaterThan 0x37
|
||||
#define KEY_Slash_Question 0x38
|
||||
#define KEY_CapsLock 0x39
|
||||
#define KEY_F1 0x3A
|
||||
#define KEY_F2 0x3B
|
||||
#define KEY_F3 0x3C
|
||||
#define KEY_F4 0x3D
|
||||
#define KEY_F5 0x3E
|
||||
#define KEY_F6 0x3F
|
||||
#define KEY_F7 0x40
|
||||
#define KEY_F8 0x41
|
||||
#define KEY_F9 0x42
|
||||
#define KEY_F10 0x43
|
||||
#define KEY_F11 0x44
|
||||
#define KEY_F12 0x45
|
||||
#define KEY_PrintScreen 0x46
|
||||
#define KEY_ScrollLock 0x47
|
||||
#define KEY_Pause 0x48
|
||||
#define KEY_Insert 0x49
|
||||
#define KEY_Home 0x4A
|
||||
#define KEY_PageUp 0x4B
|
||||
#define KEY_DeleteForward 0x4C
|
||||
#define KEY_End 0x4D
|
||||
#define KEY_PageDown 0x4E
|
||||
#define KEY_RightArrow 0x4F
|
||||
#define KEY_LeftArrow 0x50
|
||||
#define KEY_DownArrow 0x51
|
||||
#define KEY_UpArrow 0x52
|
||||
#define KEYPAD_NumLock_Clear 0x53
|
||||
#define KEYPAD_Slash 0x54
|
||||
#define KEYPAD_Asterisk 0x55
|
||||
#define KEYPAD_Minus 0x56
|
||||
#define KEYPAD_Plus 0x57
|
||||
#define KEYPAD_ENTER 0x58
|
||||
#define KEYPAD_1_End 0x59
|
||||
#define KEYPAD_2_DownArrow 0x5A
|
||||
#define KEYPAD_3_PageDown 0x5B
|
||||
#define KEYPAD_4_LeftArrow 0x5C
|
||||
#define KEYPAD_5 0x5D
|
||||
#define KEYPAD_6_RightArrow 0x5E
|
||||
#define KEYPAD_7_Home 0x5F
|
||||
#define KEYPAD_8_UpArrow 0x60
|
||||
#define KEYPAD_9_PageUp 0x61
|
||||
#define KEYPAD_0_Insert 0x62
|
||||
#define KEYPAD_Period_Delete 0x63
|
||||
#define KEY_NonUS_Backslash_Pipe 0x64
|
||||
#define KEY_Application 0x65
|
||||
#define KEY_Power 0x66
|
||||
#define KEYPAD_Equal 0x67
|
||||
#define KEY_F13 0x68
|
||||
#define KEY_F14 0x69
|
||||
#define KEY_F15 0x6A
|
||||
#define KEY_F16 0x6B
|
||||
#define KEY_F17 0x6C
|
||||
#define KEY_F18 0x6D
|
||||
#define KEY_F19 0x6E
|
||||
#define KEY_F20 0x6F
|
||||
#define KEY_F21 0x70
|
||||
#define KEY_F22 0x71
|
||||
#define KEY_F23 0x72
|
||||
#define KEY_F24 0x73
|
||||
#define KEY_Execute 0x74
|
||||
#define KEY_Help 0x75
|
||||
#define KEY_Menu 0x76
|
||||
#define KEY_Select 0x77
|
||||
#define KEY_Stop 0x78
|
||||
#define KEY_Again 0x79
|
||||
#define KEY_Undo 0x7A
|
||||
#define KEY_Cut 0x7B
|
||||
#define KEY_Copy 0x7C
|
||||
#define KEY_Paste 0x7D
|
||||
#define KEY_Find 0x7E
|
||||
#define KEY_Mute 0x7F
|
||||
#define KEY_VolumeUp 0x80
|
||||
#define KEY_VolumeDown 0x81
|
||||
#define KEY_LockingCapsLock 0x82
|
||||
#define KEY_LockingNumLock 0x83
|
||||
#define KEY_LockingScrollLock 0x84
|
||||
#define KEYPAD_Comma 0x85
|
||||
#define KEYPAD_EqualSign 0x86
|
||||
#define KEY_International1 0x87
|
||||
#define KEY_International2 0x88
|
||||
#define KEY_International3 0x89
|
||||
#define KEY_International4 0x8A
|
||||
#define KEY_International5 0x8B
|
||||
#define KEY_International6 0x8C
|
||||
#define KEY_International7 0x8D
|
||||
#define KEY_International8 0x8E
|
||||
#define KEY_International9 0x8F
|
||||
#define KEY_LANG1 0x90
|
||||
#define KEY_LANG2 0x91
|
||||
#define KEY_LANG3 0x92
|
||||
#define KEY_LANG4 0x93
|
||||
#define KEY_LANG5 0x94
|
||||
#define KEY_LANG6 0x95
|
||||
#define KEY_LANG7 0x96
|
||||
#define KEY_LANG8 0x97
|
||||
#define KEY_LANG9 0x98
|
||||
#define KEY_AlternateErase 0x99
|
||||
#define KEY_SysReq_Attention 0x9A
|
||||
#define KEY_Cancel 0x9B
|
||||
#define KEY_Clear 0x9C
|
||||
#define KEY_Prior 0x9D
|
||||
#define KEY_Return 0x9E
|
||||
#define KEY_Separator 0x9F
|
||||
#define KEY_Out 0xA0
|
||||
#define KEY_Oper 0xA1
|
||||
#define KEY_Clear_Again 0xA2
|
||||
#define KEY_CrSel_Props 0xA3
|
||||
#define KEY_ExSel 0xA4
|
||||
// (Reserved) 0xA5..0xAF
|
||||
#define KEYPAD_00 0xB0
|
||||
#define KEYPAD_000 0xB1
|
||||
#define KEY_ThousandsSeparator 0xB2
|
||||
#define KEY_DecimalSeparator 0xB3
|
||||
#define KEY_CurrencyUnit 0xB4
|
||||
#define KEY_CurrencySubunit 0xB5
|
||||
#define KEYPAD_LeftParenthesis 0xB6
|
||||
#define KEYPAD_RightParenthesis 0xB7
|
||||
#define KEYPAD_LeftBrace 0xB8
|
||||
#define KEYPAD_RightBrace 0xB9
|
||||
#define KEYPAD_Tab 0xBA
|
||||
#define KEYPAD_Backspace 0xBB
|
||||
#define KEYPAD_A 0xBC
|
||||
#define KEYPAD_B 0xBD
|
||||
#define KEYPAD_C 0xBE
|
||||
#define KEYPAD_D 0xBF
|
||||
#define KEYPAD_E 0xC0
|
||||
#define KEYPAD_F 0xC1
|
||||
#define KEYPAD_XOR 0xC2
|
||||
#define KEYPAD_Caret 0xC3
|
||||
#define KEYPAD_Percent 0xC4
|
||||
#define KEYPAD_LessThan 0xC5
|
||||
#define KEYPAD_GreaterThan 0xC6
|
||||
#define KEYPAD_Ampersand 0xC7
|
||||
#define KEYPAD_AmpersandAmpersand 0xC8
|
||||
#define KEYPAD_Pipe 0xC9
|
||||
#define KEYPAD_PipePipe 0xCA
|
||||
#define KEYPAD_Colon 0xCB
|
||||
#define KEYPAD_Pound 0xCC
|
||||
#define KEYPAD_Space 0xCD
|
||||
#define KEYPAD_At 0xCE
|
||||
#define KEYPAD_Exclamation 0xCF
|
||||
#define KEYPAD_MemoryStore 0xD0
|
||||
#define KEYPAD_MemoryRecall 0xD1
|
||||
#define KEYPAD_MemoryClear 0xD2
|
||||
#define KEYPAD_MemoryAdd 0xD3
|
||||
#define KEYPAD_MemorySubtract 0xD4
|
||||
#define KEYPAD_MemoryMultiply 0xD5
|
||||
#define KEYPAD_MemoryDivide 0xD6
|
||||
#define KEYPAD_PlusMinus 0xD7
|
||||
#define KEYPAD_Clear 0xD8
|
||||
#define KEYPAD_ClearEntry 0xD9
|
||||
#define KEYPAD_Binary 0xDA
|
||||
#define KEYPAD_Octal 0xDB
|
||||
#define KEYPAD_Decimal 0xDC
|
||||
#define KEYPAD_Hexadecimal 0xDD
|
||||
// (Reserved) 0xDE..0xDF
|
||||
#define KEY_LeftControl 0xE0
|
||||
#define KEY_LeftShift 0xE1
|
||||
#define KEY_LeftAlt 0xE2
|
||||
#define KEY_LeftGUI 0xE3
|
||||
#define KEY_RightControl 0xE4
|
||||
#define KEY_RightShift 0xE5
|
||||
#define KEY_RightAlt 0xE6
|
||||
#define KEY_RightGUI 0xE7
|
||||
|
||||
#endif /* KEYCODES_H_ */
|
@ -1,4 +1,5 @@
|
||||
#include "../include/keycodes.h"
|
||||
#include "../include/defines.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -7,14 +8,14 @@
|
||||
|
||||
typedef struct keyCode keyCode;
|
||||
struct keyCode {
|
||||
uint8_t key_code;
|
||||
uint8_t key_code;
|
||||
const char *key_name;
|
||||
};
|
||||
|
||||
#define KEYCODE(KC) \
|
||||
#define KEYCODE(KC) \
|
||||
{ KC, #KC }
|
||||
|
||||
uint8_t get_keycode_by_name(char *key_name);
|
||||
uint8_t get_modkeycode_by_name(char *modkey_name);
|
||||
|
||||
#endif /* KEYCODE_CONV_H_ */
|
||||
#endif /* KEYCODE_CONV_H_ */
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "../include/config_handling.h"
|
||||
|
||||
#include "../include/defines.h"
|
||||
#include "../include/keycodes_conv.h"
|
||||
|
||||
#include <cjson/cJSON.h>
|
||||
@ -15,16 +16,35 @@
|
||||
#define JO_DELAY "delay"
|
||||
#define JO_KEYS "keys"
|
||||
|
||||
enum MacroNumber {
|
||||
MACRO1 = 1,
|
||||
MACRO2,
|
||||
MACRO3,
|
||||
MACRO4,
|
||||
MACRO5,
|
||||
MACRO6,
|
||||
MACRO7,
|
||||
MACRO8
|
||||
};
|
||||
|
||||
/* method declarations */
|
||||
char *read_in_config(char *conf_name);
|
||||
char *read_in_config(const char *conf_name);
|
||||
|
||||
prog_actionP *
|
||||
get_config(char *conf_name) {
|
||||
f8_macroP *
|
||||
get_f8_macros(char *conf_name) {
|
||||
|
||||
const cJSON *macros = NULL;
|
||||
/* reserve space for up to 8 macros */
|
||||
f8_macroP *return_macros = malloc(sizeof(return_macros) * 8);
|
||||
|
||||
for (int i = 0; i < sizeof(return_macros); i++) {
|
||||
f8_macroP pm = calloc(1, sizeof(*pm));
|
||||
return_macros[i] = pm;
|
||||
}
|
||||
|
||||
cJSON *macros = NULL;
|
||||
const cJSON *macro = NULL;
|
||||
|
||||
/* parse the read in config file */
|
||||
/* pmarse the read in config file */
|
||||
cJSON *config_json = cJSON_Parse(read_in_config(conf_name));
|
||||
if (config_json == NULL) {
|
||||
const char *error_ptr = cJSON_GetErrorPtr();
|
||||
@ -34,48 +54,105 @@ get_config(char *conf_name) {
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
// READ IN VALUES //
|
||||
/* READ IN VALUES */
|
||||
macros = cJSON_GetObjectItemCaseSensitive(config_json, JO_MACROS);
|
||||
cJSON_ArrayForEach(macro, macros) {
|
||||
// cJSON *macro_no = cJSON_GetObjectItemCaseSensitive(macro,
|
||||
// JO_MACRO_NO);
|
||||
cJSON *action = NULL;
|
||||
|
||||
int i = 0;
|
||||
/* create new macro-pointer */
|
||||
f8_macroP pm = calloc(1, sizeof(*pm));
|
||||
|
||||
/* Get the macro number from the JSON and set the offest */
|
||||
cJSON *macro_no = cJSON_GetObjectItemCaseSensitive(macro, JO_MACRO_NO);
|
||||
switch ((int)cJSON_GetNumberValue(macro_no)) {
|
||||
case MACRO1:
|
||||
return_macros[MACRO1 - 1] = pm;
|
||||
pm->offset = PROG1_OFFSET;
|
||||
break;
|
||||
case MACRO2:
|
||||
return_macros[MACRO2 - 1] = pm;
|
||||
pm->offset = PROG2_OFFSET;
|
||||
break;
|
||||
case MACRO3:
|
||||
return_macros[MACRO3 - 1] = pm;
|
||||
pm->offset = PROG3_OFFSET;
|
||||
break;
|
||||
case MACRO4:
|
||||
return_macros[MACRO4 - 1] = pm;
|
||||
pm->offset = PROG4_OFFSET;
|
||||
break;
|
||||
case MACRO5:
|
||||
return_macros[MACRO5 - 1] = pm;
|
||||
pm->offset = PROG5_OFFSET;
|
||||
break;
|
||||
case MACRO6:
|
||||
return_macros[MACRO6 - 1] = pm;
|
||||
pm->offset = PROG6_OFFSET;
|
||||
break;
|
||||
case MACRO7:
|
||||
return_macros[MACRO7 - 1] = pm;
|
||||
pm->offset = PROG7_OFFSET;
|
||||
break;
|
||||
case MACRO8:
|
||||
return_macros[MACRO8 - 1] = pm;
|
||||
pm->offset = PROG8_OFFSET;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Move through all the actions in the current macro and set the values
|
||||
*/
|
||||
cJSON *action = NULL;
|
||||
cJSON *actions = cJSON_GetObjectItemCaseSensitive(macro, JO_ACTIONS);
|
||||
|
||||
int i = 0;
|
||||
cJSON_ArrayForEach(action, actions) {
|
||||
cJSON *mod_keys =
|
||||
|
||||
f8_macro_actionP pma = calloc(1, sizeof(*pma));
|
||||
|
||||
cJSON *mod_keys =
|
||||
cJSON_GetObjectItemCaseSensitive(action, JO_MOD_KEYS);
|
||||
// cJSON *delay = cJSON_GetObjectItemCaseSensitive(action,
|
||||
// JO_DELAY);
|
||||
cJSON *keys = cJSON_GetObjectItemCaseSensitive(action, JO_KEYS);
|
||||
|
||||
prog_actionP pa = calloc(1, sizeof(*pa));
|
||||
pa->k_modifier =
|
||||
printf(" >> %s\r\n",
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 0)));
|
||||
printf(" >> %s\r\n",
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 1)));
|
||||
printf(" >> %s\r\n",
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 2)));
|
||||
printf(" >> %s\r\n",
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 3)));
|
||||
printf(" >> %s\r\n",
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 4)));
|
||||
printf(" >> %s\r\n",
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 5)));
|
||||
|
||||
pma->modifier =
|
||||
get_modkeycode_by_name(cJSON_GetStringValue(mod_keys));
|
||||
pa->k_delay = 0x00;
|
||||
pa->k_action1 = get_keycode_by_name(
|
||||
pma->delay = 0x00; // TODO: Set acutal value from JSON
|
||||
pma->action1 = get_keycode_by_name(
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 0)));
|
||||
pa->k_action2 = get_keycode_by_name(
|
||||
pma->action2 = get_keycode_by_name(
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 1)));
|
||||
pa->k_action3 = get_keycode_by_name(
|
||||
pma->action3 = get_keycode_by_name(
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 2)));
|
||||
pa->k_action4 = get_keycode_by_name(
|
||||
pma->action4 = get_keycode_by_name(
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 3)));
|
||||
pa->k_action5 = get_keycode_by_name(
|
||||
pma->action5 = get_keycode_by_name(
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 4)));
|
||||
pa->k_action6 = get_keycode_by_name(
|
||||
pma->action6 = get_keycode_by_name(
|
||||
cJSON_GetStringValue(cJSON_GetArrayItem(keys, 5)));
|
||||
|
||||
i++;
|
||||
/* append the new action to the macro */
|
||||
pm->actions[i++] = pma;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return return_macros;
|
||||
}
|
||||
|
||||
char *
|
||||
read_in_config(char *conf_name) {
|
||||
read_in_config(const char *conf_name) {
|
||||
|
||||
FILE *fp = fopen(conf_name, "r");
|
||||
if (!fp) {
|
||||
|
@ -58,37 +58,37 @@ set_key_value(char *firmware_buffer, int key, int value) {
|
||||
}
|
||||
|
||||
void
|
||||
set_program(f_bffrP p_fb, key_progP kp) {
|
||||
set_program(f_bffrP p_fb, f8_macroP mp) {
|
||||
for (int i = 0; i < MAX_ACTION; i++) {
|
||||
|
||||
// Check if an action for that position exists
|
||||
if (kp->prog_actions[i]) {
|
||||
/* calculate the offset for the action
|
||||
* -> general prog_offset + current prog_action i times bytes per
|
||||
* action
|
||||
*/
|
||||
int actionpointer =
|
||||
kp->prog_offset + (i * sizeof(*kp->prog_actions[0]));
|
||||
if (mp) {
|
||||
if (mp->actions[i]) {
|
||||
/* calculate the offset for the action
|
||||
* -> general prog_offset + current prog_action i times bytes
|
||||
* per action
|
||||
*/
|
||||
int actionpointer = mp->offset + (i * sizeof(*mp->actions[0]));
|
||||
|
||||
/* set the modifiers */
|
||||
memset(p_fb->buffer + actionpointer + 0,
|
||||
kp->prog_actions[i]->k_modifier, 1);
|
||||
/* set timing delay */
|
||||
memset(p_fb->buffer + actionpointer + 1,
|
||||
kp->prog_actions[i]->k_delay, 1);
|
||||
/* set action 1-6 */
|
||||
memset(p_fb->buffer + actionpointer + 2,
|
||||
kp->prog_actions[i]->k_action1, 1);
|
||||
memset(p_fb->buffer + actionpointer + 3,
|
||||
kp->prog_actions[i]->k_action2, 1);
|
||||
memset(p_fb->buffer + actionpointer + 4,
|
||||
kp->prog_actions[i]->k_action3, 1);
|
||||
memset(p_fb->buffer + actionpointer + 5,
|
||||
kp->prog_actions[i]->k_action4, 1);
|
||||
memset(p_fb->buffer + actionpointer + 6,
|
||||
kp->prog_actions[i]->k_action5, 1);
|
||||
memset(p_fb->buffer + actionpointer + 7,
|
||||
kp->prog_actions[i]->k_action6, 1);
|
||||
/* set the modifiers */
|
||||
memset(p_fb->buffer + actionpointer + 0,
|
||||
mp->actions[i]->modifier, 1);
|
||||
/* set timing delay */
|
||||
memset(p_fb->buffer + actionpointer + 1, mp->actions[i]->delay,
|
||||
1);
|
||||
/* set action 1-6 */
|
||||
memset(p_fb->buffer + actionpointer + 2,
|
||||
mp->actions[i]->action1, 1);
|
||||
memset(p_fb->buffer + actionpointer + 3,
|
||||
mp->actions[i]->action2, 1);
|
||||
memset(p_fb->buffer + actionpointer + 4,
|
||||
mp->actions[i]->action3, 1);
|
||||
memset(p_fb->buffer + actionpointer + 5,
|
||||
mp->actions[i]->action4, 1);
|
||||
memset(p_fb->buffer + actionpointer + 6,
|
||||
mp->actions[i]->action5, 1);
|
||||
memset(p_fb->buffer + actionpointer + 7,
|
||||
mp->actions[i]->action6, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,7 @@
|
||||
#include "../include/keycodes_conv.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
const keyCode keycodes[] = {
|
||||
|
||||
KEYCODE(KEY_ErrorRollOver),
|
||||
@ -240,6 +242,7 @@ get_keycode_by_name(char *key_name) {
|
||||
for (int i = 0; i < (sizeof(keycodes) / sizeof(keycodes[0])); i++) {
|
||||
if (strcmp(keycodes[i].key_name, key_name) == 0) {
|
||||
keycode = keycodes[i].key_code;
|
||||
printf(" >> Getting keycode for %s: 0x%02x\r\n", key_name, keycode);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
53
src/main.c
53
src/main.c
@ -1,3 +1,5 @@
|
||||
#include "../include/config_handling.h"
|
||||
#include "../include/defines.h"
|
||||
#include "../include/firmware_handling.h"
|
||||
|
||||
#include <ctype.h>
|
||||
@ -11,10 +13,19 @@ char *updated_file_name(char *orig);
|
||||
int
|
||||
main(int argc, char *argv[]) {
|
||||
/* Read in the firmware file into a f_bffr_t struct */
|
||||
f_bffrP p_fb = get_firmware_buffer(argv[1]);
|
||||
f_bffrP p_fb = get_firmware_buffer(argv[1]);
|
||||
|
||||
/* Call testing method */
|
||||
testing(p_fb);
|
||||
// testing(p_fb);
|
||||
|
||||
f8_macroP *my_macros = get_f8_macros("config.json");
|
||||
int len = sizeof(my_macros);
|
||||
|
||||
printf("Length of my_macros: %d\r\n", len);
|
||||
|
||||
for (int i = 0; i < len; i++) {
|
||||
set_program(p_fb, my_macros[i]);
|
||||
}
|
||||
|
||||
write_firmware_buffer(updated_file_name(argv[1]), p_fb);
|
||||
|
||||
@ -60,27 +71,27 @@ testing(f_bffrP p_fb) {
|
||||
}
|
||||
*/
|
||||
|
||||
prog_actionP pa = calloc(1, sizeof(*pa));
|
||||
pa->k_modifier = 0x00;
|
||||
pa->k_delay = 0x00;
|
||||
pa->k_action1 = 0x0B;
|
||||
pa->k_action2 = 0x04;
|
||||
pa->k_action3 = 0x0F;
|
||||
pa->k_action4 = 0x0F;
|
||||
pa->k_action5 = 0x12;
|
||||
pa->k_action6 = 0x00;
|
||||
f8_macro_actionP pma = calloc(1, sizeof(*pma));
|
||||
pma->modifier = 0x00;
|
||||
pma->delay = 0x00;
|
||||
pma->action1 = 0x0B;
|
||||
pma->action2 = 0x04;
|
||||
pma->action3 = 0x0F;
|
||||
pma->action4 = 0x0F;
|
||||
pma->action5 = 0x12;
|
||||
pma->action6 = 0x00;
|
||||
|
||||
key_progP kp = calloc(1, sizeof(*kp));
|
||||
kp->prog_offset = PROG1_OFFSET;
|
||||
kp->prog_actions[0] = pa;
|
||||
kp->prog_actions[1] = pa;
|
||||
kp->prog_actions[2] = pa;
|
||||
kp->prog_actions[3] = pa;
|
||||
kp->prog_actions[99] = pa;
|
||||
f8_macroP pm = calloc(1, sizeof(*pm));
|
||||
pm->offset = PROG1_OFFSET;
|
||||
pm->actions[0] = pma;
|
||||
pm->actions[1] = pma;
|
||||
pm->actions[2] = pma;
|
||||
pm->actions[3] = pma;
|
||||
pm->actions[99] = pma;
|
||||
//*/
|
||||
|
||||
set_program(p_fb, kp);
|
||||
set_program(p_fb, pm);
|
||||
|
||||
free(kp);
|
||||
free(pa);
|
||||
free(pm);
|
||||
free(pma);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user