Merge pull request RIOT-OS/applications#72 from miri64/release/enh/20…

…20.07 RIOT: update to 2020.07
chrysn-pull-requests · Sep 20, 2022 · 9db3138 · 9db3138
2 parents 5b40f96 + 0fb6a17
commit 9db3138
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/RIOT b/RIOT
diff --git a/coap-chat/coap.c b/coap-chat/coap.c
@@ -93,20 +93,21 @@ static size_t _send(uint8_t *buf, size_t len, char *addr_str)
     memcpy(&remote.addr.ipv6[0], &addr.u8[0], sizeof(addr.u8));
 
     /* parse port */
-    remote.port = GCOAP_PORT;
+    remote.port = CONFIG_GCOAP_PORT;
 
     return gcoap_req_send(buf, len, &remote, NULL, NULL);
 }
 
 int coap_post(char *addr, char *msgbuf, size_t msglen)
 {
-    assert(msglen < GCOAP_PDU_BUF_SIZE);
+    assert(msglen < CONFIG_GCOAP_PDU_BUF_SIZE);
 
     coap_pkt_t pdu;
-    uint8_t buf[GCOAP_PDU_BUF_SIZE];
+    uint8_t buf[CONFIG_GCOAP_PDU_BUF_SIZE];
     size_t len = 0;
 
-    gcoap_req_init(&pdu, buf, GCOAP_PDU_BUF_SIZE, COAP_POST, COAP_CHAT_PATH);
+    gcoap_req_init(&pdu, buf, CONFIG_GCOAP_PDU_BUF_SIZE,
+                   COAP_POST, COAP_CHAT_PATH);
 
     memcpy(pdu.payload, msgbuf, msglen);
 

diff --git a/spectrum-scanner/main.c b/spectrum-scanner/main.c
@@ -73,7 +73,7 @@ void spectrum_scanner(unsigned long interval_us)
 
     while (1) {
         /* Stack optimization, statically allocate this buffer */
-        static float ed_average[GNRC_NETIF_NUMOF][IEEE802154_CHANNEL_MAX + 1];
+        float ed_average[netif_numof][IEEE802154_CHANNEL_MAX + 1];
 
         memset(ed_average, 0, sizeof(ed_average));
 

diff --git a/spectrum-scanner/tools/plot_rssi.py b/spectrum-scanner/tools/plot_rssi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Copyright (C) 2017  Eistec AB
 #