jfmartel/ChaletLora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ajout détection bootloader

Browse Source
This commit is contained in:
jfmartel
2024-05-20 12:35:04 -04:00
parent 84f488972a
commit fc54e7cb98
17 changed files with 7921 additions and 20480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChaletLora.X/Source/BoardCfg_ChaletduinoV2.h
+4 -4
View File
@@ -133,10 +133,10 @@ extern "C" {
//#define LORA_MODULE_RX_LED_PIN LATCbits.LATC14
//#define LORA_MODULE_TX_LED_PIN_DIR TRISCbits.TRISC13
//#define LORA_MODULE_TX_LED_PIN LATCbits.LATC13
#define LORA_MODULE_RX_LED_PIN_DIR TRISBbits.TRISB4
#define LORA_MODULE_RX_LED_PIN LATBbits.LATB4
#define LORA_MODULE_TX_LED_PIN_DIR TRISFbits.TRISF1
#define LORA_MODULE_TX_LED_PIN LATFbits.LATF1
#define LORA_MODULE_RX_LED_PIN_DIR TRISCbits.TRISC14
#define LORA_MODULE_RX_LED_PIN LATCbits.LATC14
#define LORA_MODULE_TX_LED_PIN_DIR TRISCbits.TRISC13
#define LORA_MODULE_TX_LED_PIN LATCbits.LATC13
//LCD Screen
ChaletLora.X/Source/LoraNetworkInterface.h
+3 -1
View File
@@ -2,7 +2,9 @@
#ifndef LORANEETWORKINTERFACE_H /* Guard against multiple inclusion */
#define LORANEETWORKINTERFACE_H
#define LORA_CHANNEL 0x04
//#define LORA_CHANNEL 0x04
//#define LORA_MASTER_ADDRESS 0x05
#define LORA_CHANNEL 65
#define LORA_MASTER_ADDRESS 0x05
#define LORA_CHALET_STATUS_POWER_RELAY_MASK 0x01
ChaletLora.X/Source/Terminal.c
+14 -1
View File
@@ -42,6 +42,9 @@ int mTerminalPendingAction;
BOOL mTerminalOpened;
int mTerminalTickState;
#define BOOTLOAD_VERSION_ADDRESS 0x9D000000
const uint32_t *mBootloaderMagicWord = (uint32_t *) BOOTLOAD_VERSION_ADDRESS;
static BYTE mHelpString[] = "Here is the list of the available commands:\n\r\n\r"
"help : Shows this window\n\r"
"\npower [state] Set chalet's 12V Inverter feed power state. This command controls the main power relay\n"
@@ -375,7 +378,15 @@ void ParseNewBuffer(void)
TerminalPrintString(current);
//TerminalPrintString("mA\n");
Sleep(100);
if(*mBootloaderMagicWord == 0xBAADCAFE)
{
TerminalPrintString("Bootloader: Detected\n");
}
else
{
TerminalPrintString("Bootloader: Not Detected\n");
}
char SOC[15];
memset(SOC,0,15);
sprintf(SOC,"%d%%\n",GetBatterySOC());
@@ -383,6 +394,8 @@ void ParseNewBuffer(void)
TerminalPrintString(SOC);
// TerminalPrintString("\n");
TerminalPrintString("\n");
}
ChaletLora.X/Source/main.c
-1
View File
@@ -109,7 +109,6 @@ int main(void)
#ifdef USE_SYSLOG
InitSyslog();
#endif
ChaletLora.X/Source/versionbuild.h
+1 -1
View File
@@ -1,4 +1,4 @@
#define VERSIONNUMBER "CHALET_V01.00.3" //shall be 15 chars...
#define VERSIONNUMBER "CHALET_V01.01.6" //shall be 15 chars...
//Force DHCP instead of static IP.
//#define VERSIONNUMBER "CHALET_V01.00.1" //shall be 15 chars...
ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.elf
Vendored
BIN
View File
Binary file not shown.
ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.hex
Vendored
+5895 -5889
View File
File diff suppressed because it is too large Load Diff
ChaletLora.X/dist/ChaletDuinoV2_795F512H_/production/ChaletLora.X.production.map
Vendored
+1404 -1403
View File
File diff suppressed because it is too large Load Diff
ChaletLora.X/dist/ChaletDuino_775F512H_/production/ChaletLora.X.production.elf
Vendored
BIN
View File
Binary file not shown.
ChaletLora.X/dist/ChaletDuino_775F512H_/production/ChaletLora.X.production.hex
Vendored
-7676
View File
File diff suppressed because it is too large Load Diff
ChaletLora.X/dist/ChaletDuino_775F512H_/production/ChaletLora.X.production.map
Vendored
-4899
View File
File diff suppressed because it is too large Load Diff
ChaletLora.X/nbproject/Makefile-ChaletDuinoV2_795F512H_.mk
+2 -2
View File
@@ -679,12 +679,12 @@ endif
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk elf32pic32mx.x
@${MKDIR} ${DISTDIR}
${MP_CC} $(MP_EXTRA_LD_PRE) -g -mdebugger -D__MPLAB_DEBUGGER_ICD3=1 -mprocessor=$(MP_PROCESSOR_OPTION) -o ${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD) -mreserve=data@0x0:0x1FC -mreserve=boot@0x1FC02000:0x1FC02FEF -mreserve=boot@0x1FC02000:0x1FC024FF -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_ICD3=1,--defsym=_min_heap_size=512,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"
${MP_CC} $(MP_EXTRA_LD_PRE) -g -mdebugger -D__MPLAB_DEBUGGER_ICD3=1 -mprocessor=$(MP_PROCESSOR_OPTION) -o ${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD) -mreserve=data@0x0:0x1FC -mreserve=boot@0x1FC02000:0x1FC02FEF -mreserve=boot@0x1FC02000:0x1FC024FF -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_ICD3=1,--defsym=_min_heap_size=128,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"
else
${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk elf32pic32mx.x
@${MKDIR} ${DISTDIR}
${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o ${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=512,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"
${MP_CC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o ${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_ChaletDuinoV2_795F512H_=$(CND_CONF) $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=128,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"
${MP_CC_DIR}\\xc32-bin2hex ${DISTDIR}/ChaletLora.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}
endif
ChaletLora.X/nbproject/Makefile-ChaletDuino_775F512H_.mk
+562 -590
View File
File diff suppressed because it is too large Load Diff
ChaletLora.X/nbproject/Makefile-genesis.properties
+3 -3
View File
@@ -1,5 +1,5 @@
#
#Wed Mar 15 14:21:32 EDT 2023
#Mon May 20 12:06:36 EDT 2024
ChaletDuinoV2_795F512H_.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
proj.dir=D\:\\Main\\PicDev\\Projets\\ChaletLora\\ChaletLora.X
@@ -7,13 +7,13 @@ com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=bcd6e5453a11ce86a
ChaletDuinoV2_795F512H_.com-microchip-mplab-mdbcore-ICD3Tool-ICD3DbgToolManager.md5=b8062f7a3afd14c7a6d50c4bb4696d24
default.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
default.com-microchip-mplab-mdbcore-ICD3Tool-ICD3DbgToolManager.md5=b8062f7a3afd14c7a6d50c4bb4696d24
configurations-xml=fab4bffb749fabb8d5f7e783e9ad9753
configurations-xml=a693428a995780ad86dbb540f0a83cde
ChaletDuino_775F512H_.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
host.platform=windows
ChaletDuinoV2_795F512H_.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=de2d3bc95a22a3f432c2e39f49efafbc
ChaletDuinoV2_795F512H_.Pack.dfplocation=C\:\\Users\\JF\\.mchp_packs\\Microchip\\PIC32MX_DFP\\1.3.231
ChaletDuino_775F512H_.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.33\\bin
host.id=j2cb-58wy-7
host.id=2r0w-c3lh-oj
conf.ids=default,ChaletDuino_775F512H_,ChaletDuinoV2_795F512H_
default.languagetoolchain.version=1.33
ChaletDuinoV2_795F512H_.languagetoolchain.version=1.33
ChaletLora.X/nbproject/Makefile-local-ChaletDuino_775F512H_.mk
+5 -6
View File
@@ -15,11 +15,11 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.40/mplab_platform/platform/../mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v6.05/mplab_platform/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.40/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files/Microchip/MPLABX/v6.05/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.40\sys\java\zulu8.36.0.1-ca-fx-jdk8.0.202-win_x64\jre/bin/"
MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v6.05\sys\java\zulu8.64.0.19-ca-fx-jre8.0.345-win_x64/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="C:\Program Files\Microchip\xc32\v1.33\bin\xc32-gcc.exe"
MP_CPPC="C:\Program Files\Microchip\xc32\v1.33\bin\xc32-g++.exe"
@@ -27,12 +27,11 @@ MP_CPPC="C:\Program Files\Microchip\xc32\v1.33\bin\xc32-g++.exe"
MP_AS="C:\Program Files\Microchip\xc32\v1.33\bin\xc32-as.exe"
MP_LD="C:\Program Files\Microchip\xc32\v1.33\bin\xc32-ld.exe"
MP_AR="C:\Program Files\Microchip\xc32\v1.33\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.40/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v6.05/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files\Microchip\xc32\v1.33\bin"
MP_CPPC_DIR="C:\Program Files\Microchip\xc32\v1.33\bin"
# MP_BC_DIR is not defined
MP_AS_DIR="C:\Program Files\Microchip\xc32\v1.33\bin"
MP_LD_DIR="C:\Program Files\Microchip\xc32\v1.33\bin"
MP_AR_DIR="C:\Program Files\Microchip\xc32\v1.33\bin"
# MP_BC_DIR is not defined
DFP_DIR=C:/Program Files (x86)/Microchip/MPLABX/v5.40/packs/Microchip/PIC32MX_DFP/1.3.231
DFP_DIR=C:/Users/JF/.mchp_packs/Microchip/PIC32MX_DFP/1.3.231
ChaletLora.X/nbproject/configurations.xml
+24 -3
View File
@@ -263,9 +263,10 @@
<property key="place-data-into-section" value="false"/>
<property key="post-instruction-scheduling" value="default"/>
<property key="pre-instruction-scheduling" value="default"/>
<property key="preprocessor-macros" value="CHALETDUINO_BOARD"/>
<property key="preprocessor-macros" value=""/>
<property key="strict-ansi" value="false"/>
<property key="support-ansi" value="false"/>
<property key="tentative-definitions" value=""/>
<property key="toplevel-reordering" value=""/>
<property key="unaligned-access" value=""/>
<property key="use-cci" value="false"/>
@@ -297,6 +298,7 @@
</C32-AS>
<C32-CO>
<property key="coverage-enable" value=""/>
<property key="stack-guidance" value="false"/>
</C32-CO>
<C32-LD>
<property key="additional-options-use-response-files" value="false"/>
@@ -377,6 +379,7 @@
<property key="omit-pack-options" value="1"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="stack-smashing" value=""/>
<property key="wpo-lto" value="false"/>
</C32Global>
<ICD3PlatformTool>
@@ -425,6 +428,8 @@
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.debug-startup" value="Use system settings"/>
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
<property key="debugoptions.useswbreakpoints" value="false"/>
<property key="hwtoolclock.frcindebug" value="false"/>
<property key="memories.aux" value="false"/>
@@ -503,6 +508,8 @@
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.debug-startup" value="Use system settings"/>
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
<property key="debugoptions.useswbreakpoints" value="false"/>
<property key="hwtoolclock.frcindebug" value="false"/>
<property key="memories.aux" value="false"/>
@@ -598,6 +605,7 @@
value="CHALETDUINO_BRD;_SUPPRESS_PLIB_WARNING"/>
<property key="strict-ansi" value="false"/>
<property key="support-ansi" value="false"/>
<property key="tentative-definitions" value=""/>
<property key="toplevel-reordering" value=""/>
<property key="unaligned-access" value=""/>
<property key="use-cci" value="false"/>
@@ -629,6 +637,7 @@
</C32-AS>
<C32-CO>
<property key="coverage-enable" value=""/>
<property key="stack-guidance" value="false"/>
</C32-CO>
<C32-LD>
<property key="additional-options-use-response-files" value="false"/>
@@ -650,7 +659,7 @@
<property key="generate-16-bit-code" value="false"/>
<property key="generate-cross-reference-file" value="false"/>
<property key="generate-micro-compressed-code" value="false"/>
<property key="heap-size" value="512"/>
<property key="heap-size" value=""/>
<property key="input-libraries" value=""/>
<property key="kseg-length" value=""/>
<property key="kseg-origin" value=""/>
@@ -709,6 +718,7 @@
<property key="omit-pack-options" value="1"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="stack-smashing" value=""/>
<property key="wpo-lto" value="false"/>
</C32Global>
<ICD3PlatformTool>
@@ -757,6 +767,8 @@
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.debug-startup" value="Use system settings"/>
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
<property key="debugoptions.useswbreakpoints" value="true"/>
<property key="hwtoolclock.frcindebug" value="false"/>
<property key="memories.aux" value="false"/>
@@ -1027,6 +1039,8 @@
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.debug-startup" value="Use system settings"/>
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
<property key="debugoptions.useswbreakpoints" value="true"/>
<property key="hwtoolclock.frcindebug" value="false"/>
<property key="memories.aux" value="false"/>
@@ -1122,6 +1136,7 @@
value="CHALETDUINO_V2_BRD;_SUPPRESS_PLIB_WARNING"/>
<property key="strict-ansi" value="false"/>
<property key="support-ansi" value="false"/>
<property key="tentative-definitions" value=""/>
<property key="toplevel-reordering" value=""/>
<property key="unaligned-access" value=""/>
<property key="use-cci" value="false"/>
@@ -1153,6 +1168,7 @@
</C32-AS>
<C32-CO>
<property key="coverage-enable" value=""/>
<property key="stack-guidance" value="false"/>
</C32-CO>
<C32-LD>
<property key="additional-options-use-response-files" value="false"/>
@@ -1174,7 +1190,7 @@
<property key="generate-16-bit-code" value="false"/>
<property key="generate-cross-reference-file" value="false"/>
<property key="generate-micro-compressed-code" value="false"/>
<property key="heap-size" value="512"/>
<property key="heap-size" value="128"/>
<property key="input-libraries" value=""/>
<property key="kseg-length" value=""/>
<property key="kseg-origin" value=""/>
@@ -1234,6 +1250,7 @@
<property key="omit-pack-options" value="1"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="stack-smashing" value=""/>
<property key="wpo-lto" value="false"/>
</C32Global>
<ICD3PlatformTool>
@@ -1282,6 +1299,8 @@
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.debug-startup" value="Use system settings"/>
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
<property key="debugoptions.useswbreakpoints" value="true"/>
<property key="firmware.download.all" value="false"/>
<property key="hwtoolclock.frcindebug" value="false"/>
@@ -1601,6 +1620,8 @@
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.debug-startup" value="Use system settings"/>
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
<property key="debugoptions.useswbreakpoints" value="true"/>
<property key="firmware.download.all" value="false"/>
<property key="hwtoolclock.frcindebug" value="false"/>
ChaletLora.X/nbproject/private/private.xml
+4 -1
View File
@@ -24,6 +24,9 @@
</file>
</editor-bookmarks>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/>
<group>
<file>file:/D:/Main/PicDev/Projets/ChaletLora/ChaletLora.X/Source/main.c</file>
<file>file:/D:/Main/PicDev/Projets/ChaletLora/ChaletLora.X/Source/Terminal.c</file>
</group>
</open-files>
</project-private>