| @@ -134,11 +134,7 class GeneratorConfiguration(Configuration): | |||||
| 134 | try: |
|
134 | try: | |
| 135 | generator = GeneratorConfiguration.objects.get(pk=self) |
|
135 | generator = GeneratorConfiguration.objects.get(pk=self) | |
| 136 | print(generator) |
|
136 | print(generator) | |
| 137 | <<<<<<< HEAD |
|
|||
| 138 | json_trmode = json.dumps({"periode": generator.periode, "Delay": generator.delay, "width": generator.width, "enable": generator.selector}) |
|
137 | json_trmode = json.dumps({"periode": generator.periode, "Delay": generator.delay, "width": generator.width, "enable": generator.selector}) | |
| 139 | ======= |
|
|||
| 140 | json_trmode = json.dumps({"periode": generator.periode, "delay": generator.delay, "width": generator.width, "selector": generator.selector}) |
|
|||
| 141 | >>>>>>> 30a3b0f190094e75f123ab3ef1b8b82911707ba7 |
|
|||
| 142 | print(json_trmode) |
|
138 | print(json_trmode) | |
| 143 | base64_trmode = base64.urlsafe_b64encode(json_trmode.encode('ascii')) |
|
139 | base64_trmode = base64.urlsafe_b64encode(json_trmode.encode('ascii')) | |
| 144 | print(base64_trmode) |
|
140 | print(base64_trmode) | |
| @@ -152,11 +152,7 class PedestalDevConfiguration(Configuration): | |||||
| 152 | json_data = json.dumps(data) |
|
152 | json_data = json.dumps(data) | |
| 153 |
|
153 | |||
| 154 | elif pedestal.mode=='POS': |
|
154 | elif pedestal.mode=='POS': | |
| 155 | <<<<<<< HEAD |
|
|||
| 156 | data = {'axis': pedestal_axis, 'position': pedestal.position} |
|
155 | data = {'axis': pedestal_axis, 'position': pedestal.position} | |
| 157 | ======= |
|
|||
| 158 | data = {'axis': pedestal_axis, 'speed': pedestal.position} |
|
|||
| 159 | >>>>>>> 30a3b0f190094e75f123ab3ef1b8b82911707ba7 |
|
|||
| 160 | json_data = json.dumps(data) |
|
156 | json_data = json.dumps(data) | |
| 161 |
|
157 | |||
| 162 | print(json_data) |
|
158 | print(json_data) | |
General Comments 0
You need to be logged in to leave comments.
Login now