search

copl-labomc / fabconcept

to update: Making, modeling and simulating materials doped with nanosemiconductors
MIT License
1 stars 0 forks source link

Spool and code refactoring #44

Closed alexmomo1212 closed 6 days ago

alexmomo1212 commented 2 weeks ago

Refactored the code into a class and optimized a bit. Added functionnality for the automatic spool.

Latest stable version. Tested with user feedback.

cniallen commented 1 week ago

/fast-forward

github-actions[bot] commented 6 days ago

Triggered from https://github.com/copl-labomc/fabconcept/pull/44#issuecomment-2192418405 by @​alexmomo1212.

Trying to fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (dd70795d2f8abfd1cda07f1b2634cf7aa59a353f).

Target branch (master):

commit 78b4b889a6ff0bffbd42605b678ff7896909a47d (HEAD -> master, origin/master, origin/HEAD)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:57:49 2024 -0400

    Added fast-forwarding Github action

Pull request (develop):

commit dd70795d2f8abfd1cda07f1b2634cf7aa59a353f (pull_request/develop)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:26:57 2024 -0400

    Added fast-forwarding Github action

Can't fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (dd70795d2f8abfd1cda07f1b2634cf7aa59a353f). master (78b4b889a6ff0bffbd42605b678ff7896909a47d) is not a direct ancestor of develop (dd70795d2f8abfd1cda07f1b2634cf7aa59a353f). Branches appear to have diverged at 968cd75d9e822be56bdeab954621d92b2588d4ca:

* 78b4b889a6ff0bffbd42605b678ff7896909a47d Added fast-forwarding Github action
| * dd70795d2f8abfd1cda07f1b2634cf7aa59a353f Added fast-forwarding Github action
| * bf7064057a2db9e826ea220ec7af829d3803bbf9 43 calibrate the diameter sensor analog reading (#46)
| * 0a56ca8988f2678f89bd345123bdc2c887b5fcc2 new executable
| * 676c616e0bd9ff053902d23db6b4a40115679781 Record diameter in a file (#45)
| * ad8a31f7fd0b02a8eb7d9c35f474e2ae0e44b637 remove executable because merge conflict
| * 109e0313f3c6b81244e5ad43bc8a40146a96f086 Make the spool go the right way on startup
| * e29534d9400d6192f68b6c8c8689fea9443c7805 moved the new executable to the right place
| * 23b29cbc35aa77d5977a008b8c76e9a858b648b6 Finalising the spool (#40)
| * f69f965a57503cc56a499c0ddbd264f9f28cb95b 33 code refactoring (#38)
| * 266459aeab842d8c167c11344dddf989dd0f7fe3 13 automate the spool (#36)
| *   cae77bd1e60a70b9c48aeb94a88262b470145ee7 Merge branch 'master' of https://github.com/copl-labomc/fabconcept into develop
| |\  
| |/  
|/|   
* | 968cd75d9e822be56bdeab954621d92b2588d4ca Port selection and motor fix (#30)
 /  
* cf36275d2c7e8c5856b16badb830f619c46ff612 Executable works
* 00f3a0ac2a4294cf1409d7457a5f9bdf1f4d3850 Update README.md
* e77e9581280823804651c49416a555c1f453f4e1 Delete README Fiber tower.md
* 9f47b3887d98634f1474659a9168c08edf4373bd Comments in arduino code
* f44e0a7a81f7fd6742e23a060058945832de8ddd Removed deplicate executables and output folder
* e3cdd23fd407cc46f60090da51dade04b77e31c6 removed some global variables
*   808940c58b8e2cf430e046524ca809c86e72a8af rebasing develop on master
|\  
| * 26ddcc33502494fbc1b5e1e20e8b3c2e82fae856 motor fix 2
| * 0646acb50461b1a1e0fcd33f4ef20983221af4d4 executable 2.0
| * 62ceb38a2fdf92829a01941820e3bc52aaffc4ba It WoRkS On My MaChInE
| * 97f7c122fbded773f9b4aee169304b282b84a906 executable creation
| * ce71fef93ef4697c372157d8927ee919b1c4de5a Drop-down menu for connection + motor fix (#25)
| * 6a4b73928c157bff0a346b10aade423cecb41589 File cleanup (#24)
* | e43b865b4e71d460098e976ec27bc87a30eb8ff1 Merge branch 'master' of github.com:copl-labomc/nanocomposite-fab into develop
|/  
*   815b80d13cc3d1aa7c0cdbc6cb87c35f93bb6267 Merge branch 'develop' of github.com:copl-labomc/nanocomposite-fab into develop
|\  
| * af3df114d69dd0f604a2397022a73de00b5c4f85 Draft : Develop (#5) (#6)
| * 17f9af3666434ef18d624b362369be3303f29c17 Merge branch 'master' into develop
* | f496a5fe759b37aba549e292dff279438ab00ed7 holder for laser sensor
|/  
* f99280e69921314a74b6dbc908f8287c99a97b40 cleaning
* 1bf7b706b405aec53d970f0a669bc0bad4ee44a6 remove printing
* bb9b448bcbe668dd570af4a8b114ac1b5373eae3 cleaning and documentation for the merging request
* 0970be7c07cabcc2947d740bc5c0f67a0b0a67ba fixed diameter operationnal
* b940d7f5907ffa5fefd65ca2255b84c6219b13d6 minor change to print offset always
* 7d2faaf8cecd0a0c1febbec05502ff0beccdb94f fixed version of diameter due to mapping value in arduino
* 779b37685cb27040eef5fecc10af02674d2888fb fixed diameter int to float
* 6cdd8582ec14d8fe0ac625b0a241cf97f1d99439 diameter control
* c594738cfb7521984271a012c45b0a0cc9367f50 executable V3
* f7352187ec45f699850d1b33c09c0c471a4d8bbd diameter control and closed serial communication
* f288202f916ad4d46a9dd14ffb7be6b2018eef2b executable V2
* 415bd38de8bd95f8d0ba0f2e1c5538db8b784e92 minor fix for speed at 0
* 1b329f5a39b267a745402e4ac381465ac45a1d1a max speed to 1000 instead of 5000
* cb522db068f70e2e6bb0f60a60e7ef2edfa1a286 correcting comment code
* 362e871db708c783ad314a5dcbe5a1caad8406ab adding stepper 2 and documentation
* b938817d29095f6e913e6bcfe12762d087886426 new gui with arduino code pyserial
* bfd75048277ee03589b4789ac53d589772b6250d error du to new python version
* 8c412f3409c08b8252f7f3e601eeb552e92425c4 patched V2
* c0010d3bf1b52ca50a88b3d6b5f3fba668cb1d3d patching V2
* fe2d6fd5494deb7fa9cc0b773e2a5f1082fe4353 executable V2
* a76a0826a6079fd92debf258080e74e4c2a86b2d correcting path for COM
* a4b422dd3de55e395db6eb638c9c4891962ac950 executable V1
* 875ab71ee01a38c1e42d3120037661042cf68081 initial commit
* 6db3336e103b62ccda2c307a08afbaf2834f78b5 initial
* cf1a5b6c46a4472a09542bf162e28475b1ffca4f testing

commit 968cd75d9e822be56bdeab954621d92b2588d4ca
Author: alexmomo1212 <151687285+alexmomo1212@users.noreply.github.com>
Date:   Fri May 31 10:21:41 2024 -0400

    Port selection and motor fix (#30)

    * testing

    * initial

    * initial commit

    * executable V1

    * correcting path for COM

    * executable V2

    * patching V2

    * patched V2

    * error du to new python version

    * new gui with arduino code pyserial

    * adding stepper 2 and documentation

    * correcting comment code

    * max speed to 1000 instead of 5000

    * minor fix for speed at 0

    * executable V2

    * diameter control and closed serial communication

    * executable V3

    * diameter control

    * fixed diameter int to float

    * fixed version of diameter due to mapping value in arduino

    * minor change to print offset always

    * fixed diameter operationnal

    * cleaning and documentation for the merging request

    * remove printing

    * cleaning

    * Draft : Develop (#5) (#6)

    Milestone
    ---------

    Co-authored-by: grudule <46345094+grudule@users.noreply.github.com>
    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>

    * holder for laser sensor

    * File cleanup (#24)

    * Cleanup

    * Delete Fiber_Drawing_Tower/executables directory

    * Create gui_V2.exe

    * Drop-down menu for connection + motor fix (#25)

    * Draft : Develop (#5)

    merging V2 gui
    ---------

    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>

    * Début readme et corrections mineures

    * Debug screen and sending float

    * Automatic port detection

    * Port connnection menu on GUI

    * Code rearanging

    * Reconnection button

    * Already connected check

    * Status change

    * Check ports button

    * check if connected before ser.write()

    * status label color

    * bug fix

    * Set baudrate to 57600

    * motor fix and archive

    * preform motor up fix

    ---------

    Co-authored-by: grudule <46345094+grudule@users.noreply.github.com>
    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>

    * executable creation

    * It WoRkS On My MaChInE

    * executable 2.0

    * motor fix 2

    * removed some global variables

    * Removed deplicate executables and output folder

    * Comments in arduino code

    * Delete README Fiber tower.md

    * Update README.md

    * Executable works

    ---------

    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>
    Co-authored-by: grudule <46345094+grudule@users.noreply.github.com>

Rebase locally, and then force push to develop.

alexmomo1212 commented 6 days ago

/fast-forward

github-actions[bot] commented 6 days ago

Triggered from https://github.com/copl-labomc/fabconcept/pull/44#issuecomment-2192423936 by @​alexmomo1212.

Trying to fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (dd70795d2f8abfd1cda07f1b2634cf7aa59a353f).

Target branch (master):

commit 78b4b889a6ff0bffbd42605b678ff7896909a47d (HEAD -> master, origin/master, origin/HEAD)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:57:49 2024 -0400

    Added fast-forwarding Github action

Pull request (develop):

commit dd70795d2f8abfd1cda07f1b2634cf7aa59a353f (pull_request/develop)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:26:57 2024 -0400

    Added fast-forwarding Github action

Can't fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (dd70795d2f8abfd1cda07f1b2634cf7aa59a353f). master (78b4b889a6ff0bffbd42605b678ff7896909a47d) is not a direct ancestor of develop (dd70795d2f8abfd1cda07f1b2634cf7aa59a353f). Branches appear to have diverged at 968cd75d9e822be56bdeab954621d92b2588d4ca:

* 78b4b889a6ff0bffbd42605b678ff7896909a47d Added fast-forwarding Github action
| * dd70795d2f8abfd1cda07f1b2634cf7aa59a353f Added fast-forwarding Github action
| * bf7064057a2db9e826ea220ec7af829d3803bbf9 43 calibrate the diameter sensor analog reading (#46)
| * 0a56ca8988f2678f89bd345123bdc2c887b5fcc2 new executable
| * 676c616e0bd9ff053902d23db6b4a40115679781 Record diameter in a file (#45)
| * ad8a31f7fd0b02a8eb7d9c35f474e2ae0e44b637 remove executable because merge conflict
| * 109e0313f3c6b81244e5ad43bc8a40146a96f086 Make the spool go the right way on startup
| * e29534d9400d6192f68b6c8c8689fea9443c7805 moved the new executable to the right place
| * 23b29cbc35aa77d5977a008b8c76e9a858b648b6 Finalising the spool (#40)
| * f69f965a57503cc56a499c0ddbd264f9f28cb95b 33 code refactoring (#38)
| * 266459aeab842d8c167c11344dddf989dd0f7fe3 13 automate the spool (#36)
| *   cae77bd1e60a70b9c48aeb94a88262b470145ee7 Merge branch 'master' of https://github.com/copl-labomc/fabconcept into develop
| |\  
| |/  
|/|   
* | 968cd75d9e822be56bdeab954621d92b2588d4ca Port selection and motor fix (#30)
 /  
* cf36275d2c7e8c5856b16badb830f619c46ff612 Executable works
* 00f3a0ac2a4294cf1409d7457a5f9bdf1f4d3850 Update README.md
* e77e9581280823804651c49416a555c1f453f4e1 Delete README Fiber tower.md
* 9f47b3887d98634f1474659a9168c08edf4373bd Comments in arduino code
* f44e0a7a81f7fd6742e23a060058945832de8ddd Removed deplicate executables and output folder
* e3cdd23fd407cc46f60090da51dade04b77e31c6 removed some global variables
*   808940c58b8e2cf430e046524ca809c86e72a8af rebasing develop on master
|\  
| * 26ddcc33502494fbc1b5e1e20e8b3c2e82fae856 motor fix 2
| * 0646acb50461b1a1e0fcd33f4ef20983221af4d4 executable 2.0
| * 62ceb38a2fdf92829a01941820e3bc52aaffc4ba It WoRkS On My MaChInE
| * 97f7c122fbded773f9b4aee169304b282b84a906 executable creation
| * ce71fef93ef4697c372157d8927ee919b1c4de5a Drop-down menu for connection + motor fix (#25)
| * 6a4b73928c157bff0a346b10aade423cecb41589 File cleanup (#24)
* | e43b865b4e71d460098e976ec27bc87a30eb8ff1 Merge branch 'master' of github.com:copl-labomc/nanocomposite-fab into develop
|/  
*   815b80d13cc3d1aa7c0cdbc6cb87c35f93bb6267 Merge branch 'develop' of github.com:copl-labomc/nanocomposite-fab into develop
|\  
| * af3df114d69dd0f604a2397022a73de00b5c4f85 Draft : Develop (#5) (#6)
| * 17f9af3666434ef18d624b362369be3303f29c17 Merge branch 'master' into develop
* | f496a5fe759b37aba549e292dff279438ab00ed7 holder for laser sensor
|/  
* f99280e69921314a74b6dbc908f8287c99a97b40 cleaning
* 1bf7b706b405aec53d970f0a669bc0bad4ee44a6 remove printing
* bb9b448bcbe668dd570af4a8b114ac1b5373eae3 cleaning and documentation for the merging request
* 0970be7c07cabcc2947d740bc5c0f67a0b0a67ba fixed diameter operationnal
* b940d7f5907ffa5fefd65ca2255b84c6219b13d6 minor change to print offset always
* 7d2faaf8cecd0a0c1febbec05502ff0beccdb94f fixed version of diameter due to mapping value in arduino
* 779b37685cb27040eef5fecc10af02674d2888fb fixed diameter int to float
* 6cdd8582ec14d8fe0ac625b0a241cf97f1d99439 diameter control
* c594738cfb7521984271a012c45b0a0cc9367f50 executable V3
* f7352187ec45f699850d1b33c09c0c471a4d8bbd diameter control and closed serial communication
* f288202f916ad4d46a9dd14ffb7be6b2018eef2b executable V2
* 415bd38de8bd95f8d0ba0f2e1c5538db8b784e92 minor fix for speed at 0
* 1b329f5a39b267a745402e4ac381465ac45a1d1a max speed to 1000 instead of 5000
* cb522db068f70e2e6bb0f60a60e7ef2edfa1a286 correcting comment code
* 362e871db708c783ad314a5dcbe5a1caad8406ab adding stepper 2 and documentation
* b938817d29095f6e913e6bcfe12762d087886426 new gui with arduino code pyserial
* bfd75048277ee03589b4789ac53d589772b6250d error du to new python version
* 8c412f3409c08b8252f7f3e601eeb552e92425c4 patched V2
* c0010d3bf1b52ca50a88b3d6b5f3fba668cb1d3d patching V2
* fe2d6fd5494deb7fa9cc0b773e2a5f1082fe4353 executable V2
* a76a0826a6079fd92debf258080e74e4c2a86b2d correcting path for COM
* a4b422dd3de55e395db6eb638c9c4891962ac950 executable V1
* 875ab71ee01a38c1e42d3120037661042cf68081 initial commit
* 6db3336e103b62ccda2c307a08afbaf2834f78b5 initial
* cf1a5b6c46a4472a09542bf162e28475b1ffca4f testing

commit 968cd75d9e822be56bdeab954621d92b2588d4ca
Author: alexmomo1212 <151687285+alexmomo1212@users.noreply.github.com>
Date:   Fri May 31 10:21:41 2024 -0400

    Port selection and motor fix (#30)

    * testing

    * initial

    * initial commit

    * executable V1

    * correcting path for COM

    * executable V2

    * patching V2

    * patched V2

    * error du to new python version

    * new gui with arduino code pyserial

    * adding stepper 2 and documentation

    * correcting comment code

    * max speed to 1000 instead of 5000

    * minor fix for speed at 0

    * executable V2

    * diameter control and closed serial communication

    * executable V3

    * diameter control

    * fixed diameter int to float

    * fixed version of diameter due to mapping value in arduino

    * minor change to print offset always

    * fixed diameter operationnal

    * cleaning and documentation for the merging request

    * remove printing

    * cleaning

    * Draft : Develop (#5) (#6)

    Milestone
    ---------

    Co-authored-by: grudule <46345094+grudule@users.noreply.github.com>
    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>

    * holder for laser sensor

    * File cleanup (#24)

    * Cleanup

    * Delete Fiber_Drawing_Tower/executables directory

    * Create gui_V2.exe

    * Drop-down menu for connection + motor fix (#25)

    * Draft : Develop (#5)

    merging V2 gui
    ---------

    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>

    * Début readme et corrections mineures

    * Debug screen and sending float

    * Automatic port detection

    * Port connnection menu on GUI

    * Code rearanging

    * Reconnection button

    * Already connected check

    * Status change

    * Check ports button

    * check if connected before ser.write()

    * status label color

    * bug fix

    * Set baudrate to 57600

    * motor fix and archive

    * preform motor up fix

    ---------

    Co-authored-by: grudule <46345094+grudule@users.noreply.github.com>
    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>

    * executable creation

    * It WoRkS On My MaChInE

    * executable 2.0

    * motor fix 2

    * removed some global variables

    * Removed deplicate executables and output folder

    * Comments in arduino code

    * Delete README Fiber tower.md

    * Update README.md

    * Executable works

    ---------

    Co-authored-by: Alexandre Sagona <alexandre.sagona.1@ulaval.ca>
    Co-authored-by: grudule <46345094+grudule@users.noreply.github.com>

Rebase locally, and then force push to develop.

github-actions[bot] commented 6 days ago

Triggered from https://github.com/copl-labomc/fabconcept/pull/44 by @​alexmomo1212.

Checking if we can fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (4a9fd495bc875aa91b51914533f5c92e32563c39).

Target branch (master):

commit 78b4b889a6ff0bffbd42605b678ff7896909a47d (HEAD -> master, origin/master, origin/HEAD)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:57:49 2024 -0400

    Added fast-forwarding Github action

Pull request (develop):

commit 4a9fd495bc875aa91b51914533f5c92e32563c39 (pull_request/develop)
Merge: dd70795 78b4b88
Author: alexmomo1212 <151687285+alexmomo1212@users.noreply.github.com>
Date:   Wed Jun 26 15:20:02 2024 -0400

    Merge branch 'master' into develop

It is possible to fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (4a9fd495bc875aa91b51914533f5c92e32563c39). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward master to develop.

alexmomo1212 commented 6 days ago

/fast-forward

github-actions[bot] commented 6 days ago

Triggered from https://github.com/copl-labomc/fabconcept/pull/44#issuecomment-2192467826 by @​alexmomo1212.

Trying to fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (4a9fd495bc875aa91b51914533f5c92e32563c39).

Target branch (master):

commit 78b4b889a6ff0bffbd42605b678ff7896909a47d (HEAD -> master, origin/master, origin/HEAD)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:57:49 2024 -0400

    Added fast-forwarding Github action

Pull request (develop):

commit 4a9fd495bc875aa91b51914533f5c92e32563c39 (pull_request/develop)
Merge: dd70795 78b4b88
Author: alexmomo1212 <151687285+alexmomo1212@users.noreply.github.com>
Date:   Wed Jun 26 15:20:02 2024 -0400

    Merge branch 'master' into develop

Fast forwarding master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (4a9fd495bc875aa91b51914533f5c92e32563c39).


$ git push origin 4a9fd495bc875aa91b51914533f5c92e32563c39:master
remote: error: GH006: Protected branch update failed for refs/heads/master.        
remote: error: This branch must not contain merge commits.        
To https://github.com/copl-labomc/fabconcept.git
 ! [remote rejected] 4a9fd495bc875aa91b51914533f5c92e32563c39 -> master (protected branch hook declined)
error: failed to push some refs to 'https://github.com/copl-labomc/fabconcept.git'
cniallen commented 6 days ago

Je viens de refaire le tour de tous les settings de tous les Github Actions et ça aurait déjà dû marcher hier... On s'en reparle au gm!

cniallen commented 6 days ago

/fast-forward

github-actions[bot] commented 6 days ago

Triggered from https://github.com/copl-labomc/fabconcept/pull/44#issuecomment-2194741134 by @​cniallen.

Trying to fast forward master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (4a9fd495bc875aa91b51914533f5c92e32563c39).

Target branch (master):

commit 78b4b889a6ff0bffbd42605b678ff7896909a47d (HEAD -> master, origin/master, origin/HEAD)
Author: cniallen <50378138+cniallen@users.noreply.github.com>
Date:   Wed Jun 26 07:57:49 2024 -0400

    Added fast-forwarding Github action

Pull request (develop):

commit 4a9fd495bc875aa91b51914533f5c92e32563c39 (pull_request/develop)
Merge: dd70795 78b4b88
Author: alexmomo1212 <151687285+alexmomo1212@users.noreply.github.com>
Date:   Wed Jun 26 15:20:02 2024 -0400

    Merge branch 'master' into develop

Fast forwarding master (78b4b889a6ff0bffbd42605b678ff7896909a47d) to develop (4a9fd495bc875aa91b51914533f5c92e32563c39).


$ git push origin 4a9fd495bc875aa91b51914533f5c92e32563c39:master
remote: error: GH006: Protected branch update failed for refs/heads/master.        
remote: error: This branch must not contain merge commits.        
To https://github.com/copl-labomc/fabconcept.git
 ! [remote rejected] 4a9fd495bc875aa91b51914533f5c92e32563c39 -> master (protected branch hook declined)
error: failed to push some refs to 'https://github.com/copl-labomc/fabconcept.git'