fix conflicts manually

smartmeio · Jan 20, 2022 · 0b9bf01 · 0b9bf01
2 parents 1aef15a + a05d706
commit 0b9bf01
Show file tree

Hide file tree

Showing 103 changed files with 8,293 additions and 3,374 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,7 +22,7 @@
 #                   REPO_BASE_URL:  url di base del repository: https://download.smartme.io
 #
 
-image: smartmeio/arancino-library-build
+image: smartmeio/arancino-library-build:0.18.3
 
 
 stages:
@@ -59,6 +59,7 @@ start:
 push:
   stage: start
   only: ['tags']
+  when: manual
   except: ['master', 'branches']
 
   allow_failure: true
@@ -85,29 +86,113 @@ push:
       else
         git push github ${CI_COMMIT_TAG}
       fi
-    - git push github --all --force
+    - git push --all --force github
 
 #################################
 #######       TEST        #######
 #################################
 
-#######    CLI Sketch Test Job    #######
-cli-test:
+#######    CLI Sketch Test Job for SAMD platform #######
+cli-test-samd:
   stage: test
-  #only: ['tags']
-  #except: ['master', 'branches']
+  only: ['tags']
+  except: ['master', 'branches']
 
   # copying the Library source to the Arduino libraries folder
   before_script:
     - sed -i "s/version=.*/version=${CI_COMMIT_TAG}/g" library.properties
+    - mkdir -p ${HOME}/Arduino/libraries
     - cp -r ${CI_PROJECT_DIR} ${HOME}/Arduino/libraries/Arancino
     - chmod +x ./test/arduino-cli-test.sh
+    - arduino-cli update
+    - >
+      if [ -z ${CORE_SAMD_VERSION} ]; then
+        arduino-cli core install smartme.IO:samd
+      else
+        arduino-cli core install smartme.IO:samd@${CORE_SAMD_VERSION}
+      fi
+    - arduino-cli lib install "SparkFun ADXL345 Arduino Library"
 
   # we feed the test scripts the simple board to complete the FQBN entry
   script:
     - ./test/arduino-cli-test.sh arancino
     - ./test/arduino-cli-test.sh arancino_mignon
 
+#######    CLI Sketch Test Job for NRF52 platform #######
+cli-test-nrf52:
+  stage: test
+  only: ['tags']
+  except: ['master', 'branches']
+
+  # copying the Library source to the Arduino libraries folder
+  before_script:
+    - sed -i "s/version=.*/version=${CI_COMMIT_TAG}/g" library.properties
+    - mkdir -p ${HOME}/Arduino/libraries
+    - cp -r ${CI_PROJECT_DIR} ${HOME}/Arduino/libraries/Arancino
+    - chmod +x ./test/arduino-cli-test-nrf52.sh
+    - arduino-cli update
+    - >
+      if [ -z ${CORE_NRF52_VERSION} ]; then
+        arduino-cli core install smartme.IO:nrf52
+      else
+        arduino-cli core install smartme.IO:nrf52@${CORE_NRF52_VERSION}
+      fi
+    - arduino-cli lib install "SparkFun ADXL345 Arduino Library"
+
+  # we feed the test scripts the simple board to complete the FQBN entry
+  script:
+    - ./test/arduino-cli-test-nrf52.sh arancinoVolante
+
+#######    CLI Sketch Test Job for STM32 platform #######
+cli-test-stm32:
+  stage: test
+  only: ['tags']
+  except: ['master', 'branches']
+
+  # copying the Library source to the Arduino libraries folder
+  before_script:
+    - sed -i "s/version=.*/version=${CI_COMMIT_TAG}/g" library.properties
+    - mkdir -p ${HOME}/Arduino/libraries
+    - cp -r ${CI_PROJECT_DIR} ${HOME}/Arduino/libraries/Arancino
+    - chmod +x ./test/arduino-cli-test-stm32.sh
+    - arduino-cli update
+    - >
+      if [ -z ${CORE_STM32_VERSION} ]; then
+        arduino-cli core install smartme.IO:stm32
+      else
+        arduino-cli core install smartme.IO:stm32@${CORE_STM32_VERSION}
+      fi
+    - arduino-cli lib install "SparkFun ADXL345 Arduino Library"
+
+  # we feed the test scripts the simple board to complete the FQBN entry
+  script:
+    - ./test/arduino-cli-test-stm32.sh ArancinoV
+
+#######    CLI Sketch Test Job for RP2040 platform #######
+cli-test-rp2040:
+  stage: test
+  only: ['tags']
+  except: ['master', 'branches']
+
+  # copying the Library source to the Arduino libraries folder
+  before_script:
+    - sed -i "s/version=.*/version=${CI_COMMIT_TAG}/g" library.properties
+    - mkdir -p ${HOME}/Arduino/libraries
+    - cp -r ${CI_PROJECT_DIR} ${HOME}/Arduino/libraries/Arancino
+    - chmod +x ./test/arduino-cli-test-rp2040.sh
+    - arduino-cli update
+    - >
+      if [ -z ${CORE_RP2040_VERSION} ]; then
+        arduino-cli core install smartme.IO:rp2040
+      else
+        arduino-cli core install smartme.IO:rp2040@${CORE_RP2040_VERSION}
+      fi
+    - arduino-cli lib install "SparkFun ADXL345 Arduino Library"
+
+  # we feed the test scripts the simple board to complete the FQBN entry
+  script:
+    - ./test/arduino-cli-test-rp2040.sh arancinopico
+
 #######    Package Release    #######
 #esegue la compressione del pacchetto quando viene creato un tag (ovvero ad ogni release)
 package_release:
@@ -121,7 +206,7 @@ package_release:
     #- DATE="$(cat tmp/date.tmp)"
     # packaging for PlatformIO
     - jq --arg tag_ver ${CI_COMMIT_TAG} '.version = $tag_ver' library.json|sponge library.json
-    - pio package pack -o /tmp
+    - pio package pack -o tmp/
     # standard packaging as ZIP archive
     - sed -i "s/version=.*/version=${CI_COMMIT_TAG}/g" library.properties
     - PKG_NAME=$CI_PROJECT_NAME-$CI_COMMIT_TAG
@@ -175,7 +260,7 @@ upload:
     # publishing to PlatformIO
     - >
       if [[ ${PRE_RELEASE} == "" ]]; then
-        pio package publish --owner smartme-io /tmp/Arancino-${CI_COMMIT_TAG}.tar.gz
+        pio package publish --owner smartme-io tmp/Arancino-${CI_COMMIT_TAG}.tar.gz
       fi
 
 #################################
@@ -185,8 +270,8 @@ upload:
 #######    Cleanup Job    #######
 cleanup:
   stage: cleanup
-  #only: ['tags']
-  #except: ['master', 'branches']
+  only: ['tags']
+  except: ['master', 'branches']
 
   variables:
     GIT_STRATEGY: none

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+#### v 2.0.0 - 2022.01.20
+* Upd: updated unit test examples. [#1uqbjbp] (https://app.clickup.com/t/1uqbjbp)
+* Add: added useFreeRtos parameter in `start` command. [#1vht0nc] (https://app.clickup.com/t/1vht0nc)
+* Fix: bug into `deviceIdentification` task. [#1w8qx9m] (https://app.clickup.com/t/1w8qx9m)
+* Add: added examples wthout freeRtos. [#1vhrhj2] (https://app.clickup.com/t/1vhrhj2)
+* Fix: read internal temperature for STM32. [#pbbnm1] (https://app.clickup.com/t/pbbnm1)
+* Udp: code revision. [#j58vz6] (https://app.clickup.com/t/j58vz6)
+* Udp: examples revision. [#jd3yjq] (https://app.clickup.com/t/jd3yjq)
+* Add: read internal temperature for STM32. [#pbbnm1] (https://app.clickup.com/t/pbbnm1)
+* Add: Arduino `loop` as FreeRtos task. [#p59vhb](https://app.clickup.com/t/p59vhb)
+* Fix: fixed bug with float and double using FreeRtos. [#n990qu](https://app.clickup.com/t/n990qu)
+* Add: added interocep function. [#d2x5yt](https://app.clickup.com/t/d2x5yt)
+* Add: added `setReserved` function. [#n1amcu](https://app.clickup.com/t/n1amcu)
+* Upd: removed deprecated arguments on the `begin` function. [fb6jve] (https://app.clickup.com/t/fb6jve)
+* Upd: removed `metadata` function. [fb6hyw] (https://app.clickup.com/t/fb6hyw)
+* Upd: removed check on reserved command. [fv2dmy] (https://app.clickup.com/t/fv2dmy)
+* Upd: updated sync/async mode. [fd59jj] (https://app.clickup.com/t/fd59jj)
+* Add: added persistent mode to `mset` and `hset` function. [aex4by] (https://app.clickup.com/t/aex4by)
+* Add: added `getReserved` function. [g31n4z](https://app.clickup.com/t/g31n4z)
+* Add: added `store` function. [#gk4cn8](https://app.clickup.com/t/gk4cn8)
+* Add: added `storetags` function. [#hf2fg6](https://app.clickup.com/t/hf2fg6)
+
 #### v 1.4.2 - 2021.06.15
 * Fix: Fixed bug with `free` function for avr board. [#mhcbn0](https://app.clickup.com/t/mhcbn0)
 * Fix: Fixed bug with uint type for avr board. [#mhcbn0](https://app.clickup.com/t/mhcbn0)