aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/hal/boards/ST_NUCLEO64_F446RE/board.h6
-rw-r--r--os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg2
2 files changed, 4 insertions, 4 deletions
diff --git a/os/hal/boards/ST_NUCLEO64_F446RE/board.h b/os/hal/boards/ST_NUCLEO64_F446RE/board.h
index dca5c8fae..8ef4addb4 100644
--- a/os/hal/boards/ST_NUCLEO64_F446RE/board.h
+++ b/os/hal/boards/ST_NUCLEO64_F446RE/board.h
@@ -58,7 +58,7 @@
#define GPIOA_ARD_A0 0U
#define GPIOA_ADC123_IN0 0U
#define GPIOA_ARD_A1 1U
-#define GPIOA_ADC123_IN0 1U
+#define GPIOA_ADC123_IN1 1U
#define GPIOA_ARD_D1 2U
#define GPIOA_USART2_TX 2U
#define GPIOA_ARD_D0 3U
@@ -224,7 +224,7 @@
#define LINE_ARD_A0 PAL_LINE(GPIOA, 0U)
#define LINE_ADC123_IN0 PAL_LINE(GPIOA, 0U)
#define LINE_ARD_A1 PAL_LINE(GPIOA, 1U)
-#define LINE_ADC123_IN0 PAL_LINE(GPIOA, 1U)
+#define LINE_ADC123_IN1 PAL_LINE(GPIOA, 1U)
#define LINE_ARD_D1 PAL_LINE(GPIOA, 2U)
#define LINE_USART2_TX PAL_LINE(GPIOA, 2U)
#define LINE_ARD_D0 PAL_LINE(GPIOA, 3U)
@@ -297,7 +297,7 @@
* GPIOA setup:
*
* PA0 - ARD_A0 ADC123_IN0 (input pullup).
- * PA1 - ARD_A1 ADC123_IN0 (input pullup).
+ * PA1 - ARD_A1 ADC123_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC12_IN4 (input pullup).
diff --git a/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg
index 5a91c9c15..f3a1012b4 100644
--- a/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg
+++ b/os/hal/boards/ST_NUCLEO64_F446RE/cfg/board.chcfg
@@ -29,7 +29,7 @@
Mode="Input"
Alternate="0" />
<pin1
- ID="ARD_A1 ADC123_IN0"
+ ID="ARD_A1 ADC123_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
n */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
{
  "keyboard_name": "model01",
  "keyboard_folder": "model01",
  "url": "https://keyboard.io",
  "maintainer": "qmk",
  "width": 18.5,
  "height": 7.5,
  "layouts": {
    "LAYOUT": {
      "layout": [
        {"label":"PROG", "x":0, "y":0.4, "h":1.3},
        {"label":"1", "x":1, "y":0.2, "h":1.5},
        {"label":"2", "x":2, "y":0.1, "h":1.1},
        {"label":"3", "x":3, "y":0},
        {"label":"4", "x":4, "y":0.1},
        {"label":"5", "x":5, "y":0.3},

        {"label":"6", "x":12.5, "y":0.3},
        {"label":"7", "x":13.5, "y":0.1},
        {"label":"8", "x":14.5, "y":0},
        {"label":"9", "x":15.5, "y":0.1, "h":1.1},
        {"label":"0", "x":16.5, "y":0.2, "h":1.5},
        {"label":"NUM", "x":17.5, "y":0.4, "h":1.3},

        {"label":"GRAVE", "x":0, "y":1.7},
        {"label":"Q", "x":1, "y":1.7},
        {"label":"W", "x":2, "y":1.2},
        {"label":"E", "x":3, "y":1},
        {"label":"R", "x":4, "y":1.1},
        {"label":"T", "x":5, "y":1.3},
        {"label":"LED", "x":6, "y":0.6, "h":1.5},

        {"label":"ANY", "x":11.5, "y":0.6, "h":1.5},
        {"label":"Y", "x":12.5, "y":1.3},
        {"label":"U", "x":13.5, "y":1.1},
        {"label":"I", "x":14.5, "y":1},
        {"label":"O", "x":15.5, "y":1.2},
        {"label":"P", "x":16.5, "y":1.7},
        {"label":"EQUAL", "x":17.5, "y":1.7},

        {"label":"PAGEUP", "x":0, "y":2.7},
        {"label":"A", "x":1, "y":2.7},
        {"label":"S", "x":2, "y":2.2},
        {"label":"D", "x":3, "y":2},
        {"label":"F", "x":4, "y":2.1},
        {"label":"G", "x":5, "y":2.3},
        {"label":"TAB", "x":6, "y":2.1, "h":1.3},

        {"label":"ENTER", "x":11.5, "y":2.1, "h":1.3},
        {"label":"H", "x":12.5, "y":2.3},
        {"label":"J", "x":13.5, "y":2.1},
        {"label":"K", "x":14.5, "y":2},
        {"label":"L", "x":15.5, "y":2.2},
        {"label":"SEMICOLON", "x":16.5, "y":2.7},
        {"label":"QUOTE", "x":17.5, "y":2.7},

        {"label":"PAGEDOWN", "x":0, "y":3.7, "h":1.2},
        {"label":"Z", "x":1, "y":3.7},
        {"label":"X", "x":2, "y":3.2, "h":1.15},
        {"label":"C", "x":3, "y":3},
        {"label":"V", "x":4, "y":3.1},
        {"label":"B", "x":5, "y":3.3},
        {"label":"ESC", "x":6, "y":3.4, "h":1.1},

        {"label":"BUTTERFLY", "x":11.5, "y":3.4, "h":1.1},
        {"label":"N", "x":12.5, "y":3.3},
        {"label":"M", "x":13.5, "y":3.1},
        {"label":"COMMA", "x":14.5, "y":3},
        {"label":"DOT", "x":15.5, "y":3.2, "h":1.15},
        {"label":"SLASH", "x":16.5, "y":3.7},
        {"label":"MINS", "x":17.5, "y":3.7, "h":1.2},

        {"label":"LCTL", "x":4.75, "y":4.3},
        {"label":"RCTL", "x":12.75, "y":4.3},
        {"label":"BACKSPACE", "x":5.75, "y":4.5},
        {"label":"SPACE", "x":11.75, "y":4.5},
        {"label":"LGUI", "x":6.75, "y":4.7},
        {"label":"RALT", "x":10.75, "y":4.7},
        {"label":"LSHIFT", "x":7.75, "y":5.1},
        {"label":"RSHIFT", "x":9.75, "y":5.1},

        {"label":"FN", "x":6.25, "y":6.1, "h":1.4},
        {"label":"FN", "x":11.25, "y":6.1, "h":1.4}
      ]
    }
  }
}