diff options
author | QMK Bot <hello@qmk.fm> | 2021-04-10 13:23:47 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-04-10 13:23:47 +0000 |
commit | 2e2dd3113bb837de3f217dceaf4a0715cf7b3c82 (patch) | |
tree | 975516d6551ec2a6a93dc7fe15acb3303faf16d2 /keyboards | |
parent | 11e5bb2d8ae95be1cef74f034ff756c7da1048ab (diff) | |
parent | 03685309fd857c64ed16c231507017214e4805ca (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/iron180/iron180.h | 2 | ||||
-rw-r--r-- | keyboards/iron180/mcuconf.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/iron180/iron180.h b/keyboards/iron180/iron180.h index 48f5f94db1..032d8afb58 100644 --- a/keyboards/iron180/iron180.h +++ b/keyboards/iron180/iron180.h @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" #define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0G, K0F, K0E, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K3G, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ diff --git a/keyboards/iron180/mcuconf.h b/keyboards/iron180/mcuconf.h index 3792ceffe7..620b983c75 100644 --- a/keyboards/iron180/mcuconf.h +++ b/keyboards/iron180/mcuconf.h @@ -28,4 +28,3 @@ #undef STM32_PWM_USE_TIM3 #define STM32_PWM_USE_TIM3 YES - |