diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 55a6514..c8bf8fc 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -111,7 +111,7 @@ void Error_Handler(void); #define PME_OFF HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET ) #define PME_TOGGLE HAL_GPIO_TogglePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin) -//#define VL53L0 +#define VL53L0 #ifndef VL53L0 #define VL53LX 1 #endif @@ -133,6 +133,7 @@ void Error_Handler(void); #if defined(VL53LX)||defined(VL53L0) +#ifndef RM2 /* TOF-1 */ /* | U3, PB-5 XSHUT | */ /* INT PIN PB-3 | */ @@ -168,7 +169,7 @@ void Error_Handler(void); /* **** PCB BOARD RM2 **** */ /* **** NO LONG USED ANYMORE FOR TEST ONLY */ -#ifdef RM2 +#elif defined(RM2) /* TOF-1 */ /* | U3, PB-3 XSHUT | */ /* INT PIN PB-5 | */ diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 9a3f54e..51b1d45 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1015,9 +1015,10 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) APP_LOG(TS_OFF, VLEVEL_M, "OTAA =====================\r\n"); } AppData.Port = 1; - AppData.BufferSize = 2; - AppData.Buffer[0]=0x38; - AppData.Buffer[1]=0x38; + AppData.BufferSize = 10; + //AppData.Buffer[0]=0x38; + //AppData.Buffer[1]=0x38; + UTIL_MEM_cpy_8((uint8_t*)AppData.Buffer, "YUNHORN168", 10); LmHandlerParams.IsTxConfirmed = true; LmHandlerErrorStatus_t status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false); if (status ==LORAMAC_HANDLER_SUCCESS ) LmHandlerParams.IsTxConfirmed = false; diff --git a/README.md b/README.md index 84cb95f..e24d51a 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ 2024 09 20 Overall good of Yunhorn STS AUTO RESPONDER PARSE 2024 09 20 START RR + 2024 09 25 START R1D diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index dc1d683..f826144 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -133,7 +133,10 @@