Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support to Model 4917 #197

Merged
merged 7 commits into from
May 2, 2023
Merged

add support to Model 4917 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
530c7bb
fix #196: add support to model 4917
dhineshkumarmcci Oct 26, 2022
227f1bf
fix #196: add model 4917 to JSON file
dhineshkumarmcci Oct 26, 2022
8436eec
fix #196: add generated with 4917 support
dhineshkumarmcci Oct 26, 2022
6d535f6
update file headers
dhineshkumarmcci Apr 25, 2023
607f1d8
Added INF entry for Model4917
mukeshbharath Apr 27, 2023
e545608
Adding resp. signed cat file for Model4917
mukeshbharath Apr 27, 2023
385b6fd
Updated MCCI driver for stm32 devices (Model 4917)
mukeshbharath Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions boards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,16 @@
}
]
},

{
"modelnumber": "4917",
"board": "mcci_model_{{modelnumber}}",
"name": "MCCI Model {{modelnumber}}",
"pid": "00F1",
"build_board": "MCCI_MODEL_{{modelnumber}}",
"build_variant": "MODEL_4917",
"build_variant_extra_flags": "-DMCCI_MODEL_4917_PA0_SWITCHES_VDD=1",
"build_board_old_flags": "-DARDUINO_MODEL_{{modelnumber}}"
},
]
}
4 changes: 2 additions & 2 deletions boards.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Input to generate_boards.bri, produces Arduino IDE boards.txt.
#
# Copyright:
# Copyright (c) 2018-2021 MCCI Corporation
# Copyright (c) 2018-2023 MCCI Corporation
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand All @@ -32,7 +32,7 @@
# Define all the boards for this board support package to the Arduino IDE
#
# Copyright:
# Copyright (c) 2018-2021 MCCI Corporation
# Copyright (c) 2018-2023 MCCI Corporation
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down
201 changes: 200 additions & 1 deletion boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Define all the boards for this board support package to the Arduino IDE
#
# Copyright:
# Copyright (c) 2018-2021 MCCI Corporation
# Copyright (c) 2018-2023 MCCI Corporation
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -1794,3 +1794,202 @@ mcci_catena_4802.menu.lorawan_subband.sb11.build.lorawan_subband_flags=-DARDUINO

#### end of configuration info for MCCI Catena 4802

#
# Configuration information for MCCI Model 4917
# See template in https://github.com/mcci-catena/Arduino_Core_STM32/boards.template
#
mcci_model_4917.name=MCCI Model 4917
mcci_model_4917.build.vid=0x040E
mcci_model_4917.build.pid=0x00F1
mcci_model_4917.vid.0=0x040E
mcci_model_4917.pid.0=0x00F1
mcci_model_4917.build.usb_product="MCCI Model 4917"
mcci_model_4917.build.usb_manufacturer="MCCI Corporation"

mcci_model_4917.build.core=arduino
mcci_model_4917.build.board=MCCI_MODEL_4917
mcci_model_4917.build.product_line=STM32L082xx

mcci_model_4917.upload.maximum_size=196608
mcci_model_4917.upload.maximum_data_size=20480
mcci_model_4917.build.mcu=cortex-m0
mcci_model_4917.build.series=STM32L0xx
mcci_model_4917.build.variant=MODEL_4917
mcci_model_4917.build.variant_extra_flags=-DMCCI_MODEL_4917_PA0_SWITCHES_VDD=1
mcci_model_4917.build.cmsis_lib_gcc=arm_cortexM0l_math
mcci_model_4917.build.ldscript=
mcci_model_4917.build.extra_flags=-DARDUINO_STM32 -DARDUINO_{build.series} -DARDUINO_{build.product_line} -DARDUINO_MODEL_4917 -D{build.product_line} {build.sysclk_flags} {build.xSerial} -D__CORTEX_SC=0 -D{build.board} {build.lorawan_flags} {build.lorawan_network_flags} {build.lorawan_subband_flags} {build.variant_extra_flags}
# mcci_model_4917.build.c.Werror=
# mcci_model_4917.build.cpp.Werror=
# mcci_model_4917.build.S.Werror=
mcci_model_4917.bootloader.tool=stm32l0_dfu
mcci_model_4917.bootloader.file=McciBootloader_46xx

#
# menu.upload_method
mcci_model_4917.menu.upload_method.DFU_bl=DFU (include bootloader)
mcci_model_4917.menu.upload_method.DFU_bl.upload.tool=stm32l0_dfu_bootloader
mcci_model_4917.menu.upload_method.DFU_bl.upload.protocol=dfu
mcci_model_4917.menu.upload_method.DFU_bl.upload.maximum_size=172032
mcci_model_4917.menu.upload_method.DFU_bl.upload.maximum_data_size=20480

mcci_model_4917.menu.upload_method.DFU=DFU
mcci_model_4917.menu.upload_method.DFU.upload.tool=stm32l0_dfu
mcci_model_4917.menu.upload_method.DFU.upload.protocol=dfu
mcci_model_4917.menu.upload_method.DFU.upload.maximum_size=196608
mcci_model_4917.menu.upload_method.DFU.upload.maximum_data_size=20480

mcci_model_4917.menu.upload_method.STLink_bl=STLink (include bootloader)
mcci_model_4917.menu.upload_method.STLink_bl.upload.protocol=STLink
mcci_model_4917.menu.upload_method.STLink_bl.upload.tool=stlink_upload_bootloader
mcci_model_4917.menu.upload_method.STLink_bl.upload.maximum_size=172032
mcci_model_4917.menu.upload_method.STLink_bl.upload.maximum_data_size=20480

mcci_model_4917.menu.upload_method.STLink=STLink
mcci_model_4917.menu.upload_method.STLink.upload.protocol=STLink
mcci_model_4917.menu.upload_method.STLink.upload.tool=stlink_upload
mcci_model_4917.menu.upload_method.STLink.upload.maximum_size=196608
mcci_model_4917.menu.upload_method.STLink.upload.maximum_data_size=20480

#mcci_model_4917.menu.upload_method.Serial=Serial
#mcci_model_4917.menu.upload_method.Serial.upload.protocol=Serial
#mcci_model_4917.menu.upload_method.Serial.upload.tool=serial_upload

#
# menu.xserial
mcci_model_4917.menu.xserial.usb=USB Serial
mcci_model_4917.menu.xserial.generic=Generic Serial
mcci_model_4917.menu.xserial.none=No Serial
mcci_model_4917.menu.xserial.usbhwserial=USB + HW Serial
mcci_model_4917.menu.xserial.usb.build.xSerial={build.usb_flags} -DARDUINO_BSP_CONFIG_SERIAL_MASK=0x1
mcci_model_4917.menu.xserial.generic.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x2
mcci_model_4917.menu.xserial.none.build.xSerial=-DARDUINO_BSP_CONFIG_SERIAL_MASK=0x0
mcci_model_4917.menu.xserial.usbhwserial.build.xSerial={build.usb_flags} -DARDUINO_BSP_CONFIG_SERIAL_MASK=0x3

#
# menu.sysclk
mcci_model_4917.menu.sysclk.pll32m=32 MHz (most power)
mcci_model_4917.menu.sysclk.pll24m=24 MHz
mcci_model_4917.menu.sysclk.hsi16m=16 MHz
mcci_model_4917.menu.sysclk.msi4194k=4.194 MHz (no USB)
mcci_model_4917.menu.sysclk.msi2097k=2.097 MHz (no USB, least power)
mcci_model_4917.menu.sysclk.pll32m.build.sysclk_flags=-DCATENA_CFG_SYSCLK=32
mcci_model_4917.menu.sysclk.pll24m.build.sysclk_flags=-DCATENA_CFG_SYSCLK=24
mcci_model_4917.menu.sysclk.hsi16m.build.sysclk_flags=-DCATENA_CFG_SYSCLK=16
mcci_model_4917.menu.sysclk.msi4194k.build.sysclk_flags=-DCATENA_CFG_SYSCLK=4
mcci_model_4917.menu.sysclk.msi2097k.build.sysclk_flags=-DCATENA_CFG_SYSCLK=2

#
# menu.bootloader
mcci_model_4917.menu.boot.trusted=MCCI Trusted Boot
mcci_model_4917.menu.boot.basic=Basic (no bootloader)

# convert boot selections to settings
mcci_model_4917.menu.boot.basic.build.ldscript=../mcci-ldscript-basic.ld
mcci_model_4917.menu.boot.basic.build.baseaddr=0x08000000
mcci_model_4917.menu.boot.trusted.build.ldscript=../mcci-ldscript-trusted.ld
mcci_model_4917.menu.boot.trusted.build.baseaddr=0x08005000

#
# menu.opt
mcci_model_4917.menu.opt.osstd=Smallest (-Os default)
mcci_model_4917.menu.opt.osstd.build.flags.optimize=-Os
mcci_model_4917.menu.opt.osstd.build.flags.ldspecs=
# mcci_model_4917.menu.opt.oslto=Smallest (-Os) with LTO
# mcci_model_4917.menu.opt.oslto.build.flags.optimize=-Os -flto
# mcci_model_4917.menu.opt.oslto.build.flags.ldspecs=-flto
mcci_model_4917.menu.opt.o1std=Fast (-O1)
mcci_model_4917.menu.opt.o1std.build.flags.optimize=-O1
mcci_model_4917.menu.opt.o1std.build.flags.ldspecs=
# mcci_model_4917.menu.opt.o1lto=Fast (-O1) with LTO
# mcci_model_4917.menu.opt.o1lto.build.flags.optimize=-O1 -flto
# mcci_model_4917.menu.opt.o1lto.build.flags.ldspecs=-flto
mcci_model_4917.menu.opt.o2std=Faster (-O2)
mcci_model_4917.menu.opt.o2std.build.flags.optimize=-O2
mcci_model_4917.menu.opt.o2std.build.flags.ldspecs=
# mcci_model_4917.menu.opt.o2lto=Faster (-O2) with LTO
# mcci_model_4917.menu.opt.o2lto.build.flags.optimize=-O2 -flto
# mcci_model_4917.menu.opt.o2lto.build.flags.ldspecs=-flto
mcci_model_4917.menu.opt.o3std=Fastest (-O3)
mcci_model_4917.menu.opt.o3std.build.flags.optimize=-O3
mcci_model_4917.menu.opt.o3std.build.flags.ldspecs=
# mcci_model_4917.menu.opt.o3lto=Fastest (-O3) with LTO
# mcci_model_4917.menu.opt.o3lto.build.flags.optimize=-O3 -flto
# mcci_model_4917.menu.opt.o3lto.build.flags.ldspecs=-flto
mcci_model_4917.menu.opt.ogstd=Debug (-g)
mcci_model_4917.menu.opt.ogstd.build.flags.optimize=-Og -gdwarf-2
mcci_model_4917.menu.opt.ogstd.build.flags.ldspecs=

#
# menu.lorawan_region
mcci_model_4917.menu.lorawan_region.us915=North America 915 MHz
mcci_model_4917.menu.lorawan_region.eu868=Europe 868 MHz
mcci_model_4917.menu.lorawan_region.au915=Australia 915 MHz
mcci_model_4917.menu.lorawan_region.as923=Asia 923 MHz
mcci_model_4917.menu.lorawan_region.as923jp=Japan 923 MHz
mcci_model_4917.menu.lorawan_region.kr920=Korea 920 MHz
mcci_model_4917.menu.lorawan_region.in866=India 866 MHz
mcci_model_4917.menu.lorawan_region.projcfg=Use arduino-lmic/project_config/lmic_project_lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.au915.build.lorawan_flags=-DCFG_au921=1 -DCFG_au915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_region.projcfg.build.lorawan_flags=

#
# menu.lorawan_network
mcci_model_4917.menu.lorawan_network.ttn=The Things Network
mcci_model_4917.menu.lorawan_network.ttn.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_TTN=1
mcci_model_4917.menu.lorawan_network.actility=Actility ThingsPark
mcci_model_4917.menu.lorawan_network.actility.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_ACTILITY=1
mcci_model_4917.menu.lorawan_network.helium=Helium
mcci_model_4917.menu.lorawan_network.helium.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_HELIUM=1
mcci_model_4917.menu.lorawan_network.machineq=machineQ
mcci_model_4917.menu.lorawan_network.machineq.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_MACHINEQ=1
mcci_model_4917.menu.lorawan_network.senet=Senet
mcci_model_4917.menu.lorawan_network.senet.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_SENET=1
mcci_model_4917.menu.lorawan_network.senra=Senra
mcci_model_4917.menu.lorawan_network.senra.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_SENRA=1
mcci_model_4917.menu.lorawan_network.swisscom=Swisscom
mcci_model_4917.menu.lorawan_network.swisscom.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_SWISSCOM=1
mcci_model_4917.menu.lorawan_network.chirpstack=ChirpStack
mcci_model_4917.menu.lorawan_network.chirpstack.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_CHIRPSTACK=1
mcci_model_4917.menu.lorawan_network.generic=Generic
mcci_model_4917.menu.lorawan_network.generic.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_GENERIC=1
mcci_model_4917.menu.lorawan_network.projcfg=Use arduino-lmic/project_config/lmic_project_lmic_config_preconditions.h
mcci_model_4917.menu.lorawan_network.projcfg.build.lorawan_network_flags=

#
# menul.lorawan_subband
mcci_model_4917.menu.lorawan_subband.default=Default, works everywhere
mcci_model_4917.menu.lorawan_subband.default.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=-1
mcci_model_4917.menu.lorawan_subband.sb0=sb0, ch 0~7 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb0.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=0
mcci_model_4917.menu.lorawan_subband.sb1=sb1, ch 8~15 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb1.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=1
mcci_model_4917.menu.lorawan_subband.sb2=sb2, ch 16~23 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb2.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=2
mcci_model_4917.menu.lorawan_subband.sb3=sb3, ch 24~31 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb3.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=3
mcci_model_4917.menu.lorawan_subband.sb4=sb4, ch 32~39 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb4.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=4
mcci_model_4917.menu.lorawan_subband.sb5=sb5, ch 40~47 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb5.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=5
mcci_model_4917.menu.lorawan_subband.sb6=sb6, ch 48~55 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb6.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=6
mcci_model_4917.menu.lorawan_subband.sb7=sb7, ch 56~63 (US/AU/CN470)
mcci_model_4917.menu.lorawan_subband.sb7.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=7
mcci_model_4917.menu.lorawan_subband.sb8=sb8, ch 64~71 (CN470)
mcci_model_4917.menu.lorawan_subband.sb8.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=8
mcci_model_4917.menu.lorawan_subband.sb9=sb9, ch 72~79 (CN470)
mcci_model_4917.menu.lorawan_subband.sb9.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=9
mcci_model_4917.menu.lorawan_subband.sb10=sb10, ch 80~87 (CN470)
mcci_model_4917.menu.lorawan_subband.sb10.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=10
mcci_model_4917.menu.lorawan_subband.sb11=sb11, ch 88~95 (CN470)
mcci_model_4917.menu.lorawan_subband.sb11.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=11

#### end of configuration info for MCCI Model 4917

Binary file added drivers/windows/MCCI-CATENA-STM32-DRIVER-INSTALLER.exe
View file
Open in desktop
Binary file not shown.
Binary file modified drivers/windows/mcci-catena-stm32.cat
View file
Open in desktop
Binary file not shown.
10 changes: 8 additions & 2 deletions drivers/windows/mcci-catena-stm32.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
; Function:
; Installs the driver for MCCI Catena STM32 Version Boards
;
; Copyright (c) 2020 MCCI Corporation
; Copyright (c) 2020, 2023 MCCI Corporation
;
; MCCI is a registered trademark of MCCI Corporation.
;
Expand All @@ -20,8 +20,9 @@ CatalogFile.nt = mcci-catena-stm32.cat
CatalogFile.ntx86 = mcci-catena-stm32.cat
CatalogFile.ntia64 = mcci-catena-stm32.cat
CatalogFile.ntamd64 = mcci-catena-stm32.cat
PnpLockdown = 1
; DriverVer date is MM/DD/YYYY
DriverVer=03/16/2020,1.0.0.0
DriverVer=02/07/2023,10.0.22621.1194

[Manufacturer]
%MFG%=MCCICatena, NT, NTx86, NTia64, NTamd64
Expand All @@ -34,6 +35,7 @@ DriverVer=03/16/2020,1.0.0.0
%mcci_catena_4617.name%=MCCICatenaInstall, USB\VID_040E&PID_00C1
%mcci_catena_4618.name%=MCCICatenaInstall, USB\VID_040E&PID_00D1
%mcci_catena_4630.name%=MCCICatenaInstall, USB\VID_040E&PID_00B1
%mcci_catena_4917.name%=MCCICatenaInstall, USB\VID_040E&PID_00F1

[MCCICatena.NTx86]
%mcci_catena_4551.name%=MCCICatenaInstall, USB\VID_040E&PID_0041
Expand All @@ -43,6 +45,7 @@ DriverVer=03/16/2020,1.0.0.0
%mcci_catena_4617.name%=MCCICatenaInstall, USB\VID_040E&PID_00C1
%mcci_catena_4618.name%=MCCICatenaInstall, USB\VID_040E&PID_00D1
%mcci_catena_4630.name%=MCCICatenaInstall, USB\VID_040E&PID_00B1
%mcci_catena_4917.name%=MCCICatenaInstall, USB\VID_040E&PID_00F1

[MCCICatena.NTia64]
%mcci_catena_4551.name%=MCCICatenaInstall, USB\VID_040E&PID_0041
Expand All @@ -52,6 +55,7 @@ DriverVer=03/16/2020,1.0.0.0
%mcci_catena_4617.name%=MCCICatenaInstall, USB\VID_040E&PID_00C1
%mcci_catena_4618.name%=MCCICatenaInstall, USB\VID_040E&PID_00D1
%mcci_catena_4630.name%=MCCICatenaInstall, USB\VID_040E&PID_00B1
%mcci_catena_4917.name%=MCCICatenaInstall, USB\VID_040E&PID_00F1

[MCCICatena.NTamd64]
%mcci_catena_4551.name%=MCCICatenaInstall, USB\VID_040E&PID_0041
Expand All @@ -61,6 +65,7 @@ DriverVer=03/16/2020,1.0.0.0
%mcci_catena_4617.name%=MCCICatenaInstall, USB\VID_040E&PID_00C1
%mcci_catena_4618.name%=MCCICatenaInstall, USB\VID_040E&PID_00D1
%mcci_catena_4630.name%=MCCICatenaInstall, USB\VID_040E&PID_00B1
%mcci_catena_4917.name%=MCCICatenaInstall, USB\VID_040E&PID_00F1

[DestinationDirs]
FakeModemCopyFileSection = 12 ;%windir%\system32\drivers
Expand Down Expand Up @@ -173,4 +178,5 @@ mcci_catena_4612.name="MCCI Catena 4612"
mcci_catena_4617.name="MCCI Catena 4617"
mcci_catena_4618.name="MCCI Catena 4618"
mcci_catena_4630.name="MCCI Catena 4630"
mcci_catena_4917.name="MCCI Catena 4917"
ServiceName = "MCCI Catena STM32 USB Serial Driver"
Loading