Merge branch 'porting'

Inc/main.h

@@ -71,17 +71,27 @@
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
+extern uint32_t led_tx_countdown;
+extern uint32_t led_rx_countdown;
+#define DATA_FLASH_TIME 5000
 
 /* Private define ------------------------------------------------------------*/
 
-#define LED_Pin LL_GPIO_PIN_13
 #define LED_GPIO_Port GPIOC
-#define NRF_IRQ_Pin LL_GPIO_PIN_2
+#define LED1_Pin LL_GPIO_PIN_13
+#define LEDRX_Pin LL_GPIO_PIN_14
+#define LEDTX_Pin LL_GPIO_PIN_15
+
+#define NRF_IRQ_Pin LL_GPIO_PIN_1
 #define NRF_IRQ_GPIO_Port GPIOA
 #define NRF_CE_Pin LL_GPIO_PIN_3
 #define NRF_CE_GPIO_Port GPIOA
-#define NRF_NSS_Pin LL_GPIO_PIN_4
+#define NRF_NSS_Pin LL_GPIO_PIN_2
 #define NRF_NSS_GPIO_Port GPIOA
+#define RENUM_Pin LL_GPIO_PIN_0
+#define RENUM_GPIO_Port GPIOA
+#define NRF_RESET_Pin LL_GPIO_PIN_9
+#define NRF_RESET_GPIO_Port GPIOB
 
 /* ########################## Assert Selection ############################## */
 /**

Inc/nrf.h

@@ -6,7 +6,7 @@
 #define GEX_NRF_NRF_H
 
 /*
- * nordic.h
+ * nordic.h - adapted from http://barefootelectronics.com/NRF24L01.aspx
  *
  * Created:12/16/2013 3:36:04 PM
  *  Author: Tom
@@ -21,8 +21,11 @@
 
 #include "main.h"
 
+#define NRF_CHANNEL 76
+
+
 #define dbg_nrf(...) do{}while(0)
-//#define dbg_nrf(...) dbg(##__VA_ARGS__)
+//#define dbg_nrf dbg
 
 // Initialize SPI and the Nordic
 

Src/gex_gateway.c

@@ -48,8 +48,6 @@ static uint8_t  txmsg_payload[MAX_FRAME_LEN]; // equal buffer size in GEX
 static uint8_t txmsg_addr = 0;
 static uint8_t txmsg_cksum = 0;
 
-#define MAGIC_GW_COMMAND 0x47U // 'G'
-
 enum GW_CMD {
     CMD_GET_ID = 'i', // 105 - get network ID
     CMD_RESET = 'r', // reset the radio and network
@@ -147,12 +145,6 @@ void gw_handle_usb_out(uint8_t *buffer)
         PayloadParser pp = pp_start(buffer, 64, NULL);
 
         // handle binary commands for the gateway
-
-        // magic twice, one inverted - denotes a gateway command
-        const uint16_t magic1 = pp_u8(&pp);
-        const uint16_t magic2 = pp_u8(&pp);
-        if (magic1 == MAGIC_GW_COMMAND && magic2 == (0xFFU & (~MAGIC_GW_COMMAND))) {
-            // third byte is the command code
         switch (pp_u8(&pp)) {
             case CMD_GET_ID:
                 respond_gw_id();
@@ -179,6 +171,8 @@ void gw_handle_usb_out(uint8_t *buffer)
                     break;
                 }
 
+                LL_GPIO_SetOutputPin(LED_GPIO_Port, LEDTX_Pin);
+                led_tx_countdown = DATA_FLASH_TIME;
                 start_slave_cmd(slave_addr, frame_len, cksum);
                 dbg_nrf("Collecting frame for slave %02x: %d bytes", (int)slave_addr, (int)frame_len);
                 cmd_state = CMD_STATE_TXMSG;
@@ -192,12 +186,9 @@ void gw_handle_usb_out(uint8_t *buffer)
             default:
                 dbg("Bad cmd");
         }
-        } else {
-            // Bad frame??
-            dbg("Bad USB frame, starts %x,%x", buffer[0],buffer[1]);
-        }
     }
     else if (cmd_state == CMD_STATE_TXMSG) {
+        led_tx_countdown = DATA_FLASH_TIME;
         handle_txframe_chunk(buffer, 64);
     }
 }
@@ -285,9 +276,9 @@ void gw_setup_radio(void)
     NRF_ModeRX(); // base state is RX
 }
 
-void EXTI2_IRQHandler(void)
+void EXTI1_IRQHandler(void)
 {
-    LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_2);
+    LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_1);
 
     struct msg_data m;
     m.msg_type = MSG_TYPE_DATA;
@@ -298,6 +289,9 @@ void EXTI2_IRQHandler(void)
         dbg("IRQ but no msg!");
     }
     else {
+        LL_GPIO_SetOutputPin(LED_GPIO_Port, LEDRX_Pin);
+        led_rx_countdown = DATA_FLASH_TIME;
+
         dbg_nrf("Msg RXd from nordic!");
 
         m.dev_addr = NRF_PipeNum2Addr(pipenum);

Src/gpio.c

@@ -77,44 +77,55 @@ void MX_GPIO_Init(void)
     LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOC);
     LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOD);
     LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA);
+    LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOB);
 
     /**/
-  LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED_Pin);
 
     /**/
 //  LL_GPIO_ResetOutputPin(GPIOA, NRF_CE_Pin|NRF_NSS_Pin);
 
     /**/
-  GPIO_InitStruct.Pin = LED_Pin;
+    GPIO_InitStruct.Pin = LED1_Pin | LEDRX_Pin | LEDTX_Pin;
     GPIO_InitStruct.Mode = LL_GPIO_MODE_OUTPUT;
     GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_LOW;
     GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
     LL_GPIO_Init(LED_GPIO_Port, &GPIO_InitStruct);
 
     /**/
-  GPIO_InitStruct.Pin = NRF_CE_Pin|NRF_NSS_Pin;
+    GPIO_InitStruct.Pin = NRF_CE_Pin | NRF_NSS_Pin | RENUM_Pin;
     GPIO_InitStruct.Mode = LL_GPIO_MODE_OUTPUT;
     GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_LOW;
     GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
     LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    GPIO_InitStruct.Pin = NRF_RESET_Pin;
+    GPIO_InitStruct.Mode = LL_GPIO_MODE_OUTPUT;
+    GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
+    LL_GPIO_Init(NRF_RESET_GPIO_Port, &GPIO_InitStruct);
+
 #if 1
     /**/
-  LL_GPIO_AF_SetEXTISource(LL_GPIO_AF_EXTI_PORTA, LL_GPIO_AF_EXTI_LINE2);
+    LL_GPIO_AF_SetEXTISource(LL_GPIO_AF_EXTI_PORTA, LL_GPIO_AF_EXTI_LINE1); // IRQ on PA1
 
     /**/
-  EXTI_InitStruct.Line_0_31 = LL_EXTI_LINE_2;
+    EXTI_InitStruct.Line_0_31 = LL_EXTI_LINE_1;
     EXTI_InitStruct.LineCommand = ENABLE;
     EXTI_InitStruct.Mode = LL_EXTI_MODE_IT;
     EXTI_InitStruct.Trigger = LL_EXTI_TRIGGER_FALLING;
     LL_EXTI_Init(&EXTI_InitStruct);
 
-  NVIC_EnableIRQ(EXTI2_IRQn);
+    NVIC_EnableIRQ(EXTI1_IRQn);
 
     /**/
     LL_GPIO_SetPinMode(NRF_IRQ_GPIO_Port, NRF_IRQ_Pin, LL_GPIO_MODE_FLOATING);
 #endif
 
+    LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED1_Pin);
+    LL_GPIO_ResetOutputPin(LED_GPIO_Port, LEDRX_Pin);
+    LL_GPIO_ResetOutputPin(LED_GPIO_Port, LEDTX_Pin);
+    LL_GPIO_SetOutputPin(RENUM_GPIO_Port, RENUM_Pin);
+    LL_GPIO_SetOutputPin(NRF_RESET_GPIO_Port, NRF_RESET_Pin);
 }
 
 /* USER CODE BEGIN 2 */

Src/main.c

@@ -61,6 +61,9 @@
 
 /* USER CODE BEGIN Includes */
 
+uint32_t led_tx_countdown = 0;
+uint32_t led_rx_countdown = 0;
+
 /* USER CODE END Includes */
 
 /* Private variables ---------------------------------------------------------*/
@@ -82,7 +85,7 @@ void SystemClock_Config(void);
 
 /* USER CODE END 0 */
 
-extern void EXTI2_IRQHandler(void);
+extern void EXTI1_IRQHandler(void);
 
 /**
   * @brief  The application entry point.
@@ -113,6 +116,7 @@ int main(void)
 
     LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOC);
     LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOD);
+    LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOB);
     LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA);
 
     /* Initialize all configured peripherals */
@@ -123,23 +127,46 @@ int main(void)
     MX_USART1_UART_Init();
     /* USER CODE BEGIN 2 */
 
+    // give juice to the nrf module
+    LL_GPIO_ResetOutputPin(NRF_RESET_GPIO_Port, NRF_RESET_Pin);
     /* USER CODE END 2 */
 
     gw_setup_radio();
     mq_init(&usb_inq);
 
+    // re-enumerate USB
+    LL_GPIO_SetOutputPin(RENUM_GPIO_Port, RENUM_Pin);
+    LL_mDelay(100);
+    LL_GPIO_ResetOutputPin(RENUM_GPIO_Port, RENUM_Pin);
+
     dbg("Main loop starts.");
     /* Infinite loop */
     /* USER CODE BEGIN WHILE */
-    int cnt = 0;
+    uint32_t cnt = 0;
     uint8_t buff[MQ_SLOT_LEN];
 
     while (1) {
-        if (cnt++ > 500000) {
+        cnt++;
-            LL_GPIO_TogglePin(LED_GPIO_Port, LED_Pin);
+        if (cnt > 1400000) {
+            LL_GPIO_SetOutputPin(LED_GPIO_Port, LED1_Pin);
+        }
+        if (cnt > 1500000) {
+            LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED1_Pin);
             cnt = 0;
         }
 
+        if (led_tx_countdown > 0) {
+            if (--led_tx_countdown == 0) {
+                LL_GPIO_ResetOutputPin(LED_GPIO_Port, LEDTX_Pin);
+            }
+        }
+
+        if (led_rx_countdown > 0) {
+            if (--led_rx_countdown == 0) {
+                LL_GPIO_ResetOutputPin(LED_GPIO_Port, LEDRX_Pin);
+            }
+        }
+
         if (mq_can_read(&usb_inq)) {
             if (!usb_tx_busy) {
                 mq_read(&usb_inq, buff);
@@ -160,15 +187,13 @@ void SystemClock_Config(void)
 
     LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
 
-   if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2)
+    if (LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2) {
-  {
         Error_Handler();
     }
     LL_RCC_HSE_Enable();
 
     /* Wait till HSE is ready */
-  while(LL_RCC_HSE_IsReady() != 1)
+    while (LL_RCC_HSE_IsReady() != 1) {
-  {
 
     }
     LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_HSE_DIV_1, LL_RCC_PLL_MUL_9);
@@ -176,8 +201,7 @@ void SystemClock_Config(void)
     LL_RCC_PLL_Enable();
 
     /* Wait till PLL is ready */
-  while(LL_RCC_PLL_IsReady() != 1)
+    while (LL_RCC_PLL_IsReady() != 1) {
-  {
 
     }
     LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
@@ -189,8 +213,7 @@ void SystemClock_Config(void)
     LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
 
     /* Wait till System clock is ready */
-  while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL)
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL) {
-  {
 
     }
     LL_Init1msTick(72000000);
@@ -202,7 +225,7 @@ void SystemClock_Config(void)
     LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL_DIV_1_5);
 
     /* SysTick_IRQn interrupt configuration */
-  NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+    NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 0, 0));
 }
 
 /* USER CODE BEGIN 4 */
@@ -219,13 +242,13 @@ void _Error_Handler(char *file, int line)
 {
     /* USER CODE BEGIN Error_Handler_Debug */
     /* User can add his own implementation to report the HAL error return state */
-  while(1)
+    while (1) {
-  {
     }
     /* USER CODE END Error_Handler_Debug */
 }
 
 #ifdef  USE_FULL_ASSERT
+
 /**
   * @brief  Reports the name of the source file and the source line number
   *         where the assert_param error has occurred.
@@ -233,13 +256,14 @@ void _Error_Handler(char *file, int line)
   * @param  line: assert_param error line source number
   * @retval None
   */
-void assert_failed(uint8_t* file, uint32_t line)
+void assert_failed(uint8_t *file, uint32_t line)
 {
     /* USER CODE BEGIN 6 */
     /* User can add his own implementation to report the file name and line number,
        tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
     /* USER CODE END 6 */
 }
+
 #endif /* USE_FULL_ASSERT */
 
 /**

Src/nrf.c

@@ -492,6 +492,7 @@ void NRF_Init(uint8_t pSpeed)
     NSS(1);
     CE(0);
 
+    dbg_nrf("Waiting for module start...");
     LL_mDelay(200);
 
     for (int i = 0; i < 6; i++) {
@@ -499,11 +500,12 @@ void NRF_Init(uint8_t pSpeed)
         nrf_pipe_enabled[i] = 0;
     }
 
+    dbg_nrf("init regs");
     // clear flags etc
     NRF_PowerDown();
     NRF_FlushRx();
     NRF_FlushTx();
-    NRF_WriteRegister(RG_STATUS, 0x70);
+    NRF_WriteRegister(RG_STATUS, 0x70); // this will fail to verify, that's OK
 
     NRF_WriteRegister(RG_CONFIG, ModeBits);
     NRF_WriteRegister(RG_SETUP_AW, 0b11);             // 5 byte addresses
@@ -511,7 +513,7 @@ void NRF_Init(uint8_t pSpeed)
     NRF_WriteRegister(RG_EN_RXADDR, 0x01); // disable all except 1 which we'll assign later
 
     NRF_WriteRegister(RG_SETUP_RETR, 0x18);        // 8 retries, 500 ms
-    NRF_WriteRegister(RG_RF_CH, 76);                // channel
+    NRF_WriteRegister(RG_RF_CH, NRF_CHANNEL);                // channel
 
     NRF_WriteRegister(RG_RF_SETUP, pSpeed);
 
@@ -521,4 +523,5 @@ void NRF_Init(uint8_t pSpeed)
 //    for (int i = 0; i < 6; i++) {
 //        NRF_WriteRegister(RG_RX_PW_P0+i, 32);      // Receive 32 byte packets - XXX this is probably not needed with dynamic length
 //    }
+    dbg_nrf("nrf init finished");
 }