From d378c05073cb49733018a6da287ae0ba0b9327f7 Mon Sep 17 00:00:00 2001 From: d0kuhn Date: Wed, 3 Jan 2024 19:48:04 +0100 Subject: [PATCH] adding uart2 first time for sml --- src/main.c | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/src/main.c b/src/main.c index 0a564bf..547dcf1 100644 --- a/src/main.c +++ b/src/main.c @@ -41,7 +41,7 @@ /* Private define ------------------------------------------------------------*/ /* USER CODE BEGIN PD */ -#define BUFFER_SIZE 1024 +#define BUFFER_SIZE 2048 /* USER CODE END PD */ @@ -69,31 +69,6 @@ static void MX_RTC_Init(void); /* Private user code ---------------------------------------------------------*/ /* USER CODE BEGIN 0 */ -const u1_t test_sml_frame[] = { 0x1B, 0x1B, 0x1B, 0x1B, 0x01, 0x01, 0x01, 0x01, 0x76, - 0x05, 0x98, 0xE0, 0xCE, 0x95, 0x62, 0x00, 0x62, 0x00, - 0x72, 0x63, 0x01, 0x01, 0x76, 0x01, 0x01, 0x08, 0x48, - 0x61, 0x67, 0x08, 0x42, 0x19, 0xAD, 0x08, 0x31, 0x30, - 0x30, 0x31, 0x31, 0x38, 0x35, 0x01, 0x01, 0x63, 0x5B, - 0x20, 0x00, 0x76, 0x05, 0x98, 0xE0, 0xCE, 0x96, 0x62, - 0x00, 0x62, 0x00, 0x72, 0x63, 0x07, 0x01, 0x77, 0x01, - 0x08, 0x31, 0x30, 0x30, 0x31, 0x31, 0x38, 0x35, 0x01, - 0x01, 0x75, 0x77, 0x07, 0x81, 0x81, 0xC7, 0x82, 0x03, - 0xFF, 0x01, 0x01, 0x01, 0x01, 0x06, 0x48, 0x41, 0x47, - 0x45, 0x52, 0x01, 0x77, 0x07, 0x01, 0x00, 0x00, 0x00, - 0x00, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x08, 0x31, 0x30, - 0x30, 0x31, 0x31, 0x38, 0x35, 0x01, 0x77, 0x07, 0x01, - 0x00, 0x02, 0x08, 0x01, 0xFF, 0x62, 0x82, 0x01, 0x62, - 0x1E, 0x52, 0xFF, 0x69, 0x00, 0x00, 0x00, 0x00, 0x41, - 0xC4, 0x98, 0x8F, 0x01, 0x77, 0x07, 0x00, 0x00, 0x60, - 0x01, 0xFF, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x0B, 0x30, - 0x30, 0x30, 0x30, 0x31, 0x31, 0x36, 0x39, 0x31, 0x37, - 0x01, 0x77, 0x07, 0x01, 0x00, 0x01, 0x07, 0x01, 0xFF, - 0x62, 0x82, 0x01, 0x62, 0x1B, 0x52, 0xFC, 0x55, 0xFC, - 0xA4, 0x98, 0x84, 0x01, 0x01, 0x01, 0x63, 0xFE, 0xDB, - 0x00, 0x76, 0x05, 0x98, 0xE0, 0xCE, 0x97, 0x62, 0x00, - 0x62, 0x00, 0x72, 0x63, 0x02, 0x01, 0x71, 0x01, 0x63, - 0x1B, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x1B, 0x1B, 0x1B, - 0x1A, 0x02, 0xDB, 0x3A }; double T1Wh = -2, SumWh = -2; @@ -272,14 +247,17 @@ void initfunc (osjob_t* j) { } +const uint8_t sml_frame[BUFFER_SIZE] = {"Hallo Welt !!\n"}; + u2_t readsensor(){ - u2_t value = 0xDF; /// read from evrything ...make your own sensor + u2_t value = 0xDF; /// read from evrything ...make your own sensor - - for(int i = 0; i < sizeof(test_sml_frame); i++){ - readByte( &test_sml_frame[i] ); - }; - + HAL_UART_Transmit( &huart2, (uint8_t *)sml_frame, 8, HAL_MAX_DELAY ); + // if( HAL_UART_Receive( &huart2, sml_frame, 8, 15 ) == (HAL_OK || HAL_TIMEOUT)){ + // for(int i = 0; i < BUFFER_SIZE; i++){ + // readByte( &sml_frame[i] ); + // }; + // } return value; } @@ -290,7 +268,7 @@ static osjob_t reportjob; static void reportfunc (osjob_t* j) { // read sensor u2_t val = readsensor(); - debug_int( os_getTime() ); + // debug_int( os_getTime() ); debug_val(": val = ", val); // prepare and schedule data for transmission LMIC.frame[0] = val << 8; @@ -399,6 +377,13 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); + + /* Configure SysTick to generate an interrupt every millisecond */ + // if (SysTick_Config(SystemCoreClock / 1000) != HAL_OK) { + // // Error Handling + // Error_Handler(); + // } + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -799,7 +784,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc) { HAL_RTC_GetAlarm(hrtc,&sAlarm,RTC_ALARM_A,FORMAT_BIN); uint8_t next_minutes = sAlarm.AlarmTime.Minutes + 5; - if (next_minutes > 59) next_minutes = 0; + if (next_minutes > 56) next_minutes = 0; sAlarm.AlarmTime.Minutes = next_minutes;