From 2bdf34de9d176c6e912ecb8e8926c6698863bbf9 Mon Sep 17 00:00:00 2001 From: moergo-sc Date: Fri, 10 Jun 2022 18:47:07 +1200 Subject: [PATCH] Renamed Glove80 v1->v0, v2->v1 --- README.md | 4 ++-- .../{glove80_v2_lh => glove80_v0_lh}/board.h | 22 +++++++++---------- .../{glove80_v2_lh => glove80_v0_lh}/board.mk | 0 .../pinconfig.c | 0 .../{glove80_v2_rh => glove80_v0_rh}/board.h | 22 +++++++++---------- .../{glove80_v2_rh => glove80_v0_rh}/board.mk | 0 .../pinconfig.c | 0 src/boards/glove80_v1_lh/board.h | 16 +++++++------- src/boards/glove80_v1_rh/board.h | 14 ++++++------ 9 files changed, 39 insertions(+), 39 deletions(-) rename src/boards/{glove80_v2_lh => glove80_v0_lh}/board.h (84%) rename src/boards/{glove80_v2_lh => glove80_v0_lh}/board.mk (100%) rename src/boards/{glove80_v2_lh => glove80_v0_lh}/pinconfig.c (100%) rename src/boards/{glove80_v2_rh => glove80_v0_rh}/board.h (85%) rename src/boards/{glove80_v2_rh => glove80_v0_rh}/board.mk (100%) rename src/boards/{glove80_v2_rh => glove80_v0_rh}/pinconfig.c (100%) diff --git a/README.md b/README.md index 3b7e5e2c..275ce4ea 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ This is a CDC/DFU/UF2 bootloader for nRF52 boards. It is further enhanced by [Mo - Particle Boron - Particle Xenon - [SparkFun MicroMod nRF52840](https://www.sparkfun.com/products/16984) +- [Glove80 v0 Left Hand](https://www.moergo.com) +- [Glove80 v0 Right Hand](https://www.moergo.com) - [Glove80 v1 Left Hand](https://www.moergo.com) - [Glove80 v1 Right Hand](https://www.moergo.com) -- [Glove80 v2 Left Hand](https://www.moergo.com) -- [Glove80 v2 Right Hand](https://www.moergo.com) UF2 is an easy-to-use bootloader that appears as a flash drive. You can just copy `.uf2`-format application images to the flash drive to load new firmware. See https://github.com/Microsoft/uf2 and https://github.com/adafruit/uf2-samdx1 for more information. diff --git a/src/boards/glove80_v2_lh/board.h b/src/boards/glove80_v0_lh/board.h similarity index 84% rename from src/boards/glove80_v2_lh/board.h rename to src/boards/glove80_v0_lh/board.h index 829508ed..d98b5c38 100644 --- a/src/boards/glove80_v2_lh/board.h +++ b/src/boards/glove80_v0_lh/board.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _GLOVE80_V2_LH_H -#define _GLOVE80_V2_LH_H +#ifndef _GLOVE80_V0_LH_H +#define _GLOVE80_V0_LH_H #define _PINNUM(port, pin) ((port)*32 + (pin)) @@ -41,14 +41,14 @@ /* LED *------------------------------------------------------------------*/ #define LEDS_NUMBER 1 -#define LED_PRIMARY_PIN _PINNUM(1, 15) +#define LED_PRIMARY_PIN _PINNUM(1, 10) #define LED_STATE_ON 1 /*------------------------------------------------------------------*/ /* BUTTON *------------------------------------------------------------------*/ #define BUTTONS_NUMBER 2 -#define BUTTON_1 _PINNUM(0, 9) // Not connected +#define BUTTON_1 _PINNUM(1, 11) // SW3 CFG_FIRMWARE_UNLOCKED #define BUTTON_2 _PINNUM(0, 10) // Not connected #define BUTTON_PULL NRF_GPIO_PIN_PULLUP @@ -69,11 +69,11 @@ // KEY MATRIX //--------------------------------------------------------------------+ #define ENABLE_KEY_MATRIX 1 -#define KM_SCAN_DIR 1 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins -#define KM_COL_COUNT 7 -#define KM_COL_PINS {_PINNUM(1, 1),_PINNUM(1, 3),_PINNUM(1, 5),_PINNUM(1, 7),_PINNUM(1, 6),_PINNUM(1, 4),_PINNUM(1, 8)} +#define KM_SCAN_DIR 0 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins +#define KM_COL_COUNT 7 +#define KM_COL_PINS { _PINNUM(0, 2), _PINNUM(1, 4), _PINNUM(1, 6), _PINNUM(1, 7), _PINNUM(1, 5), _PINNUM(1, 3), _PINNUM(1, 1) } #define KM_ROW_COUNT 6 -#define KM_ROW_PINS {_PINNUM(0, 26),_PINNUM(0, 5),_PINNUM(0, 6),_PINNUM(0, 8),_PINNUM(0, 7),_PINNUM(1, 9)} +#define KM_ROW_PINS { _PINNUM(0, 26), _PINNUM(0, 5), _PINNUM(0, 7), _PINNUM(1, 8), _PINNUM(0, 11), _PINNUM(0, 12) } #define _KEYID(col_id, row_id) (col_id*KM_ROW_COUNT + row_id) #define KM_COMBO_DFU {_KEYID(6, 6-1), _KEYID(3, 3-1)} // C6R6 + C3R3 #define KM_COMBO_WIPE_CONFIG {_KEYID(6, 6-1), _KEYID(3, 2-1)} // C6R6 + C3R2 @@ -82,9 +82,9 @@ //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "Glove80 v2 LH" +#define UF2_PRODUCT_NAME "Glove80 v0 LH" #define UF2_VOLUME_LABEL "GLV80LHBOOT" -#define UF2_BOARD_ID "Glove80-LH-revH" +#define UF2_BOARD_ID "nRF52840-Glove80-LH-revA" #define UF2_INDEX_URL "https://www.moergo.com" -#endif // _GLOVE80_V2_LH_H +#endif // _GLOVE80_V0_LH_H diff --git a/src/boards/glove80_v2_lh/board.mk b/src/boards/glove80_v0_lh/board.mk similarity index 100% rename from src/boards/glove80_v2_lh/board.mk rename to src/boards/glove80_v0_lh/board.mk diff --git a/src/boards/glove80_v2_lh/pinconfig.c b/src/boards/glove80_v0_lh/pinconfig.c similarity index 100% rename from src/boards/glove80_v2_lh/pinconfig.c rename to src/boards/glove80_v0_lh/pinconfig.c diff --git a/src/boards/glove80_v2_rh/board.h b/src/boards/glove80_v0_rh/board.h similarity index 85% rename from src/boards/glove80_v2_rh/board.h rename to src/boards/glove80_v0_rh/board.h index ddfa798a..2b2c4e20 100644 --- a/src/boards/glove80_v2_rh/board.h +++ b/src/boards/glove80_v0_rh/board.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _GLOVE80_V2_RH_H -#define _GLOVE80_V2_RH_H +#ifndef _GLOVE80_V0_RH_H +#define _GLOVE80_V0_RH_H #define _PINNUM(port, pin) ((port)*32 + (pin)) @@ -41,15 +41,15 @@ /* LED *------------------------------------------------------------------*/ #define LEDS_NUMBER 1 -#define LED_PRIMARY_PIN _PINNUM(0, 16) +#define LED_PRIMARY_PIN _PINNUM(0, 20) #define LED_STATE_ON 1 /*------------------------------------------------------------------*/ /* BUTTON *------------------------------------------------------------------*/ #define BUTTONS_NUMBER 2 -#define BUTTON_1 _PINNUM(0, 9) // Not connected -#define BUTTON_2 _PINNUM(0, 10) // Not connected +#define BUTTON_1 _PINNUM(0, 15) // SW3 CFG_FIRMWARE_UNLOCKED +#define BUTTON_2 _PINNUM(0, 16) // Not connected #define BUTTON_PULL NRF_GPIO_PIN_PULLUP //--------------------------------------------------------------------+ @@ -69,9 +69,9 @@ // KEY MATRIX //--------------------------------------------------------------------+ #define ENABLE_KEY_MATRIX 1 -#define KM_SCAN_DIR 1 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins +#define KM_SCAN_DIR 0 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins #define KM_COL_COUNT 7 -#define KM_COL_PINS {_PINNUM(1, 6),_PINNUM(1, 4),_PINNUM(0, 2),_PINNUM(1, 7),_PINNUM(1, 5),_PINNUM(1, 3),_PINNUM(1, 1)} +#define KM_COL_PINS {_PINNUM(0, 2),_PINNUM(1, 4),_PINNUM(1, 6),_PINNUM(1, 7),_PINNUM(1, 5),_PINNUM(1, 3),_PINNUM(1, 1)} #define KM_ROW_COUNT 6 #define KM_ROW_PINS {_PINNUM(0, 26),_PINNUM(0, 5),_PINNUM(0, 7),_PINNUM(1, 8),_PINNUM(0, 11),_PINNUM(0, 12)} #define _KEYID(col_id, row_id) (col_id*KM_ROW_COUNT + row_id) @@ -81,9 +81,9 @@ #define KM_COMBOS {KM_COMBO_DFU, KM_COMBO_WIPE_CONFIG} //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "Glove80 v2 RH" -#define UF2_VOLUME_LABEL "GLV80RHBOOT" -#define UF2_BOARD_ID "Glove80-RH-revH" +#define UF2_PRODUCT_NAME "Glove80 v0 RH" +#define UF2_VOLUME_LABEL "GLV80LHBOOT" +#define UF2_BOARD_ID "nRF52840-Glove80-RH-revA" #define UF2_INDEX_URL "https://www.moergo.com" -#endif // _GLOVE80_V2_RH_H +#endif // _GLOVE80_V0_RH_H diff --git a/src/boards/glove80_v2_rh/board.mk b/src/boards/glove80_v0_rh/board.mk similarity index 100% rename from src/boards/glove80_v2_rh/board.mk rename to src/boards/glove80_v0_rh/board.mk diff --git a/src/boards/glove80_v2_rh/pinconfig.c b/src/boards/glove80_v0_rh/pinconfig.c similarity index 100% rename from src/boards/glove80_v2_rh/pinconfig.c rename to src/boards/glove80_v0_rh/pinconfig.c diff --git a/src/boards/glove80_v1_lh/board.h b/src/boards/glove80_v1_lh/board.h index a2cedd8d..5daf7483 100644 --- a/src/boards/glove80_v1_lh/board.h +++ b/src/boards/glove80_v1_lh/board.h @@ -41,14 +41,14 @@ /* LED *------------------------------------------------------------------*/ #define LEDS_NUMBER 1 -#define LED_PRIMARY_PIN _PINNUM(1, 10) +#define LED_PRIMARY_PIN _PINNUM(1, 15) #define LED_STATE_ON 1 /*------------------------------------------------------------------*/ /* BUTTON *------------------------------------------------------------------*/ #define BUTTONS_NUMBER 2 -#define BUTTON_1 _PINNUM(1, 11) // SW3 CFG_FIRMWARE_UNLOCKED +#define BUTTON_1 _PINNUM(0, 9) // Not connected #define BUTTON_2 _PINNUM(0, 10) // Not connected #define BUTTON_PULL NRF_GPIO_PIN_PULLUP @@ -69,11 +69,11 @@ // KEY MATRIX //--------------------------------------------------------------------+ #define ENABLE_KEY_MATRIX 1 -#define KM_SCAN_DIR 0 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins -#define KM_COL_COUNT 7 -#define KM_COL_PINS { _PINNUM(0, 2), _PINNUM(1, 4), _PINNUM(1, 6), _PINNUM(1, 7), _PINNUM(1, 5), _PINNUM(1, 3), _PINNUM(1, 1) } +#define KM_SCAN_DIR 1 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins +#define KM_COL_COUNT 7 +#define KM_COL_PINS {_PINNUM(1, 1),_PINNUM(1, 3),_PINNUM(1, 5),_PINNUM(1, 7),_PINNUM(1, 6),_PINNUM(1, 4),_PINNUM(1, 8)} #define KM_ROW_COUNT 6 -#define KM_ROW_PINS { _PINNUM(0, 26), _PINNUM(0, 5), _PINNUM(0, 7), _PINNUM(1, 8), _PINNUM(0, 11), _PINNUM(0, 12) } +#define KM_ROW_PINS {_PINNUM(0, 26),_PINNUM(0, 5),_PINNUM(0, 6),_PINNUM(0, 8),_PINNUM(0, 7),_PINNUM(1, 9)} #define _KEYID(col_id, row_id) (col_id*KM_ROW_COUNT + row_id) #define KM_COMBO_DFU {_KEYID(6, 6-1), _KEYID(3, 3-1)} // C6R6 + C3R3 #define KM_COMBO_WIPE_CONFIG {_KEYID(6, 6-1), _KEYID(3, 2-1)} // C6R6 + C3R2 @@ -83,8 +83,8 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Glove80 v1 LH" -#define UF2_VOLUME_LABEL "FTHR840BOOT" -#define UF2_BOARD_ID "nRF52840-Glove80-LH-revA" +#define UF2_VOLUME_LABEL "GLV80LHBOOT" +#define UF2_BOARD_ID "Glove80-LH-revH" #define UF2_INDEX_URL "https://www.moergo.com" #endif // _GLOVE80_V1_LH_H diff --git a/src/boards/glove80_v1_rh/board.h b/src/boards/glove80_v1_rh/board.h index 68906744..d067cbc9 100644 --- a/src/boards/glove80_v1_rh/board.h +++ b/src/boards/glove80_v1_rh/board.h @@ -41,15 +41,15 @@ /* LED *------------------------------------------------------------------*/ #define LEDS_NUMBER 1 -#define LED_PRIMARY_PIN _PINNUM(0, 20) +#define LED_PRIMARY_PIN _PINNUM(0, 16) #define LED_STATE_ON 1 /*------------------------------------------------------------------*/ /* BUTTON *------------------------------------------------------------------*/ #define BUTTONS_NUMBER 2 -#define BUTTON_1 _PINNUM(0, 15) // SW3 CFG_FIRMWARE_UNLOCKED -#define BUTTON_2 _PINNUM(0, 16) // Not connected +#define BUTTON_1 _PINNUM(0, 9) // Not connected +#define BUTTON_2 _PINNUM(0, 10) // Not connected #define BUTTON_PULL NRF_GPIO_PIN_PULLUP //--------------------------------------------------------------------+ @@ -69,9 +69,9 @@ // KEY MATRIX //--------------------------------------------------------------------+ #define ENABLE_KEY_MATRIX 1 -#define KM_SCAN_DIR 0 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins +#define KM_SCAN_DIR 1 // 1 = Scan with col pins, and read with row pins. 0 = Scan with row pins, and read with col pins #define KM_COL_COUNT 7 -#define KM_COL_PINS {_PINNUM(0, 2),_PINNUM(1, 4),_PINNUM(1, 6),_PINNUM(1, 7),_PINNUM(1, 5),_PINNUM(1, 3),_PINNUM(1, 1)} +#define KM_COL_PINS {_PINNUM(1, 6),_PINNUM(1, 4),_PINNUM(0, 2),_PINNUM(1, 7),_PINNUM(1, 5),_PINNUM(1, 3),_PINNUM(1, 1)} #define KM_ROW_COUNT 6 #define KM_ROW_PINS {_PINNUM(0, 26),_PINNUM(0, 5),_PINNUM(0, 7),_PINNUM(1, 8),_PINNUM(0, 11),_PINNUM(0, 12)} #define _KEYID(col_id, row_id) (col_id*KM_ROW_COUNT + row_id) @@ -82,8 +82,8 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Glove80 v1 RH" -#define UF2_VOLUME_LABEL "FTHR840BOOT" -#define UF2_BOARD_ID "nRF52840-Glove80-RH-revA" +#define UF2_VOLUME_LABEL "GLV80RHBOOT" +#define UF2_BOARD_ID "Glove80-RH-revH" #define UF2_INDEX_URL "https://www.moergo.com" #endif // _GLOVE80_V1_RH_H