From 45a8cc8f0b29f447eba6047112f38780ca8a89da Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Dec 2016 01:23:09 +0300 Subject: [PATCH] cc3200: make: Rename "deploy" target to "deploy-ota". There should be target to deploy uPy over wired (UART) connection, and wired and OTA targets should be named differently. --- cc3200/README.md | 19 ++++++++++--------- cc3200/application.mk | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cc3200/README.md b/cc3200/README.md index 34e177b501..3131536085 100644 --- a/cc3200/README.md +++ b/cc3200/README.md @@ -40,15 +40,6 @@ there. Make sure to use a **v4.1 (or higer) LAUNCHXL board** when trying this po - Flash the latest service pack (servicepack_1.0.0.10.0.bin) using the "Service Pack Update" button. - Close CCS_Uniflash, remove the SOP2 jumper and reset the board. -## Updating the board to with new software version -- Make sure the board is running and connected to the same network as the computer. - -```bash -make BTARGET=application BTYPE=release BOARD=LAUNCHXL WIPY_IP=192.168.1.1 WIPY_USER=micro WIPY_PWD=python deploy -``` - -If `WIPY_IP`, `WIPY_USER` or `WIPY_PWD` are omitted the default values (the ones shown above) will be used. - ## Playing with MicroPython and the CC3200: Once the software is running, you have two options to access the MicroPython REPL: @@ -97,6 +88,16 @@ import machine machine.reset() ``` +There's a script which automates this process from the host side: + +- Make sure the board is running and connected to the same network as the computer. + +```bash +make BTARGET=application BTYPE=release BOARD=LAUNCHXL WIPY_IP=192.168.1.1 WIPY_USER=micro WIPY_PWD=python deploy-ota +``` + +If `WIPY_IP`, `WIPY_USER` or `WIPY_PWD` are omitted the default values (the ones shown above) will be used. + ### Note regarding FileZilla: Do not use the quick connect button, instead, open the site manager and create a new configuration. In the "General" tab make diff --git a/cc3200/application.mk b/cc3200/application.mk index ff5c44cd69..f2801c3376 100644 --- a/cc3200/application.mk +++ b/cc3200/application.mk @@ -206,9 +206,9 @@ WIPY_PWD ?= 'python' all: $(BUILD)/mcuimg.bin -.PHONY: deploy +.PHONY: deploy-ota -deploy: $(BUILD)/mcuimg.bin +deploy-ota: $(BUILD)/mcuimg.bin $(ECHO) "Writing $< to the board" $(Q)$(PYTHON) $(UPDATE_WIPY) --verify --ip $(WIPY_IP) --user $(WIPY_USER) --password $(WIPY_PWD) --file $<