Fix builds and restructure configs for multi interface
This commit is contained in:
		
							parent
							
								
									0cc26f4980
								
							
						
					
					
						commit
						87b59bab3b
					
				
							
								
								
									
										28
									
								
								Boards.h
									
									
									
									
									
								
							
							
						
						
									
										28
									
								
								Boards.h
									
									
									
									
									
								
							@ -134,11 +134,10 @@
 | 
				
			|||||||
      #define I2C_SDA 21
 | 
					      #define I2C_SDA 21
 | 
				
			||||||
      #define I2C_SCL 22
 | 
					      #define I2C_SCL 22
 | 
				
			||||||
      #define PMU_IRQ 35
 | 
					      #define PMU_IRQ 35
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      const int pin_led_rx = 2;
 | 
					      const int pin_led_rx = 2;
 | 
				
			||||||
      const int pin_led_tx = 4;
 | 
					      const int pin_led_tx = 4;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define INTERFACE_COUNT 1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX1262};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX1262};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX1262
 | 
					                    // SX1262
 | 
				
			||||||
@ -168,11 +167,10 @@
 | 
				
			|||||||
      #define HAS_BLUETOOTH true
 | 
					      #define HAS_BLUETOOTH true
 | 
				
			||||||
      #define HAS_CONSOLE true
 | 
					      #define HAS_CONSOLE true
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      const int pin_led_rx = 14;
 | 
					      const int pin_led_rx = 14;
 | 
				
			||||||
      const int pin_led_tx = 32;
 | 
					      const int pin_led_tx = 32;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define INTERFACE_COUNT 1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX127X
 | 
					                    // SX127X
 | 
				
			||||||
@ -205,6 +203,7 @@
 | 
				
			|||||||
      #define HAS_BLE true
 | 
					      #define HAS_BLE true
 | 
				
			||||||
      #define HAS_CONSOLE true
 | 
					      #define HAS_CONSOLE true
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      const int pin_cs = 18;
 | 
					      const int pin_cs = 18;
 | 
				
			||||||
      const int pin_reset = 14;
 | 
					      const int pin_reset = 14;
 | 
				
			||||||
      const int pin_dio = 26;
 | 
					      const int pin_dio = 26;
 | 
				
			||||||
@ -216,8 +215,6 @@
 | 
				
			|||||||
        const int pin_led_tx = 2;
 | 
					        const int pin_led_tx = 2;
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define INTERFACE_COUNT 1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX1276};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX1276};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX1276
 | 
					                    // SX1276
 | 
				
			||||||
@ -250,6 +247,7 @@
 | 
				
			|||||||
      #define HAS_BLE true
 | 
					      #define HAS_BLE true
 | 
				
			||||||
      #define HAS_CONSOLE true
 | 
					      #define HAS_CONSOLE true
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      const int pin_cs = 18;
 | 
					      const int pin_cs = 18;
 | 
				
			||||||
      const int pin_reset = 12;
 | 
					      const int pin_reset = 12;
 | 
				
			||||||
      const int pin_dio = 26;
 | 
					      const int pin_dio = 26;
 | 
				
			||||||
@ -261,7 +259,6 @@
 | 
				
			|||||||
        const int pin_led_tx = 22;
 | 
					        const int pin_led_tx = 22;
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define INTERFACE_COUNT 1
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
@ -296,6 +293,9 @@
 | 
				
			|||||||
      #define HAS_PMU true
 | 
					      #define HAS_PMU true
 | 
				
			||||||
      #define HAS_CONSOLE true
 | 
					      #define HAS_CONSOLE true
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
				
			||||||
      #if HAS_TCXO == true
 | 
					      #if HAS_TCXO == true
 | 
				
			||||||
        const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					        const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                        // SX127X
 | 
					                        // SX127X
 | 
				
			||||||
@ -329,10 +329,6 @@
 | 
				
			|||||||
        const int pin_led_tx = 25;
 | 
					        const int pin_led_tx = 25;
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define INTERFACE_COUNT 1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      #if HAS_TCXO == false
 | 
					      #if HAS_TCXO == false
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX127X
 | 
					                    // SX127X
 | 
				
			||||||
@ -366,6 +362,7 @@
 | 
				
			|||||||
      #define HAS_BLUETOOTH true
 | 
					      #define HAS_BLUETOOTH true
 | 
				
			||||||
      #define HAS_CONSOLE true
 | 
					      #define HAS_CONSOLE true
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      #if defined(EXTERNAL_LEDS)
 | 
					      #if defined(EXTERNAL_LEDS)
 | 
				
			||||||
        const int pin_led_rx = 36;
 | 
					        const int pin_led_rx = 36;
 | 
				
			||||||
        const int pin_led_tx = 37;
 | 
					        const int pin_led_tx = 37;
 | 
				
			||||||
@ -374,8 +371,6 @@
 | 
				
			|||||||
        const int pin_led_tx = 25;
 | 
					        const int pin_led_tx = 25;
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define INTERFACE_COUNT 1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX127X
 | 
					                    // SX127X
 | 
				
			||||||
@ -456,6 +451,7 @@
 | 
				
			|||||||
      #define HAS_NP true
 | 
					      #define HAS_NP true
 | 
				
			||||||
      #define HAS_CONSOLE true
 | 
					      #define HAS_CONSOLE true
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      const int pin_cs = 18;
 | 
					      const int pin_cs = 18;
 | 
				
			||||||
      const int pin_reset = 12;
 | 
					      const int pin_reset = 12;
 | 
				
			||||||
      const int pin_dio = 26;
 | 
					      const int pin_dio = 26;
 | 
				
			||||||
@ -470,6 +466,7 @@
 | 
				
			|||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX1276};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX1276};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX1276
 | 
					                    // SX1276
 | 
				
			||||||
@ -504,6 +501,7 @@
 | 
				
			|||||||
      #define HAS_NP true
 | 
					      #define HAS_NP true
 | 
				
			||||||
      #define HAS_SD false
 | 
					      #define HAS_SD false
 | 
				
			||||||
      #define HAS_EEPROM true
 | 
					      #define HAS_EEPROM true
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      const int pin_np = 12;
 | 
					      const int pin_np = 12;
 | 
				
			||||||
      const int pin_dac = 25;
 | 
					      const int pin_dac = 25;
 | 
				
			||||||
      const int pin_adc = 34;
 | 
					      const int pin_adc = 34;
 | 
				
			||||||
@ -521,6 +519,7 @@
 | 
				
			|||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX127X};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX127X
 | 
					                    // SX127X
 | 
				
			||||||
@ -548,7 +547,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    #elif BOARD_MODEL == BOARD_RNODE_NG_22
 | 
					    #elif BOARD_MODEL == BOARD_RNODE_NG_22
 | 
				
			||||||
      #define IS_ESP32S3 true
 | 
					      #define IS_ESP32S3 true
 | 
				
			||||||
      #define MODEM SX1262
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      #define HAS_DISPLAY true
 | 
					      #define HAS_DISPLAY true
 | 
				
			||||||
      #define DISPLAY OLED
 | 
					      #define DISPLAY OLED
 | 
				
			||||||
@ -564,6 +562,7 @@
 | 
				
			|||||||
      #define HAS_SLEEP true
 | 
					      #define HAS_SLEEP true
 | 
				
			||||||
      #define PIN_WAKEUP GPIO_NUM_0
 | 
					      #define PIN_WAKEUP GPIO_NUM_0
 | 
				
			||||||
      #define WAKEUP_LEVEL 0
 | 
					      #define WAKEUP_LEVEL 0
 | 
				
			||||||
 | 
					      #define INTERFACE_COUNT 1
 | 
				
			||||||
      // #define PIN_DISP_SLEEP 21
 | 
					      // #define PIN_DISP_SLEEP 21
 | 
				
			||||||
      // #define DISP_SLEEP_LEVEL HIGH
 | 
					      // #define DISP_SLEEP_LEVEL HIGH
 | 
				
			||||||
      const int pin_btn_usr1 = 0;
 | 
					      const int pin_btn_usr1 = 0;
 | 
				
			||||||
@ -586,6 +585,7 @@
 | 
				
			|||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
      #endif
 | 
					      #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      const uint8_t interfaces[INTERFACE_COUNT] = {SX1262};
 | 
					      const uint8_t interfaces[INTERFACE_COUNT] = {SX1262};
 | 
				
			||||||
      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
					      const bool interface_cfg[INTERFACE_COUNT][3] = { 
 | 
				
			||||||
                    // SX1262
 | 
					                    // SX1262
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user