Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- * commit ace3e9910012a9e2872d4c3438c6a742f49febd0 (HEAD -> develop, origin/develop)
- | Author: Artur Bauer <bauerart1@gmail.com>
- | Date: Wed Aug 14 22:06:02 2019 +0200
- |
- | Fix documentation for Button
- |
- | * commit e3242cd2d47ea88f5fca61f1634b7aa4f171a0b8 (origin/mqtt, mqtt)
- | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Wed Aug 14 15:46:36 2019 +0200
- | |
- | | Add connection establish
- | |
- | * commit a69be354deaf34ee8ab7b7e0eb170a4c83ce6c6e
- | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Tue Aug 13 15:33:28 2019 +0200
- | |
- | | Add macros to connection config
- | |
- | * commit afc0f2ea3b94f858cbe3cdbbe362e8b029ba962e
- | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Mon Aug 12 16:41:27 2019 +0200
- | |
- | | Move tag to source file to remove warnings
- | |
- | * commit b20bc1236afc4a918512a3b0f399231d8d059ea9
- | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Mon Aug 12 16:02:47 2019 +0200
- | |
- | | Added macros to default network data
- | |
- | * commit e43cf371201ee2e457e60f6eec3723c451d36d38 (origin/mqtt_igor)
- | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Mon Aug 12 09:34:43 2019 +0200
- | |
- | | Add void as parameter in I2CScan
- | |
- | * commit 94b4f135d82713649d887d03fde22cf9172ac02d
- | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Mon Aug 12 09:23:57 2019 +0200
- | |
- | | Add more complex tags for logging
- | |
- | | Mqtt connection problem. Do not run
- | |
- | | * commit a499803318b74cdb5d41b94754dbac7c5eea3ec2 (origin/RTC_and_OLED)
- | |/ Author: Artur Bauer <a.bauer@neurosys.com>
- |/| Date: Wed Aug 14 14:39:33 2019 +0200
- | |
- | | Test connection between rtc and oled
- | |
- | | Not working cause to rtc reboot(?)
- | |
- | | * commit 124f76dc2d0beee53b096f4de5dc4de5b268adf4 (origin/OLED_autoupdate)
- | |/ Author: Artur Bauer <a.bauer@neurosys.com>
- |/| Date: Wed Aug 14 14:17:59 2019 +0200
- | |
- | | Add Screen autoupdate
- | |
- * | commit d5f0b31e951d3b0f1116642673535050ee0ae7bd
- |\ \ Merge: 3cbe85b af3bce1
- | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
- | | | Date: Wed Aug 14 11:12:57 2019 +0000
- | | |
- | | | Merge branch 'OLED_Button' into 'develop'
- | | |
- | | | Add button OLED integration
- | | |
- | | | See merge request ns-internship-2019/prodlinesys_freertos!8
- | | |
- | * | commit af3bce166970f8e58d123656a8cbf95bd95ef0f8
- |/ / Author: Artur Bauer <a.bauer@neurosys.com>
- | | Date: Wed Aug 14 13:01:36 2019 +0200
- | |
- | | Add button OLED integration
- | |
- * | commit 3cbe85b42b7454c8807ca4b2fde4207553dfeef6
- |\ \ Merge: 8e5f560 56b01be
- | | | Author: Igor Zatoń <i.zaton@neurosys.com>
- | | | Date: Wed Aug 14 09:07:07 2019 +0000
- | | |
- | | | Merge branch 'buttonInterruption' into 'develop'
- | | |
- | | | Button interruption
- | | |
- | | | See merge request ns-internship-2019/prodlinesys_freertos!7
- | | |
- | * | commit 56b01bea619ad098921e373955bc6f7f99aee605
- | |\ \ Merge: a9f6c23 8e5f560
- | |/ / Author: Igor Zatoń <i.zaton@neurosys.com>
- |/| | Date: Wed Aug 14 09:06:48 2019 +0000
- | | |
- | | | Merge branch 'develop' into 'buttonInterruption'
- | | |
- | | | # Conflicts:
- | | | # .gitignore
- | | | # src/main.c
- | | |
- | * | commit a9f6c23947c5b4d1aa4d386455b00ae7c5a46e3a
- | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | Date: Wed Aug 14 10:31:39 2019 +0200
- | | |
- | | | Add button action handlers
- | | |
- | * | commit 7f5f843072434e54d4f384d9d5ed08ab04ef02f5 (origin/buttonInterruption, buttonInterruption)
- | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | Date: Thu Aug 8 16:37:52 2019 +0200
- | | |
- | | | update git ignore
- | | |
- | * | commit 26682817d75c0af80623d3fbde3ffaa499cc34f0
- | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | Date: Thu Aug 8 16:29:59 2019 +0200
- | | |
- | | | Add basic interruption handle
- | | |
- | | | * commit 1923403df7f8b48031c3bba33815786b955597fa (origin/LEDtest)
- | | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
- | | | | Date: Tue Aug 13 12:25:27 2019 +0200
- | | | |
- | | | | Small cleanup
- | | | |
- | | | | * commit 8c6923d6c3e8faa2ed41b1e1a453eec6a5502292 (origin/buttonInterruptionKuba)
- | | | |/ Author: Jakub Bachusz <j.bachusz@neurosys.com>
- | | | | Date: Tue Aug 13 12:10:45 2019 +0200
- | | | |
- | | | | My own branch for button interruptions
- | | | |
- | | | * commit 887867406d94e84d1b586f29f93e9e990f943c8c
- | | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
- | | | | Date: Tue Aug 13 09:49:09 2019 +0200
- | | | |
- | | | | Code cleanup
- | | | |
- | | | * commit 833c9f118a3136f38fc7dd76138c3e37902b3b87
- | |_|/ Author: Jakub Bachusz <j.bachusz@neurosys.com>
- |/| | Date: Mon Aug 12 14:54:11 2019 +0200
- | | |
- | | | LED steering with button
- | | |
- * | | commit 8e5f560ceeb22c6dd52583aaccc2271e1f02c904
- | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | Date: Mon Aug 12 08:13:55 2019 +0200
- | | |
- | | | Fix in wifi.h after merge
- | | |
- | | | * commit 87913f417c1d2184f65b1f9f1677479418916cd6 (origin/mqttKuba)
- | | |/ Author: Jakub Bachusz <j.bachusz@neurosys.com>
- | | | Date: Mon Aug 12 16:17:42 2019 +0200
- | | |
- | | | Created my own branch for MQTT
- | | |
- | | * commit f0b08003603bcf310878bc11ee9d845a1b93de23
- | |/ Author: Artur Bauer <a.bauer@neurosys.com>
- |/| Date: Mon Aug 12 08:00:52 2019 +0200
- | |
- | | Add main ProdLineSys app
- | |
- * | commit 9d2752f1418f671eb904aad2b6b29efa2290ce3e
- |\ \ Merge: 96b69af d3e9c04
- | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
- | | | Date: Fri Aug 9 09:40:38 2019 +0000
- | | |
- | | | Merge branch 'RTC' into 'develop'
- | | |
- | | | Rtc
- | | |
- | | | See merge request ns-internship-2019/prodlinesys_freertos!5
- | | |
- | * | commit d3e9c042ce7df9e4266aba4799abe87bf2683141
- | |\ \ Merge: a01499b 96b69af
- | |/ / Author: Jakub Bachusz <j.bachusz@neurosys.com>
- |/| | Date: Fri Aug 9 09:39:29 2019 +0000
- | | |
- | | | Merge branch 'develop' into 'RTC'
- | | |
- | | | # Conflicts:
- | | | # .gitignore
- | | | # CMakeLists.txt
- | | | # components/README.md
- | | | # doc/I2CSetup.md
- | | | # include/I2CSetup.h
- | | | # src/I2CSetup.c
- | | | # src/main.c
- | | |
- * | | commit 96b69af1370dda1248bebac7db39d50f6e68a9c2
- |\ \ \ Merge: 7c2c61a ea46de2
- | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | Date: Thu Aug 8 17:30:38 2019 +0200
- | | | |
- | | | | Merge branch 'OLEDScreen' into develop
- | | | |
- | * | | commit ea46de237e5f439bfc02b0bf0a8bb622f5574554 (origin/OLEDScreen, OLEDScreen)
- | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | Date: Thu Aug 8 09:31:19 2019 +0200
- | | | |
- | | | | Correct misspelling in .gitmodules
- | | | |
- | * | | commit 114a2bbbcf2b0b3956ab5166a253c788aff6e991
- | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | Date: Wed Aug 7 17:07:53 2019 +0200
- | | | |
- | | | | Add param description
- | | | |
- | * | | commit 2a3acf10f1d166ef22a46c483bfb3cc9a00f3c03
- | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | Date: Wed Aug 7 17:04:21 2019 +0200
- | | | |
- | | | | Add documentation
- | | | |
- | * | | commit 0366f866adaaf995a1e477106145e33210c9f826
- | | |/ Author: Artur Bauer <bauerart1@gmail.com>
- | |/| Date: Wed Aug 7 17:01:08 2019 +0200
- | | |
- | | | Add OLED support working with wifi
- | | |
- * | | commit 7c2c61a016c2e384ad8b0c50d39c25fbfb8e756f
- |\ \ \ Merge: 703657e b067a76
- | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | Date: Thu Aug 8 17:21:12 2019 +0200
- | | | |
- | | | | Merge branch 'develop' of git.neurosys.com:ns-internship-2019/prodlinesys_freertos into develop
- | | | |
- | * | | commit b067a766fe4195610d30eb1d9b6ac7f2578a93f8
- | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | Date: Wed Aug 7 08:01:51 2019 +0200
- | | | |
- | | | | Fix documentation
- | | | |
- | * | | commit 216021b8a320697b313e663d767f70af504145b6
- | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | Date: Wed Aug 7 07:58:30 2019 +0200
- | | | |
- | | | | Add documentation
- | | | |
- | * | | commit b4cf51be393440ac648a2c315c6846e973ee235b
- | |\ \ \ Merge: c54c6fb c9fba91
- | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | | Date: Mon Aug 5 07:51:36 2019 +0000
- | | | | |
- | | | | | Merge branch 'LED_indicator' into 'develop'
- | | | | |
- | | | | | Led indicator
- | | | | |
- | | | | | See merge request ns-internship-2019/prodlinesys_freertos!1
- | | | | |
- | | * | | commit c9fba9180f93d16093ca039a0fa51d1c89ed0db6
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Fri Aug 2 14:18:13 2019 +0200
- | | | | |
- | | | | | Change comments to doxygen standard
- | | | | |
- | | * | | commit 6b63edae771553f98149d27925c9e498a1787ebd
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Tue Jul 30 15:29:59 2019 +0200
- | | | | |
- | | | | | Add check function for LED Indicator
- | | | | |
- | | * | | commit 0a83065f5c23bcc096847e1d75d8280f24a815e1
- | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | | Date: Mon Jul 29 12:53:55 2019 +0200
- | | | | |
- | | | | | Change logs priority
- | | | | |
- | | * | | commit 8f5d0aadc5c471924f85069503ac528af592c402
- | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | | Date: Mon Jul 29 12:43:46 2019 +0200
- | | | | |
- | | | | | Add basic security futures
- | | | | |
- | | * | | commit 9ac59b4f0963aeaa83c336b63b769e435eea242f
- | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | | Date: Mon Jul 29 10:57:15 2019 +0200
- | | | | |
- | | | | | Add const qualifiers
- | | | | |
- | | * | | commit bd49564f7b050bf6ba5974904022b2d70579dc32
- | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | | | Date: Mon Jul 29 08:57:15 2019 +0200
- | | | | |
- | | | | | Add default constructors macros for color LEDs
- | | | | |
- | | * | | commit 77abb3508555c3f86e61714272ac16153bf12e0c
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Fri Jul 26 11:31:21 2019 +0200
- | | | | |
- | | | | | Add LED Indicator basic config
- | | | | |
- | | * | | commit 3e93f385f63e3302eebb2c542c8f01e2b4644b74
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Fri Jul 26 10:41:04 2019 +0200
- | | | | |
- | | | | | Change log mode
- | | | | |
- | | | | | Changed log mode using esp32 library to put them on uart
- | | | | |
- | | * | | commit c3f6eb8dca55f9038b8b40a475e01ececede7a45
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Wed Jul 24 11:40:08 2019 +0200
- | | | | |
- | | | | | Change style to mode
- | | | | |
- | | | | | Changed Style to mode to more clarity
- | | | | |
- | | * | | commit 4ccefdfbb0e4ec83b5aaf6fc815b277897e2d46d
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Wed Jul 24 10:44:01 2019 +0200
- | | | | |
- | | | | | Remove additional variables
- | | | | |
- | | | | | Remover addition variables on _vBlinky function
- | | | | |
- | | * | | commit c8f56d0193fe028d61c18aa36f7923368d1b6118
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Wed Jul 24 09:58:33 2019 +0200
- | | | | |
- | | | | | Add LED Indicator support
- | | | | |
- | | | | | Added LED Indicator support. Contain methods of turning on LED Indicator
- | | | | | in 3 different styles
- | | | | |
- | | * | | commit d9675e6327e354d9c27bbe97a1ecc16ec396cd73
- | | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | | Date: Tue Jul 23 20:42:33 2019 +0200
- | | | | |
- | | | | | Add basic LED functionality
- | | | | |
- | | | | | Basic LED functions. Blinking, single blink and turn on are available in
- | | | | | LEDIndicator files
- | | | | |
- * | | | | commit 703657ea99c5284f1469eab340a991c27698651a
- |\ \ \ \ \ Merge: c54c6fb 1668488
- | |/ / / / Author: Artur Bauer <bauerart1@gmail.com>
- |/| | / / Date: Thu Aug 8 17:06:01 2019 +0200
- | | |/ /
- | |/| | Merge branch 'wifi' into develop
- | | | |
- | | | * commit a01499b6534d225cfe176434f7181731304a3328 (origin/RTC, RTC)
- | | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | | Date: Thu Aug 8 09:26:43 2019 +0200
- | | | |
- | | | | Add documentation
- | | | |
- | | | * commit f320f6764688cba45b657abfef3367d9d631ad23
- | | |/ Author: Artur Bauer <bauerart1@gmail.com>
- | |/| Date: Thu Aug 8 09:15:57 2019 +0200
- | | |
- | | | Add rtc support
- | | |
- | * | commit 166848899c2535a334ac282f3a1fe5f142942b3e (origin/wifi, wifi)
- | | | Author: Artur Bauer <a.bauer@neurosys.com>
- | | | Date: Wed Aug 7 14:11:30 2019 +0200
- | | |
- | | | Add documentation
- | | |
- | * | commit a849912309b0bbe255d7b9cf49b93df7edbb1644
- | |\ \ Merge: 42090de bf22d1d
- | | |/ Author: Artur Bauer <a.bauer@neurosys.com>
- | | | Date: Wed Aug 7 13:54:45 2019 +0200
- | | |
- | | | Merge branch 'wifi' with remote
- | | |
- | | | Merge branch 'wifi' of git.neurosys.com:ns-internship-2019/prodlinesys_freertos into wifi
- | | |
- | | * commit bf22d1d61790f21c14b358d377c4ca10b40bd4ab (tag: v0.0.1)
- | | | Author: Artur Bauer <bauerart1@gmail.com>
- | | | Date: Tue Jul 23 15:42:11 2019 +0200
- | | |
- | | | Refactor and restructure of WiFi connection code
- | | |
- | | | Refactor and restructure of WiFi creating connection on ESP32.
- | | | Added necessary comments. Changed return value of xWiFiInit function
- | | |
- | | | run.sh require rewritten, because not working properly
- | | |
- | | * commit 2075acf424c4d107cc5671151ca14d1ed99c7117
- | |/ Author: Artur Bauer <bauerart1@gmail.com>
- |/| Date: Tue Jul 23 13:44:47 2019 +0200
- | |
- | | Implement wifi connection
- | |
- | | Added wifi connection to main code. Need for refactor and restructure
- | | code
- | |
- | * commit 42090def65b30a60afd1cb3d2dd142e2cc07f25d
- |/ Author: Artur Bauer <a.bauer@neurosys.com>
- | Date: Wed Aug 7 13:34:35 2019 +0200
- |
- | Fix WiFi and init sequence
- |
- * commit c54c6fb29edfeaf09263f2ab94253b755c8fbc3f (origin/master, master)
- | Author: Artur Bauer <a.bauer@neurosys.com>
- | Date: Mon Jul 22 15:06:07 2019 +0200
- |
- | First test on wifi
- |
- * commit 954d97386992a2c09941e6b0a1aad526be6fb1ff
- | Author: Artur Bauer <a.bauer@neurosys.com>
- | Date: Mon Jul 22 09:58:31 2019 +0200
- |
- | Rewritten README to current version
- |
- * commit f872058319a42843d11ff91f1a9f56818c83c6d5
- | Author: Artur Bauer <a.bauer@neurosys.com>
- | Date: Mon Jul 22 09:57:03 2019 +0200
- |
- | Removed files
- |
- * commit cb6db2bd72d47841edbf865abcc319a0076214f0
- | Author: Artur Bauer <a.bauer@neurosys.com>
- | Date: Mon Jul 22 09:29:52 2019 +0200
- |
- | Changed product structure
- |
- | Changed product structure removing additional files
- |
- * commit d701481d3ae8dc929196def92a83083842b23a10 (tag: Alpha_0.01_Blinky)
- | Author: Artur Bauer <a.bauer@neurosys.com>
- | Date: Fri Jul 19 12:42:01 2019 +0200
- |
- | README modifications
- |
- * commit 425041b0f8359efffc1d356f1eabb73055c6e1a6
- Author: Artur Bauer <a.bauer@neurosys.com>
- Date: Fri Jul 19 12:37:17 2019 +0200
- Init commit
- This is initial commit for esp project.
- Require consulting with someone or more research
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement