giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Edvard Pettersen 2018-07-26 16:39:37 +02:00
parent 7debfe830f
commit 537f9a5baf
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds
View File

@ -29,10 +29,6 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* ======== CC1310_LAUNCHXL_NoRTOS.lds ========
* Default Linker script for the Texas Instruments CC1310
*/
MIN_STACKSIZE = 0x800; /* 2048 bytes */ MIN_STACKSIZE = 0x800; /* 2048 bytes */
HEAPSIZE = 0x100; /* 256 bytes */ HEAPSIZE = 0x100; /* 256 bytes */

4
arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds
View File

@ -29,10 +29,6 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* ======== CC26X2R1_LAUNCHXL_NoRTOS.lds ========
* Default Linker script for the Texas Instruments CC1352
*/
MIN_STACKSIZE = 0x800; /* 2048 bytes */ MIN_STACKSIZE = 0x800; /* 2048 bytes */
HEAPSIZE = 0x100; /* 256 bytes */ HEAPSIZE = 0x100; /* 256 bytes */

8
examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
View File

@ -98,18 +98,18 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* User configuration */ /* User configuration */
/* Take a sensor reading on button press */ /* Take a sensor reading on button press */
#define CC26XX_WEB_DEMO_SENSOR_READING_TRIGGER BOARD_BUTTON_HAL_INDEX_KEY_LEFT #define CC26XX_WEB_DEMO_SENSOR_READING_TRIGGER BUTTON_HAL_ID_KEY_LEFT
/* Payload length of ICMPv6 echo requests used to measure RSSI with def rt */ /* Payload length of ICMPv6 echo requests used to measure RSSI with def rt */
#define CC26XX_WEB_DEMO_ECHO_REQ_PAYLOAD_LEN 20 #define CC26XX_WEB_DEMO_ECHO_REQ_PAYLOAD_LEN 20
#if BOARD_SENSORTAG #if BOARD_SENSORTAG
/* Force an MQTT publish on sensor event */ /* Force an MQTT publish on sensor event */
#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BOARD_BUTTON_HAL_INDEX_REED_RELAY #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BUTTON_HAL_ID_REED_RELAY
#elif BOARD_LAUNCHPAD #elif BOARD_LAUNCHPAD
#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BOARD_BUTTON_HAL_INDEX_KEY_LEFT #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BUTTON_HAL_ID_KEY_LEFT
#else #else
#define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BOARD_BUTTON_HAL_INDEX_KEY_DOWN #define CC26XX_WEB_DEMO_MQTT_PUBLISH_TRIGGER BUTTON_HAL_ID_KEY_DOWN
#endif #endif
#define CC26XX_WEB_DEMO_STATUS_LED LEDS_GREEN #define CC26XX_WEB_DEMO_STATUS_LED LEDS_GREEN

8
examples/platform-specific/simplelink/cc13xx-cc26xx/web-demo/web-demo.c
View File

@ -580,7 +580,7 @@ get_tmp_reading()
(random_rand() % SENSOR_READING_RANDOM); (random_rand() % SENSOR_READING_RANDOM);
if(tmp_amb_reading.publish || tmp_obj_reading.publish) { if(tmp_amb_reading.publish || tmp_obj_reading.publish) {
if(tmp_007_sensor.value(TMP_007_SENSOR_TYPE_ALL) == if(tmp_007_sensor.value(TMP_007_TYPE_ALL) ==
TMP_007_READING_ERROR) { TMP_007_READING_ERROR) {
SENSORS_DEACTIVATE(tmp_007_sensor); SENSORS_DEACTIVATE(tmp_007_sensor);
@ -589,7 +589,7 @@ get_tmp_reading()
} }
if(tmp_amb_reading.publish) { if(tmp_amb_reading.publish) {
value = tmp_007_sensor.value(TMP_007_SENSOR_TYPE_AMBIENT); value = tmp_007_sensor.value(TMP_007_TYPE_AMBIENT);
tmp_amb_reading.raw = value; tmp_amb_reading.raw = value;
compare_and_update(&tmp_amb_reading); compare_and_update(&tmp_amb_reading);
@ -601,7 +601,7 @@ get_tmp_reading()
} }
if(tmp_obj_reading.publish) { if(tmp_obj_reading.publish) {
value = tmp_007_sensor.value(TMP_007_SENSOR_TYPE_OBJECT); value = tmp_007_sensor.value(TMP_007_TYPE_OBJECT);
tmp_obj_reading.raw = value; tmp_obj_reading.raw = value;
compare_and_update(&tmp_obj_reading); compare_and_update(&tmp_obj_reading);
@ -640,7 +640,7 @@ get_hdc_reading()
} }
if(hdc_hum_reading.publish) { if(hdc_hum_reading.publish) {
value = hdc_1000_sensor.value(HDC_1000_SENSOR_TYPE_HUMIDITY); value = hdc_1000_sensor.value(HDC_1000_SENSOR_TYPE_HUMID);
if(value != HDC_1000_READING_ERROR) { if(value != HDC_1000_READING_ERROR) {
hdc_hum_reading.raw = value; hdc_hum_reading.raw = value;