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

Jump to bottom

EC Pro 2 PCB #19917

Merged
merged 25 commits into from
Mar 8, 2023
Merged

EC Pro 2 PCB #19917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d751516
EC Pro 2 firmware
Cipulot Feb 22, 2023
a05d43b
Change from explicit value assignment to define based
Cipulot Feb 23, 2023
16f18bf
Update ec_switch_matrix.c
Cipulot Feb 23, 2023
4ecd8a6
Update keyboards/cipulot/ec_pro2/config.h
Cipulot Feb 23, 2023
5a44650
Update keyboards/cipulot/ec_pro2/matrix.c
Cipulot Feb 23, 2023
1556301
Addition of Bootloader instructions
Cipulot Feb 23, 2023
d3187f1
Removal of unnecessary includes
Cipulot Feb 23, 2023
86beb95
Move of APC functionality to its own file.
Cipulot Feb 23, 2023
afc1426
Revert "Move of APC functionality to its own file."
Cipulot Feb 23, 2023
d9efda9
Move of APC functions into VIA keymap folder
Cipulot Feb 23, 2023
561ceb4
Consilidation of `ATOMIC_BLOCK_FORCEON` usage
Cipulot Feb 23, 2023
3f89a89
Update keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c
Cipulot Feb 23, 2023
2e9a722
Include only mnecessary `.h` in apc file
Cipulot Feb 23, 2023
db7e2ed
Update ec_switch_matrix.c
Cipulot Feb 23, 2023
6cee6eb
Update keyboards/cipulot/ec_pro2/readme.md
Cipulot Feb 25, 2023
e655a99
Apply suggestions from code review
Cipulot Feb 25, 2023
0da9969
Addition of LAYOUT_ to comply with standard
Cipulot Feb 25, 2023
f4a3cce
Merge branch 'qmk:master' into add_ec_pro2
Cipulot Feb 28, 2023
24bdac7
Removal of `keycodes.h` no longer needed
Cipulot Feb 28, 2023
213f5dd
Removed `#include "eeconfig.h"`
Cipulot Feb 28, 2023
54c4168
Removal of `"w": 1`
Cipulot Mar 1, 2023
0c2e665
Added `DISCHARGE_TIME`
Cipulot Mar 7, 2023
1f3b688
removal of commented code not used
Cipulot Mar 7, 2023
54e4d21
Removal of `info.json` lines as suggested
Cipulot Mar 8, 2023
dfd997d
Update to comply with `_kb` and `_user` separation
Cipulot Mar 8, 2023
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
Prev Previous commit
Next Next commit
Move of APC functionality to its own file.
  • Loading branch information
@Cipulot
Cipulot committed Feb 23, 2023
commit 86beb95dbdea47e243b8cd699c661177fba2d7e1
6 changes: 2 additions & 4 deletions keyboards/cipulot/ec_pro2/ec_pro2.c → keyboards/cipulot/ec_pro2/apc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef VIA_ENABLE
# include "ec_switch_matrix.h"
# include "quantum.h"
#include "ec_switch_matrix.h"
#include "quantum.h"

void apc_init_thresholds(void);
void apc_set_threshold(bool is_for_actuation);
Expand Down Expand Up @@ -154,4 +153,3 @@ void apc_set_threshold(bool is_for_actuation) {
// Update the ecsm_config
ecsm_update(&ecsm_config);
}
#endif
2 changes: 1 addition & 1 deletion keyboards/cipulot/ec_pro2/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CUSTOM_MATRIX = lite
SRC += analog.c matrix.c ec_switch_matrix.c
SRC += analog.c apc.c matrix.c ec_switch_matrix.c