Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MP1 update #774

Merged
merged 6 commits into from Nov 18, 2019
Merged

MP1 update #774

merged 6 commits into from Nov 18, 2019

Conversation

fpistm
Copy link
Member

@fpistm fpistm commented Nov 15, 2019

This PR:

I will probably also update the generated script name with the sketch name.
@kbumsik as discussed in stm32duino/Arduino_Tools#47 (comment), do you think it is correct to use sed in the generate part of the script?
Done

Maybe I will add the MP1 Cube update 1.1.1:

  • HAL and CMIS device not changed
  • OpenAMP updated to v1.0.3

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
in engineering mode only.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
@fpistm fpistm self-assigned this Nov 15, 2019
@fpistm fpistm added this to In progress in STM32 core based on ST HAL via automation Nov 15, 2019
@fpistm fpistm added this to the 1.8.0🎄 🎅 milestone Nov 15, 2019
@kbumsik
Copy link
Contributor

kbumsik commented Nov 15, 2019

@fpistm

do you think it is correct to use sed in the generate part of the script?

Yes. I tested it.

diff --git a/run_arduino_gen.sh b/run_arduino_gen.sh
index 3b67ecba..2704625f 100755
--- a/run_arduino_gen.sh
+++ b/run_arduino_gen.sh
@@ -219,10 +219,11 @@ case "$1" in
     TERM=xterm minicom -D $RPMSG_DIR
     ;;
   generate)
-    generate_packaged_script $2 $3
-    echo "$(readlink -f "$3") generated successfully."
+    output=$(echo "$3" | sed 's/\.ino\././g')
+    generate_packaged_script $2 $output
+    echo "$(readlink -f "$output") generated successfully."
     echo "This file should be uploaded manually by SCP, SFTP, Kermit, or etc."
-    echo "Then run \"sh ./$(basename $3) start\" command in the board's console."
+    echo "Then run \"sh ./$(basename $output) start\" command in the board's console."
     echo "For detailed instructions, please visit:"
     echo "  https://github.com/stm32duino/Arduino_Core_STM32/tree/master/variants/STM32MP157_DK/README.md"
     ;;

should work, tested in Linux and Windows.

@fpistm
Copy link
Member Author

fpistm commented Nov 18, 2019

Well,
I guess this PR could be merged when CI build will be ended.

Copy link
Contributor

@kbumsik kbumsik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just spotted some while I read through the rendered README.md. It should be fine for me otherwise.

variants/STM32MP157_DK/README.md Outdated Show resolved Hide resolved
variants/STM32MP157_DK/README.md Outdated Show resolved Hide resolved
variants/STM32MP157_DK/README.md Outdated Show resolved Hide resolved
Co-Authored-By: Bumsik Kim <k.bumsik@gmail.com>
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
@fpistm fpistm merged commit 42efbeb into stm32duino:master Nov 18, 2019
STM32 core based on ST HAL automation moved this from In progress to Done Nov 18, 2019
@fpistm fpistm deleted the MP1_update branch November 18, 2019 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants