Skip to content

Commit

Permalink
Renamed Glove80 v1->v0, v2->v1
Browse files Browse the repository at this point in the history
  • Loading branch information
moergo-sc committed Jun 10, 2022
1 parent 1d0c0cb commit 2bdf34d
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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

//--------------------------------------------------------------------+
Expand All @@ -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)
Expand All @@ -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
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions src/boards/glove80_v1_lh/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
14 changes: 7 additions & 7 deletions src/boards/glove80_v1_rh/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

//--------------------------------------------------------------------+
Expand All @@ -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)
Expand All @@ -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

0 comments on commit 2bdf34d

Please sign in to comment.