SAME54 MAC address reading (#289)

* Update atmel_start to latest
Update weather_click to bme280 library

* read MAC address from EEPROM for netxduo

* Print mac address at boot
Wait 30 second for DHCP timeout and print error rather than wait forever

* output humidity and pressure data

Author: ryanwinter

Microchip/ATSAME54-XPRO/app/CMakeLists.txt

@@ -8,7 +8,6 @@ set(SOURCES
     azure_config.h
     nx_client.c
     board_init.c
-    console.c
     main.c
 )
 
@@ -23,6 +22,7 @@ target_link_libraries(${PROJECT_NAME}
         app_common
         jsmn
         netxdriver
+        bme280
 )
 
 target_include_directories(${PROJECT_NAME} 

Microchip/ATSAME54-XPRO/app/board_init.c

@@ -3,12 +3,33 @@
 
 #include "board_init.h"
 
+#include "weather_click.h"
+
+#define CONF_AT24MAC_ADDRESS 0x5e
+
+extern UCHAR _nx_driver_hardware_address[];
+
+static void read_macaddress()
+{
+    const uint8_t addr = 0x9A;
+
+    i2c_m_sync_enable(&I2C_AT24MAC);
+    i2c_m_sync_set_slaveaddr(&I2C_AT24MAC, CONF_AT24MAC_ADDRESS, I2C_M_SEVEN);
+    io_write(&(I2C_AT24MAC.io), &addr, 1);
+    io_read(&(I2C_AT24MAC.io), _nx_driver_hardware_address, 6);
+}
+
 void board_init()
 {
-    /* Initializes MCU, drivers and middleware */
+    // Initializes MCU, drivers and middleware
     atmel_start_init();
-    printf("Board initialized.\r\n");
 
-    WeatherClick_initialize();
-    printf("Temperature sensor initialized.\r\n");
+    // Load the MAC address from EEPROM into NetXDuo
+    read_macaddress();
+
+    // Initialize Weather Click
+    if (init_weather_click() != BME280_OK)
+    {
+        printf("FAILED to initialize weather click board\r\n");
+    }
 }

Microchip/ATSAME54-XPRO/app/board_init.h

@@ -7,7 +7,6 @@
 #include "nx_api.h"
 
 #include "atmel_start.h"
-#include "Bosch_BME280.h"
 
 void board_init();
 

Microchip/ATSAME54-XPRO/app/console.c

@@ -5,8 +5,8 @@
 
 #include <stdio.h>
 
-#include "Bosch_BME280.h"
 #include "atmel_start.h"
+#include "weather_click.h"
 
 #include "azure_iot_mqtt.h"
 #include "json_utils.h"
@@ -181,8 +181,12 @@ UINT azure_iot_mqtt_entry(NX_IP* ip_ptr, NX_PACKET_POOL* pool_ptr, NX_DNS* dns_p
 
 #if __SENSOR_BME280__ == 1
         // Print the compensated temperature readings
-        WeatherClick_waitforRead();
-        temperature = Weather_getTemperatureDegC();
+        struct bme280_data data;
+        if (read_bme280(&data) != BME280_OK)
+        {
+            printf("FAILED to read weather click sensor\r\n");
+        }
+        temperature = data.temperature;
 #else
         temperature = 23.5;
 #endif

Microchip/ATSAME54-XPRO/app/legacy/mqtt.c

@@ -5,8 +5,8 @@
 
 #include <stdio.h>
 
-#include "Bosch_BME280.h"
 #include "atmel_start.h"
+#include "weather_click.h"
 
 #include "nx_api.h"
 #include "nx_azure_iot_hub_client.h"
@@ -23,6 +23,8 @@
 #define IOT_MODEL_ID "dtmi:azurertos:devkit:gsg;2"
 
 #define TELEMETRY_TEMPERATURE       "temperature"
+#define TELEMETRY_PRESSURE          "pressure"
+#define TELEMETRY_HUMIDITY          "humidity"
 #define TELEMETRY_INTERVAL_PROPERTY "telemetryInterval"
 #define LED_STATE_PROPERTY          "ledState"
 #define SET_LED_STATE_COMMAND       "setLedState"
@@ -85,17 +87,28 @@ static UINT append_device_info_properties(NX_AZURE_IOT_JSON_WRITER* json_writer,
 
 static UINT append_device_telemetry(NX_AZURE_IOT_JSON_WRITER* json_writer, VOID* context)
 {
-    float temperature;
+    struct bme280_data data;
 
 #if __SENSOR_BME280__ == 1
-    WeatherClick_waitforRead();
-    temperature = Weather_getTemperatureDegC();
+    if (read_bme280(&data) != BME280_OK)
+    {
+        printf("FAILED to read weather click sensor\r\n");
+    }
 #else
-    temperature = 23.5;
+    printf("Generating fake sensor data\r\n");
+    data.temperature = 23.5;
+    data.pressure    = 1001245.76;
+    data.humidity    = 78.2;
 #endif
 
     if (nx_azure_iot_json_writer_append_property_with_double_value(
-            json_writer, (UCHAR*)TELEMETRY_TEMPERATURE, sizeof(TELEMETRY_TEMPERATURE) - 1, temperature, 2))
+            json_writer, (UCHAR*)TELEMETRY_HUMIDITY, sizeof(TELEMETRY_HUMIDITY) - 1, data.humidity, 2) ||
+
+        nx_azure_iot_json_writer_append_property_with_double_value(
+            json_writer, (UCHAR*)TELEMETRY_TEMPERATURE, sizeof(TELEMETRY_TEMPERATURE) - 1, data.temperature, 2) ||
+
+        nx_azure_iot_json_writer_append_property_with_double_value(
+            json_writer, (UCHAR*)TELEMETRY_PRESSURE, sizeof(TELEMETRY_PRESSURE) - 1, data.pressure, 2))
     {
         return NX_NOT_SUCCESSFUL;
     }

Microchip/ATSAME54-XPRO/app/nx_client.c

@@ -18,4 +18,5 @@ add_subdirectory(${CORE_LIB_DIR}/netxduo netxduo)
 add_subdirectory(${CORE_LIB_DIR}/jsmn jsmn)
 
 add_subdirectory(netx_driver)
-add_subdirectory(atmel_start)
+add_subdirectory(atmel_start)
+add_subdirectory(bme280)

Microchip/ATSAME54-XPRO/lib/CMakeLists.txt

@@ -32,10 +32,20 @@ set(SOURCES
     src/hpl/ramecc/hpl_ramecc.c
     src/hpl/sercom/hpl_sercom.c
     src/stdio_redirect/stdio_io.c
-    src/temperature_sensor/BME280_WeatherClick/Bosch_BME280.c
-    src/temperature_sensor/temperature_sensor.c
 )
 
+if(CMAKE_C_COMPILER_ID STREQUAL "IAR")
+    list(APPEND SOURCES
+        src/stdio_redirect/iar/read.c
+        src/stdio_redirect/iar/write.c
+    )
+else()
+    list(APPEND SOURCES
+        src/stdio_redirect/gcc/read.c
+        src/stdio_redirect/gcc/write.c
+    )
+endif()
+
 add_library(${TARGET} OBJECT
     ${SOURCES}
 )
@@ -45,6 +55,11 @@ target_compile_definitions(${TARGET}
         __SAME54P20A__
 )
 
+target_compile_options(${TARGET}
+    PRIVATE
+        -Wno-error
+)
+
 target_include_directories(${TARGET}
     PUBLIC
         config
@@ -68,8 +83,6 @@ target_include_directories(${TARGET}
         src/hri
         src/include
         src/stdio_redirect
-        src/temperature_sensor
-        src/temperature_sensor/BME280_WeatherClick
 )
 
 target_link_libraries(${TARGET}