SHARE
TWEET

Untitled

a guest Aug 14th, 2019 255 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. * commit ace3e9910012a9e2872d4c3438c6a742f49febd0 (HEAD -> develop, origin/develop)
  2. | Author: Artur Bauer <bauerart1@gmail.com>
  3. | Date:   Wed Aug 14 22:06:02 2019 +0200
  4. |
  5. |     Fix documentation for Button
  6. |  
  7. | * commit e3242cd2d47ea88f5fca61f1634b7aa4f171a0b8 (origin/mqtt, mqtt)
  8. | | Author: Artur Bauer <a.bauer@neurosys.com>
  9. | | Date:   Wed Aug 14 15:46:36 2019 +0200
  10. | |
  11. | |     Add connection establish
  12. | |
  13. | * commit a69be354deaf34ee8ab7b7e0eb170a4c83ce6c6e
  14. | | Author: Artur Bauer <a.bauer@neurosys.com>
  15. | | Date:   Tue Aug 13 15:33:28 2019 +0200
  16. | |
  17. | |     Add macros to connection config
  18. | |
  19. | * commit afc0f2ea3b94f858cbe3cdbbe362e8b029ba962e
  20. | | Author: Artur Bauer <a.bauer@neurosys.com>
  21. | | Date:   Mon Aug 12 16:41:27 2019 +0200
  22. | |
  23. | |     Move tag to source file to remove warnings
  24. | |
  25. | * commit b20bc1236afc4a918512a3b0f399231d8d059ea9
  26. | | Author: Artur Bauer <a.bauer@neurosys.com>
  27. | | Date:   Mon Aug 12 16:02:47 2019 +0200
  28. | |
  29. | |     Added macros to default network data
  30. | |
  31. | * commit e43cf371201ee2e457e60f6eec3723c451d36d38 (origin/mqtt_igor)
  32. | | Author: Artur Bauer <a.bauer@neurosys.com>
  33. | | Date:   Mon Aug 12 09:34:43 2019 +0200
  34. | |
  35. | |     Add void as parameter in I2CScan
  36. | |
  37. | * commit 94b4f135d82713649d887d03fde22cf9172ac02d
  38. | | Author: Artur Bauer <a.bauer@neurosys.com>
  39. | | Date:   Mon Aug 12 09:23:57 2019 +0200
  40. | |
  41. | |     Add more complex tags for logging
  42. | |    
  43. | |     Mqtt connection problem. Do not run
  44. | |  
  45. | | * commit a499803318b74cdb5d41b94754dbac7c5eea3ec2 (origin/RTC_and_OLED)
  46. | |/  Author: Artur Bauer <a.bauer@neurosys.com>
  47. |/|   Date:   Wed Aug 14 14:39:33 2019 +0200
  48. | |  
  49. | |       Test connection between rtc and oled
  50. | |      
  51. | |       Not working cause to rtc reboot(?)
  52. | |  
  53. | | * commit 124f76dc2d0beee53b096f4de5dc4de5b268adf4 (origin/OLED_autoupdate)
  54. | |/  Author: Artur Bauer <a.bauer@neurosys.com>
  55. |/|   Date:   Wed Aug 14 14:17:59 2019 +0200
  56. | |  
  57. | |       Add Screen autoupdate
  58. | |  
  59. * |   commit d5f0b31e951d3b0f1116642673535050ee0ae7bd
  60. |\ \  Merge: 3cbe85b af3bce1
  61. | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
  62. | | | Date:   Wed Aug 14 11:12:57 2019 +0000
  63. | | |
  64. | | |     Merge branch 'OLED_Button' into 'develop'
  65. | | |    
  66. | | |     Add button OLED integration
  67. | | |    
  68. | | |     See merge request ns-internship-2019/prodlinesys_freertos!8
  69. | | |
  70. | * | commit af3bce166970f8e58d123656a8cbf95bd95ef0f8
  71. |/ /  Author: Artur Bauer <a.bauer@neurosys.com>
  72. | |   Date:   Wed Aug 14 13:01:36 2019 +0200
  73. | |  
  74. | |       Add button OLED integration
  75. | |  
  76. * |   commit 3cbe85b42b7454c8807ca4b2fde4207553dfeef6
  77. |\ \  Merge: 8e5f560 56b01be
  78. | | | Author: Igor Zatoń <i.zaton@neurosys.com>
  79. | | | Date:   Wed Aug 14 09:07:07 2019 +0000
  80. | | |
  81. | | |     Merge branch 'buttonInterruption' into 'develop'
  82. | | |    
  83. | | |     Button interruption
  84. | | |    
  85. | | |     See merge request ns-internship-2019/prodlinesys_freertos!7
  86. | | |  
  87. | * |   commit 56b01bea619ad098921e373955bc6f7f99aee605
  88. | |\ \  Merge: a9f6c23 8e5f560
  89. | |/ /  Author: Igor Zatoń <i.zaton@neurosys.com>
  90. |/| |   Date:   Wed Aug 14 09:06:48 2019 +0000
  91. | | |  
  92. | | |       Merge branch 'develop' into 'buttonInterruption'
  93. | | |      
  94. | | |       # Conflicts:
  95. | | |       #   .gitignore
  96. | | |       #   src/main.c
  97. | | |
  98. | * | commit a9f6c23947c5b4d1aa4d386455b00ae7c5a46e3a
  99. | | | Author: Artur Bauer <a.bauer@neurosys.com>
  100. | | | Date:   Wed Aug 14 10:31:39 2019 +0200
  101. | | |
  102. | | |     Add button action handlers
  103. | | |
  104. | * | commit 7f5f843072434e54d4f384d9d5ed08ab04ef02f5 (origin/buttonInterruption, buttonInterruption)
  105. | | | Author: Artur Bauer <bauerart1@gmail.com>
  106. | | | Date:   Thu Aug 8 16:37:52 2019 +0200
  107. | | |
  108. | | |     update git ignore
  109. | | |
  110. | * | commit 26682817d75c0af80623d3fbde3ffaa499cc34f0
  111. | | | Author: Artur Bauer <bauerart1@gmail.com>
  112. | | | Date:   Thu Aug 8 16:29:59 2019 +0200
  113. | | |
  114. | | |     Add basic interruption handle
  115. | | |  
  116. | | | * commit 1923403df7f8b48031c3bba33815786b955597fa (origin/LEDtest)
  117. | | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
  118. | | | | Date:   Tue Aug 13 12:25:27 2019 +0200
  119. | | | |
  120. | | | |     Small cleanup
  121. | | | |  
  122. | | | | * commit 8c6923d6c3e8faa2ed41b1e1a453eec6a5502292 (origin/buttonInterruptionKuba)
  123. | | | |/  Author: Jakub Bachusz <j.bachusz@neurosys.com>
  124. | | | |   Date:   Tue Aug 13 12:10:45 2019 +0200
  125. | | | |  
  126. | | | |       My own branch for button interruptions
  127. | | | |
  128. | | | * commit 887867406d94e84d1b586f29f93e9e990f943c8c
  129. | | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
  130. | | | | Date:   Tue Aug 13 09:49:09 2019 +0200
  131. | | | |
  132. | | | |     Code cleanup
  133. | | | |
  134. | | | * commit 833c9f118a3136f38fc7dd76138c3e37902b3b87
  135. | |_|/  Author: Jakub Bachusz <j.bachusz@neurosys.com>
  136. |/| |   Date:   Mon Aug 12 14:54:11 2019 +0200
  137. | | |  
  138. | | |       LED steering with button
  139. | | |
  140. * | | commit 8e5f560ceeb22c6dd52583aaccc2271e1f02c904
  141. | | | Author: Artur Bauer <a.bauer@neurosys.com>
  142. | | | Date:   Mon Aug 12 08:13:55 2019 +0200
  143. | | |
  144. | | |     Fix in wifi.h after merge
  145. | | |  
  146. | | | * commit 87913f417c1d2184f65b1f9f1677479418916cd6 (origin/mqttKuba)
  147. | | |/  Author: Jakub Bachusz <j.bachusz@neurosys.com>
  148. | | |   Date:   Mon Aug 12 16:17:42 2019 +0200
  149. | | |  
  150. | | |       Created my own branch for MQTT
  151. | | |
  152. | | * commit f0b08003603bcf310878bc11ee9d845a1b93de23
  153. | |/  Author: Artur Bauer <a.bauer@neurosys.com>
  154. |/|   Date:   Mon Aug 12 08:00:52 2019 +0200
  155. | |  
  156. | |       Add main ProdLineSys app
  157. | |  
  158. * |   commit 9d2752f1418f671eb904aad2b6b29efa2290ce3e
  159. |\ \  Merge: 96b69af d3e9c04
  160. | | | Author: Jakub Bachusz <j.bachusz@neurosys.com>
  161. | | | Date:   Fri Aug 9 09:40:38 2019 +0000
  162. | | |
  163. | | |     Merge branch 'RTC' into 'develop'
  164. | | |    
  165. | | |     Rtc
  166. | | |    
  167. | | |     See merge request ns-internship-2019/prodlinesys_freertos!5
  168. | | |  
  169. | * |   commit d3e9c042ce7df9e4266aba4799abe87bf2683141
  170. | |\ \  Merge: a01499b 96b69af
  171. | |/ /  Author: Jakub Bachusz <j.bachusz@neurosys.com>
  172. |/| |   Date:   Fri Aug 9 09:39:29 2019 +0000
  173. | | |  
  174. | | |       Merge branch 'develop' into 'RTC'
  175. | | |      
  176. | | |       # Conflicts:
  177. | | |       #   .gitignore
  178. | | |       #   CMakeLists.txt
  179. | | |       #   components/README.md
  180. | | |       #   doc/I2CSetup.md
  181. | | |       #   include/I2CSetup.h
  182. | | |       #   src/I2CSetup.c
  183. | | |       #   src/main.c
  184. | | |  
  185. * | |   commit 96b69af1370dda1248bebac7db39d50f6e68a9c2
  186. |\ \ \  Merge: 7c2c61a ea46de2
  187. | | | | Author: Artur Bauer <bauerart1@gmail.com>
  188. | | | | Date:   Thu Aug 8 17:30:38 2019 +0200
  189. | | | |
  190. | | | |     Merge branch 'OLEDScreen' into develop
  191. | | | |
  192. | * | | commit ea46de237e5f439bfc02b0bf0a8bb622f5574554 (origin/OLEDScreen, OLEDScreen)
  193. | | | | Author: Artur Bauer <bauerart1@gmail.com>
  194. | | | | Date:   Thu Aug 8 09:31:19 2019 +0200
  195. | | | |
  196. | | | |     Correct misspelling in .gitmodules
  197. | | | |
  198. | * | | commit 114a2bbbcf2b0b3956ab5166a253c788aff6e991
  199. | | | | Author: Artur Bauer <bauerart1@gmail.com>
  200. | | | | Date:   Wed Aug 7 17:07:53 2019 +0200
  201. | | | |
  202. | | | |     Add param description
  203. | | | |
  204. | * | | commit 2a3acf10f1d166ef22a46c483bfb3cc9a00f3c03
  205. | | | | Author: Artur Bauer <bauerart1@gmail.com>
  206. | | | | Date:   Wed Aug 7 17:04:21 2019 +0200
  207. | | | |
  208. | | | |     Add documentation
  209. | | | |
  210. | * | | commit 0366f866adaaf995a1e477106145e33210c9f826
  211. | | |/  Author: Artur Bauer <bauerart1@gmail.com>
  212. | |/|   Date:   Wed Aug 7 17:01:08 2019 +0200
  213. | | |  
  214. | | |       Add OLED support working with wifi
  215. | | |  
  216. * | |   commit 7c2c61a016c2e384ad8b0c50d39c25fbfb8e756f
  217. |\ \ \  Merge: 703657e b067a76
  218. | | | | Author: Artur Bauer <bauerart1@gmail.com>
  219. | | | | Date:   Thu Aug 8 17:21:12 2019 +0200
  220. | | | |
  221. | | | |     Merge branch 'develop' of git.neurosys.com:ns-internship-2019/prodlinesys_freertos into develop
  222. | | | |
  223. | * | | commit b067a766fe4195610d30eb1d9b6ac7f2578a93f8
  224. | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  225. | | | | Date:   Wed Aug 7 08:01:51 2019 +0200
  226. | | | |
  227. | | | |     Fix documentation
  228. | | | |
  229. | * | | commit 216021b8a320697b313e663d767f70af504145b6
  230. | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  231. | | | | Date:   Wed Aug 7 07:58:30 2019 +0200
  232. | | | |
  233. | | | |     Add documentation
  234. | | | |  
  235. | * | |   commit b4cf51be393440ac648a2c315c6846e973ee235b
  236. | |\ \ \  Merge: c54c6fb c9fba91
  237. | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  238. | | | | | Date:   Mon Aug 5 07:51:36 2019 +0000
  239. | | | | |
  240. | | | | |     Merge branch 'LED_indicator' into 'develop'
  241. | | | | |    
  242. | | | | |     Led indicator
  243. | | | | |    
  244. | | | | |     See merge request ns-internship-2019/prodlinesys_freertos!1
  245. | | | | |
  246. | | * | | commit c9fba9180f93d16093ca039a0fa51d1c89ed0db6
  247. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  248. | | | | | Date:   Fri Aug 2 14:18:13 2019 +0200
  249. | | | | |
  250. | | | | |     Change comments to doxygen standard
  251. | | | | |
  252. | | * | | commit 6b63edae771553f98149d27925c9e498a1787ebd
  253. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  254. | | | | | Date:   Tue Jul 30 15:29:59 2019 +0200
  255. | | | | |
  256. | | | | |     Add check function for LED Indicator
  257. | | | | |
  258. | | * | | commit 0a83065f5c23bcc096847e1d75d8280f24a815e1
  259. | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  260. | | | | | Date:   Mon Jul 29 12:53:55 2019 +0200
  261. | | | | |
  262. | | | | |     Change logs priority
  263. | | | | |
  264. | | * | | commit 8f5d0aadc5c471924f85069503ac528af592c402
  265. | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  266. | | | | | Date:   Mon Jul 29 12:43:46 2019 +0200
  267. | | | | |
  268. | | | | |     Add basic security futures
  269. | | | | |
  270. | | * | | commit 9ac59b4f0963aeaa83c336b63b769e435eea242f
  271. | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  272. | | | | | Date:   Mon Jul 29 10:57:15 2019 +0200
  273. | | | | |
  274. | | | | |     Add const qualifiers
  275. | | | | |
  276. | | * | | commit bd49564f7b050bf6ba5974904022b2d70579dc32
  277. | | | | | Author: Artur Bauer <a.bauer@neurosys.com>
  278. | | | | | Date:   Mon Jul 29 08:57:15 2019 +0200
  279. | | | | |
  280. | | | | |     Add default constructors macros for color LEDs
  281. | | | | |
  282. | | * | | commit 77abb3508555c3f86e61714272ac16153bf12e0c
  283. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  284. | | | | | Date:   Fri Jul 26 11:31:21 2019 +0200
  285. | | | | |
  286. | | | | |     Add LED Indicator basic config
  287. | | | | |
  288. | | * | | commit 3e93f385f63e3302eebb2c542c8f01e2b4644b74
  289. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  290. | | | | | Date:   Fri Jul 26 10:41:04 2019 +0200
  291. | | | | |
  292. | | | | |     Change log mode
  293. | | | | |    
  294. | | | | |     Changed log mode using esp32 library to put them on uart
  295. | | | | |
  296. | | * | | commit c3f6eb8dca55f9038b8b40a475e01ececede7a45
  297. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  298. | | | | | Date:   Wed Jul 24 11:40:08 2019 +0200
  299. | | | | |
  300. | | | | |     Change style to mode
  301. | | | | |    
  302. | | | | |     Changed Style to mode to more clarity
  303. | | | | |
  304. | | * | | commit 4ccefdfbb0e4ec83b5aaf6fc815b277897e2d46d
  305. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  306. | | | | | Date:   Wed Jul 24 10:44:01 2019 +0200
  307. | | | | |
  308. | | | | |     Remove additional variables
  309. | | | | |    
  310. | | | | |     Remover addition variables on _vBlinky function
  311. | | | | |
  312. | | * | | commit c8f56d0193fe028d61c18aa36f7923368d1b6118
  313. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  314. | | | | | Date:   Wed Jul 24 09:58:33 2019 +0200
  315. | | | | |
  316. | | | | |     Add LED Indicator support
  317. | | | | |    
  318. | | | | |     Added LED Indicator support. Contain methods of turning on LED Indicator
  319. | | | | |     in 3 different styles
  320. | | | | |
  321. | | * | | commit d9675e6327e354d9c27bbe97a1ecc16ec396cd73
  322. | | | | | Author: Artur Bauer <bauerart1@gmail.com>
  323. | | | | | Date:   Tue Jul 23 20:42:33 2019 +0200
  324. | | | | |
  325. | | | | |     Add basic LED functionality
  326. | | | | |    
  327. | | | | |     Basic LED functions. Blinking, single blink and turn on are available in
  328. | | | | |     LEDIndicator files
  329. | | | | |  
  330. * | | | |   commit 703657ea99c5284f1469eab340a991c27698651a
  331. |\ \ \ \ \  Merge: c54c6fb 1668488
  332. | |/ / / /  Author: Artur Bauer <bauerart1@gmail.com>
  333. |/| | / /   Date:   Thu Aug 8 17:06:01 2019 +0200
  334. | | |/ /    
  335. | |/| |         Merge branch 'wifi' into develop
  336. | | | |
  337. | | | * commit a01499b6534d225cfe176434f7181731304a3328 (origin/RTC, RTC)
  338. | | | | Author: Artur Bauer <bauerart1@gmail.com>
  339. | | | | Date:   Thu Aug 8 09:26:43 2019 +0200
  340. | | | |
  341. | | | |     Add documentation
  342. | | | |
  343. | | | * commit f320f6764688cba45b657abfef3367d9d631ad23
  344. | | |/  Author: Artur Bauer <bauerart1@gmail.com>
  345. | |/|   Date:   Thu Aug 8 09:15:57 2019 +0200
  346. | | |  
  347. | | |       Add rtc support
  348. | | |
  349. | * | commit 166848899c2535a334ac282f3a1fe5f142942b3e (origin/wifi, wifi)
  350. | | | Author: Artur Bauer <a.bauer@neurosys.com>
  351. | | | Date:   Wed Aug 7 14:11:30 2019 +0200
  352. | | |
  353. | | |     Add documentation
  354. | | |  
  355. | * |   commit a849912309b0bbe255d7b9cf49b93df7edbb1644
  356. | |\ \  Merge: 42090de bf22d1d
  357. | | |/  Author: Artur Bauer <a.bauer@neurosys.com>
  358. | | |   Date:   Wed Aug 7 13:54:45 2019 +0200
  359. | | |  
  360. | | |       Merge branch 'wifi' with remote
  361. | | |      
  362. | | |       Merge branch 'wifi' of git.neurosys.com:ns-internship-2019/prodlinesys_freertos into wifi
  363. | | |
  364. | | * commit bf22d1d61790f21c14b358d377c4ca10b40bd4ab (tag: v0.0.1)
  365. | | | Author: Artur Bauer <bauerart1@gmail.com>
  366. | | | Date:   Tue Jul 23 15:42:11 2019 +0200
  367. | | |
  368. | | |     Refactor and restructure of WiFi connection code
  369. | | |    
  370. | | |     Refactor and restructure of WiFi creating connection on ESP32.
  371. | | |     Added necessary comments. Changed return value of xWiFiInit function
  372. | | |    
  373. | | |     run.sh require rewritten, because not working properly
  374. | | |
  375. | | * commit 2075acf424c4d107cc5671151ca14d1ed99c7117
  376. | |/  Author: Artur Bauer <bauerart1@gmail.com>
  377. |/|   Date:   Tue Jul 23 13:44:47 2019 +0200
  378. | |  
  379. | |       Implement wifi connection
  380. | |      
  381. | |       Added wifi connection to main code. Need for refactor and restructure
  382. | |       code
  383. | |
  384. | * commit 42090def65b30a60afd1cb3d2dd142e2cc07f25d
  385. |/  Author: Artur Bauer <a.bauer@neurosys.com>
  386. |   Date:   Wed Aug 7 13:34:35 2019 +0200
  387. |  
  388. |       Fix WiFi and init sequence
  389. |
  390. * commit c54c6fb29edfeaf09263f2ab94253b755c8fbc3f (origin/master, master)
  391. | Author: Artur Bauer <a.bauer@neurosys.com>
  392. | Date:   Mon Jul 22 15:06:07 2019 +0200
  393. |
  394. |     First test on wifi
  395. |
  396. * commit 954d97386992a2c09941e6b0a1aad526be6fb1ff
  397. | Author: Artur Bauer <a.bauer@neurosys.com>
  398. | Date:   Mon Jul 22 09:58:31 2019 +0200
  399. |
  400. |     Rewritten README to current version
  401. |
  402. * commit f872058319a42843d11ff91f1a9f56818c83c6d5
  403. | Author: Artur Bauer <a.bauer@neurosys.com>
  404. | Date:   Mon Jul 22 09:57:03 2019 +0200
  405. |
  406. |     Removed files
  407. |
  408. * commit cb6db2bd72d47841edbf865abcc319a0076214f0
  409. | Author: Artur Bauer <a.bauer@neurosys.com>
  410. | Date:   Mon Jul 22 09:29:52 2019 +0200
  411. |
  412. |     Changed product structure
  413. |    
  414. |     Changed product structure removing additional files
  415. |
  416. * commit d701481d3ae8dc929196def92a83083842b23a10 (tag: Alpha_0.01_Blinky)
  417. | Author: Artur Bauer <a.bauer@neurosys.com>
  418. | Date:   Fri Jul 19 12:42:01 2019 +0200
  419. |
  420. |     README modifications
  421. |
  422. * commit 425041b0f8359efffc1d356f1eabb73055c6e1a6
  423.   Author: Artur Bauer <a.bauer@neurosys.com>
  424.   Date:   Fri Jul 19 12:37:17 2019 +0200
  425.  
  426.       Init commit
  427.      
  428.       This is initial commit for esp project.
  429.       Require consulting with someone or more  research
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top