Add EditorConfig file (#1930 )

* 🔧 add editorconfig This makes supported editors automatically change their settings to match desired code styles * 🔧 add extension recommendation for VSCode This will cause VS Code to prompt the user to install the EditorConfig extension when they open the project. If this is felt to be too opinionated, I can revert it.
Fix Pointing Device code (#1934 )
2017-10-31 11:13:40 -04:00 · 2017-10-31 11:13:00 -04:00 · 2017-10-31 11:12:06 -04:00 · 2017-10-31 00:40:27 -04:00 · 2017-10-31 00:39:33 -04:00
8 changed files with 55 additions and 9 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 4
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+// Suggested extensions
+{
+  "recommendations": [
+    "EditorConfig.EditorConfig"
+  ]
+}
--- a/common_features.mk
+++ b/common_features.mk
@@ -70,7 +70,8 @@ ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes)
 endif

 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
-	SRC += $(QUANTUM_DIR)/pointing_device.c
+    OPT_DEFS += -DPOINTING_DEVICE_ENABLE
+    SRC += $(QUANTUM_DIR)/pointing_device.c
 endif

 ifeq ($(strip $(UCIS_ENABLE)), yes)
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -200,12 +200,12 @@ typedef struct {
 int cur_dance (qk_tap_dance_state_t *state) {
  if (state->count == 1) {
    //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
-    if (state->interrupted || state->!pressed) return SINGLE_TAP;
+    if (state->interrupted || state->pressed==0) return SINGLE_TAP;
    else return SINGLE_HOLD;
  }
  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
  //with single tap. In example below, that means to send `xx` instead of `Escape`.
-  else if (state->count = 2) {
+  else if (state->count == 2) {
    if (state->interrupted) return DOUBLE_SINGLE_TAP;
    else if (state->pressed) return DOUBLE_HOLD;
    else return DOUBLE_TAP;
--- a/keyboards/planck/keymaps/gunp/keymap.c
+++ b/keyboards/planck/keymaps/gunp/keymap.c
@@ -116,12 +116,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  {XXXXXXX, KC_MAIL, S(KC_VOLD),  KC_INS,   S(KC_VOLU),  KC_PSCR, MFN_R3},
  {XXXXXXX, MUV_DE,  MUV_IN,      AU_ON,    AU_OFF,      RESET,   MFN_R4},
 },
+[LY_0011] = {
+  {UC(L'็'),  UC(L'์'),  UC(L'่'),  UC(L'้'),  UC(L'๊'),  UC(L'๋'), MFN_R1},
+  {UC(L'โ'),  UC(L'แ'),  UC(L'เ'),  UC(L'า'),  UC(L'ั'),  UC(L'ะ'), MFN_R2},
+  {UC(L'ไ'),  UC(L'ใ'),  UC(L'ิ'),  UC(L'ี'),  UC(L'ึ'),  UC(L'ื'), MFN_R3},
+  {UC(L'ๅ'),  UC(L'ฺ'),  UC(L'ํ'),  UC(L'ุ'),  UC(L'ู'),  UC(L'ำ'), MFN_R4},
+},
+[LY_1011] = {
+  {UC(L'ฐ'),  UC(L'ฎ'),  UC(L'ฏ'),  UC(L'ฮ'),  UC(L'ข'),  UC(L'ฃ'), MFN_R1},
+  {UC(L'ถ'),  UC(L'ด'),  UC(L'ต'),  UC(L'อ'),  UC(L'ก'),  UC(L'จ'), MFN_R2},
+  {UC(L'ภ'),  UC(L'บ'),  UC(L'ป'),  UC(L'ส'),  UC(L'ห'),  UC(L'ฉ'), MFN_R3},
+  {UC(L'ฯ'),  UC(L'ผ'),  UC(L'ฝ'),  UC(L'ศ'),  UC(L'ษ'),  UC(L'ๆ'), MFN_R4},
+},
+[LY_0111] = {
+  {UC(L'ฒ'),  UC(L'ฤ'),  UC(L'ฦ'),  UC(L'ม'),  UC(L'ค'),  UC(L'ฅ'), MFN_R1},
+  {UC(L'ณ'),  UC(L'ร'),  UC(L'ล'),  UC(L'น'),  UC(L'ว'),  UC(L'ง'), MFN_R2},
+  {UC(L'ญ'),  UC(L'ช'),  UC(L'ซ'),  UC(L'ย'),  UC(L'ท'),  UC(L'ฑ'), MFN_R3},
+  {UC(L'ฌ'),  UC(L'ฬ'),  UC(L'ฟ'),  UC(L'พ'),  UC(L'ธ'),  UC(L'ฆ'), MFN_R4},
+},
 [LY_0001] = UNUSED_LAYER
-[LY_0011] = UNUSED_LAYER
 [LY_0101] = UNUSED_LAYER
-[LY_0111] = UNUSED_LAYER
 [LY_1001] = UNUSED_LAYER
-[LY_1011] = UNUSED_LAYER
 };

 #ifdef AUDIO_ENABLE
--- a/keyboards/planck/keymaps/gunp/readme.md
+++ b/keyboards/planck/keymaps/gunp/readme.md
@@ -15,4 +15,10 @@
   {0|  ∀ \ { ( [ <  |0}      {0|  ⊚ 0 1 2 3 ┃  |0}      {0|  → - , .\' =  |0}
   {0|  & | @ ~ $ ^  |0}      {0|  ┏ ┓ 4 5 6 ┳  |0}      {0|  ∘ + ; :\" _  |0}
   {0|  F1 ..... F6  |0}      {0|  ┗ ┛ ┫ ━ ┣ ╋  |0}      {0|  F7 .... F12  |0}
-                                                                           ```
+
+   {8| "with FN_ACD" |8}      {8| "with  FN_CD" |8}      {8| "with FN_BCD" |8}
+   {0|  ฐ ฎ ฏ ฮ ข ฃ  |0}      {0|  ็  ์ ่ ้ ๊ ๋  |0}      {0|  ฒ ฤ ฦ ม ค ฅ  |0}
+   {0|  ถ ด ต อ ก จ  |0}      {0|  โ แ เ า ั ะ  |0}      {0|  ณ ร ล  น ว ง  |0}
+   {0|  ภ บ ป ส ห ฉ  |0}      {0| ไ ใ ิ ี ึ ื  |0}      {0|  ญ ช ซ ย ท ฑ  |0}
+   {0|  ฯ ผ ฝ ศ ษ ๆ  |0}      {0|  ๅ ฺ ํ  ุ ู ำ  |0}      {0|  ฌ ฬ ฟ พ ธ ฆ  |0}
+```
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "report.h"

-void pointingdevice_init(void);
+void pointing_device_init(void);
 void pointing_device_task(void);
 void pointing_device_send(void);
 report_mouse_t pointing_device_get_report(void);
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -146,7 +146,7 @@ static const uint8_t keyboard_hid_report_desc_data[] = {
  0x95, KBD_REPORT_KEYS,          //   Report Count (),
  0x75, 0x08,                //   Report Size (8),
  0x15, 0x00,                //   Logical Minimum (0),
-  0x25, 0xFF,                //   Logical Maximum(255),
+  0x26, 0xFF, 0x00,          //   Logical Maximum(255),
  0x05, 0x07,                //   Usage Page (Key Codes),
  0x19, 0x00,                //   Usage Minimum (0),
  0x29, 0xFF,                //   Usage Maximum (255),
Author	SHA1	Message	Date
Louis Orleans	6169cd52ba	Add EditorConfig file (#1930 ) * 🔧 add editorconfig This makes supported editors automatically change their settings to match desired code styles * 🔧 add extension recommendation for VSCode This will cause VS Code to prompt the user to install the EditorConfig extension when they open the project. If this is felt to be too opinionated, I can revert it.	2017-10-31 11:13:40 -04:00
drashna	101b998ac2	Fix Pointing Device code (#1934 ) * Fix pointer device options when the feature was added, the appropriate option definition wasn't created. This needs to be added to function properly. * Update common_features.mk * missing underscore in init function declaration	2017-10-31 11:13:00 -04:00
Takayuki Matsubara	7b65b7e948	fix Logical Maximum to be recognized as 255 instead of -1 SEE ALSO: https://github.com/qmk/qmk_firmware/issues/312	2017-10-31 11:12:06 -04:00
Zach Burchill	4c1164c469	fixed two typos I'm almost 100% sure "else if (state->count = 2) {" was a typo (it should have two ='s for a logical operator), and I'm pretty sure "if (state->interrupted \|\| state->!pressed) return SINGLE_TAP;" has a typo. At least, it returns an error on my machine saying something about an unexpected '!'. I changed it to a slightly longer form (i.e., "state->pressed==0"), and that worked fine.	2017-10-31 00:40:27 -04:00
Gun Pinyo	e555e42aae	add Thai layers for the GunP planck (#1910 ) * Add a layout of planck named GunP, ready for pull request review. * add Thai layers for the GunP planck	2017-10-31 00:39:33 -04:00