Skip to content

Commit 9e27249

Browse files
ladyadaladyada
committed
update naming
1 parent 692b4a6 commit 9e27249

File tree

7 files changed

+67
-67
lines changed

7 files changed

+67
-67
lines changed

‎boards.txt

+63-63
Original file line numberDiff line numberDiff line change
@@ -1127,70 +1127,70 @@ adafruit_pybadge_airlift_m4.menu.debug.on=On
11271127
adafruit_pybadge_airlift_m4.menu.debug.on.build.flags.debug=-g
11281128

11291129

1130-
# Adafruit Hallowing Mask M4 Express (SAMD51)
1130+
# Adafruit MONSTER M4SK Express (SAMD51)
11311131
# ------------------------------
1132-
adafruit_hallowing_mask_m4.name=Adafruit Hallowing Mask M4 (SAMD51)
1133-
adafruit_hallowing_mask_m4.vid.0=0x239A
1134-
adafruit_hallowing_mask_m4.pid.0=0x0047
1135-
adafruit_hallowing_mask_m4.vid.1=0x239A
1136-
adafruit_hallowing_mask_m4.pid.1=0x8047
1137-
adafruit_hallowing_mask_m4.vid.1=0x239A
1138-
adafruit_hallowing_mask_m4.pid.1=0x8048
1139-
adafruit_hallowing_mask_m4.upload.tool=bossac18
1140-
adafruit_hallowing_mask_m4.upload.protocol=sam-ba
1141-
adafruit_hallowing_mask_m4.upload.maximum_size=507904
1142-
adafruit_hallowing_mask_m4.upload.offset=0x4000
1143-
adafruit_hallowing_mask_m4.upload.use_1200bps_touch=true
1144-
adafruit_hallowing_mask_m4.upload.wait_for_upload_port=true
1145-
adafruit_hallowing_mask_m4.upload.native_usb=true
1146-
adafruit_hallowing_mask_m4.build.mcu=cortex-m4
1147-
#adafruit_hallowing_mask_m4.build.f_cpu=120000000L
1148-
adafruit_hallowing_mask_m4.build.usb_product="Adafruit Hallowing Mask M4"
1149-
adafruit_hallowing_mask_m4.build.usb_manufacturer="Adafruit LLC"
1150-
adafruit_hallowing_mask_m4.build.board=HALLOWING_MASK_M4
1151-
adafruit_hallowing_mask_m4.build.core=arduino
1152-
adafruit_hallowing_mask_m4.build.extra_flags=-D__SAMD51G19A__ -DADAFRUIT_HALLOWING_MASK_M4_EXPRESS -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
1153-
adafruit_hallowing_mask_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
1154-
adafruit_hallowing_mask_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
1155-
adafruit_hallowing_mask_m4.build.variant=hallowing_mask_m4
1156-
adafruit_hallowing_mask_m4.build.variant_system_lib=
1157-
adafruit_hallowing_mask_m4.build.vid=0x239A
1158-
adafruit_hallowing_mask_m4.build.pid=0x8047
1159-
adafruit_hallowing_mask_m4.bootloader.tool=openocd
1160-
adafruit_hallowing_mask_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1161-
adafruit_hallowing_mask_m4.compiler.arm.cmsis.ldflags="-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1162-
adafruit_hallowing_mask_m4.menu.cache.on=Enabled
1163-
adafruit_hallowing_mask_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
1164-
adafruit_hallowing_mask_m4.menu.cache.off=Disabled
1165-
adafruit_hallowing_mask_m4.menu.cache.off.build.cache_flags=
1166-
adafruit_hallowing_mask_m4.menu.speed.120=120 MHz (standard)
1167-
adafruit_hallowing_mask_m4.menu.speed.120.build.f_cpu=120000000L
1168-
adafruit_hallowing_mask_m4.menu.speed.150=150 MHz (overclock)
1169-
adafruit_hallowing_mask_m4.menu.speed.150.build.f_cpu=150000000L
1170-
adafruit_hallowing_mask_m4.menu.speed.180=180 MHz (overclock)
1171-
adafruit_hallowing_mask_m4.menu.speed.180.build.f_cpu=180000000L
1172-
adafruit_hallowing_mask_m4.menu.speed.200=200 MHz (overclock)
1173-
adafruit_hallowing_mask_m4.menu.speed.200.build.f_cpu=200000000L
1174-
adafruit_hallowing_mask_m4.menu.opt.small=Small (-Os) (standard)
1175-
adafruit_hallowing_mask_m4.menu.opt.small.build.flags.optimize=-Os
1176-
adafruit_hallowing_mask_m4.menu.opt.fast=Fast (-O2)
1177-
adafruit_hallowing_mask_m4.menu.opt.fast.build.flags.optimize=-O2
1178-
adafruit_hallowing_mask_m4.menu.opt.faster=Faster (-O3)
1179-
adafruit_hallowing_mask_m4.menu.opt.faster.build.flags.optimize=-O3
1180-
adafruit_hallowing_mask_m4.menu.opt.fastest=Fastest (-Ofast)
1181-
adafruit_hallowing_mask_m4.menu.opt.fastest.build.flags.optimize=-Ofast
1182-
adafruit_hallowing_mask_m4.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
1183-
adafruit_hallowing_mask_m4.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
1184-
adafruit_hallowing_mask_m4.menu.maxqspi.50=50 MHz (standard)
1185-
adafruit_hallowing_mask_m4.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
1186-
adafruit_hallowing_mask_m4.menu.maxqspi.fcpu=CPU Speed / 2
1187-
adafruit_hallowing_mask_m4.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
1188-
adafruit_hallowing_mask_m4.menu.usbstack.arduino=Arduino
1189-
adafruit_hallowing_mask_m4.menu.usbstack.tinyusb=TinyUSB
1190-
adafruit_hallowing_mask_m4.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
1191-
adafruit_hallowing_mask_m4.menu.debug.off=Off
1192-
adafruit_hallowing_mask_m4.menu.debug.on=On
1193-
adafruit_hallowing_mask_m4.menu.debug.on.build.flags.debug=-g
1132+
adafruit_monster_m4sk.name=Adafruit MONSTER M4SK (SAMD51)
1133+
adafruit_monster_m4sk.vid.0=0x239A
1134+
adafruit_monster_m4sk.pid.0=0x8047
1135+
adafruit_monster_m4sk.vid.1=0x239A
1136+
adafruit_monster_m4sk.pid.1=0x0047
1137+
adafruit_monster_m4sk.vid.1=0x239A
1138+
adafruit_monster_m4sk.pid.1=0x8048
1139+
adafruit_monster_m4sk.upload.tool=bossac18
1140+
adafruit_monster_m4sk.upload.protocol=sam-ba
1141+
adafruit_monster_m4sk.upload.maximum_size=507904
1142+
adafruit_monster_m4sk.upload.offset=0x4000
1143+
adafruit_monster_m4sk.upload.use_1200bps_touch=true
1144+
adafruit_monster_m4sk.upload.wait_for_upload_port=true
1145+
adafruit_monster_m4sk.upload.native_usb=true
1146+
adafruit_monster_m4sk.build.mcu=cortex-m4
1147+
#adafruit_monster_m4sk.build.f_cpu=120000000L
1148+
adafruit_monster_m4sk.build.usb_product="Adafruit MONSTER M4SK"
1149+
adafruit_monster_m4sk.build.usb_manufacturer="Adafruit LLC"
1150+
adafruit_monster_m4sk.build.board=MONSTER_M4SK
1151+
adafruit_monster_m4sk.build.core=arduino
1152+
adafruit_monster_m4sk.build.extra_flags=-D__SAMD51G19A__ -DADAFRUIT_MONSTER_M4SK_EXPRESS -DCRYSTALLESS -D__SAMD51__ {build.usb_flags} -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
1153+
adafruit_monster_m4sk.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
1154+
adafruit_monster_m4sk.build.openocdscript=openocd_scripts/arduino_zero.cfg
1155+
adafruit_monster_m4sk.build.variant=monster_m4sk
1156+
adafruit_monster_m4sk.build.variant_system_lib=
1157+
adafruit_monster_m4sk.build.vid=0x239A
1158+
adafruit_monster_m4sk.build.pid=0x8047
1159+
adafruit_monster_m4sk.bootloader.tool=openocd
1160+
adafruit_monster_m4sk.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1161+
adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1162+
adafruit_monster_m4sk.menu.cache.on=Enabled
1163+
adafruit_monster_m4sk.menu.cache.on.build.cache_flags=-DENABLE_CACHE
1164+
adafruit_monster_m4sk.menu.cache.off=Disabled
1165+
adafruit_monster_m4sk.menu.cache.off.build.cache_flags=
1166+
adafruit_monster_m4sk.menu.speed.120=120 MHz (standard)
1167+
adafruit_monster_m4sk.menu.speed.120.build.f_cpu=120000000L
1168+
adafruit_monster_m4sk.menu.speed.150=150 MHz (overclock)
1169+
adafruit_monster_m4sk.menu.speed.150.build.f_cpu=150000000L
1170+
adafruit_monster_m4sk.menu.speed.180=180 MHz (overclock)
1171+
adafruit_monster_m4sk.menu.speed.180.build.f_cpu=180000000L
1172+
adafruit_monster_m4sk.menu.speed.200=200 MHz (overclock)
1173+
adafruit_monster_m4sk.menu.speed.200.build.f_cpu=200000000L
1174+
adafruit_monster_m4sk.menu.opt.small=Small (-Os) (standard)
1175+
adafruit_monster_m4sk.menu.opt.small.build.flags.optimize=-Os
1176+
adafruit_monster_m4sk.menu.opt.fast=Fast (-O2)
1177+
adafruit_monster_m4sk.menu.opt.fast.build.flags.optimize=-O2
1178+
adafruit_monster_m4sk.menu.opt.faster=Faster (-O3)
1179+
adafruit_monster_m4sk.menu.opt.faster.build.flags.optimize=-O3
1180+
adafruit_monster_m4sk.menu.opt.fastest=Fastest (-Ofast)
1181+
adafruit_monster_m4sk.menu.opt.fastest.build.flags.optimize=-Ofast
1182+
adafruit_monster_m4sk.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
1183+
adafruit_monster_m4sk.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
1184+
adafruit_monster_m4sk.menu.maxqspi.50=50 MHz (standard)
1185+
adafruit_monster_m4sk.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
1186+
adafruit_monster_m4sk.menu.maxqspi.fcpu=CPU Speed / 2
1187+
adafruit_monster_m4sk.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
1188+
adafruit_monster_m4sk.menu.usbstack.arduino=Arduino
1189+
adafruit_monster_m4sk.menu.usbstack.tinyusb=TinyUSB
1190+
adafruit_monster_m4sk.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
1191+
adafruit_monster_m4sk.menu.debug.off=Off
1192+
adafruit_monster_m4sk.menu.debug.on=On
1193+
adafruit_monster_m4sk.menu.debug.on.build.flags.debug=-g
11941194

11951195

11961196
# Adafruit Hallowing M4 Express (SAMD51)

‎variants/hallowing_mask_m4/libarm_cortexM4lf_math.a renamed to ‎variants/monster_m4sk/libarm_cortexM4lf_math.a

File renamed without changes.

‎variants/hallowing_mask_m4/linker_scripts/gcc/flash_with_bootloader.ld renamed to ‎variants/monster_m4sk/linker_scripts/gcc/flash_with_bootloader.ld

File renamed without changes.

‎variants/hallowing_mask_m4/linker_scripts/gcc/flash_without_bootloader.ld renamed to ‎variants/monster_m4sk/linker_scripts/gcc/flash_without_bootloader.ld

File renamed without changes.

‎variants/hallowing_mask_m4/pins_arduino.h renamed to ‎variants/monster_m4sk/pins_arduino.h

File renamed without changes.

‎variants/hallowing_mask_m4/variant.cpp renamed to ‎variants/monster_m4sk/variant.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const PinDescription g_APinDescription[]=
4242
{ PORTA, 7, PIO_DIGITAL, (PIN_ATTR_ANALOG|PIN_ATTR_PWM_E), ADC_Channel7, TC1_CH1, TC1_CH1, EXTERNAL_INT_7 }, // D6 Right TFT DC
4343
{ PORTA, 12, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, TC2_CH0, EXTERNAL_INT_12 }, // D7 Right TFT MOSI
4444
{ PORTA, 13, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, TC2_CH1, EXTERNAL_INT_13 }, // D8 Right TFT SCK
45-
{ PORTB, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // D9 Left TFT Chip Select
45+
{ PORTB, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // D9 Left TFT Chip Select
4646
{ PORTB, 22, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // D10 Left TFT DC
4747
{ PORTB, 2, PIO_SERCOM_ALT, PIN_ATTR_ANALOG, ADC_Channel14, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // D11 Left TFT MOSI
4848
{ PORTB, 3, PIO_SERCOM_ALT, PIN_ATTR_ANALOG, ADC_Channel15, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // D12 Left TFT SCK

‎variants/hallowing_mask_m4/variant.h renamed to ‎variants/monster_m4sk/variant.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#ifndef _VARIANT_HALLOWING_MASK_M4_
20-
#define _VARIANT_HALLOWING_MASK_M4_
19+
#ifndef _VARIANT_MONSTER_M4SK_
20+
#define _VARIANT_MONSTER_M4SK_
2121

2222
// The definitions here needs a SAMD core >=1.6.10
2323
#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10610
@@ -250,5 +250,5 @@ extern Uart Serial1;
250250
#define SERIAL_PORT_HARDWARE Serial1
251251
#define SERIAL_PORT_HARDWARE_OPEN Serial1
252252

253-
#endif /* _VARIANT_MERTO_M4_ */
253+
#endif /* _MONSTER_M4SK_ */
254254

0 commit comments

Comments
 (0)